Reinstate name field in NativeHA configuration (#724)

mirskifa · GitHub Enterprise · commit 58df877b0c53 · 2024-10-08T14:03:06.000+01:00
diff --git a/ha/native-ha.ini.tpl b/ha/native-ha.ini.tpl
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name={{ .Name }}
   {{ if .ShouldConfigureTLS }}
   {{ if .CertificateLabel }}
   CertificateLabel={{ .CertificateLabel }}
diff --git a/internal/ha/ha.go b/internal/ha/ha.go
@@ -73,6 +73,7 @@ func envConfigPresent() bool {
 
 func loadConfigFromEnv(log *logger.Logger) (*haConfig, error) {
 	cfg := &haConfig{
+		Name: os.Getenv("HOSTNAME"),
 		Instances: [3]haInstance{
 			{
 				Name:               os.Getenv("MQ_NATIVE_HA_INSTANCE_0_NAME"),
@@ -113,6 +114,7 @@ func loadConfigFromEnv(log *logger.Logger) (*haConfig, error) {
 }
 
 type haConfig struct {
+	Name      string
 	Instances [3]haInstance
 	Group     haGroupConfig
 
diff --git a/internal/ha/ha_test.go b/internal/ha/ha_test.go
@@ -41,6 +41,7 @@ func TestConfigFromEnv(t *testing.T) {
 		{
 			TestName: "Minimal config",
 			env: map[string]string{
+				"HOSTNAME":                                    "minimal-config",
 				"MQ_NATIVE_HA_INSTANCE_0_NAME":                "minimal-config-instance0",
 				"MQ_NATIVE_HA_INSTANCE_1_NAME":                "minimal-config-instance1",
 				"MQ_NATIVE_HA_INSTANCE_2_NAME":                "minimal-config-instance2",
@@ -49,6 +50,7 @@ func TestConfigFromEnv(t *testing.T) {
 				"MQ_NATIVE_HA_INSTANCE_2_REPLICATION_ADDRESS": "minimal-config-instance2(9145)",
 			},
 			expected: haConfig{
+				Name: "minimal-config",
 				Instances: [3]haInstance{
 					{"minimal-config-instance0", "minimal-config-instance0(9145)"},
 					{"minimal-config-instance1", "minimal-config-instance1(9145)"},
@@ -59,6 +61,7 @@ func TestConfigFromEnv(t *testing.T) {
 		{
 			TestName: "Full TLS config",
 			env: map[string]string{
+				"HOSTNAME":                                    "tls-config",
 				"MQ_NATIVE_HA_INSTANCE_0_NAME":                "tls-config-instance0",
 				"MQ_NATIVE_HA_INSTANCE_1_NAME":                "tls-config-instance1",
 				"MQ_NATIVE_HA_INSTANCE_2_NAME":                "tls-config-instance2",
@@ -74,6 +77,7 @@ func TestConfigFromEnv(t *testing.T) {
 				fips:             asRef(false),
 			},
 			expected: haConfig{
+				Name: "tls-config",
 				Instances: [3]haInstance{
 					{"tls-config-instance0", "tls-config-instance0(9145)"},
 					{"tls-config-instance1", "tls-config-instance1(9145)"},
@@ -91,6 +95,7 @@ func TestConfigFromEnv(t *testing.T) {
 		{
 			TestName: "Group TLS (live plain) config",
 			env: map[string]string{
+				"HOSTNAME":                                    "group-live-plain-config",
 				"MQ_NATIVE_HA_INSTANCE_0_NAME":                "group-live-plain-config0",
 				"MQ_NATIVE_HA_INSTANCE_1_NAME":                "group-live-plain-config1",
 				"MQ_NATIVE_HA_INSTANCE_2_NAME":                "group-live-plain-config2",
@@ -113,6 +118,7 @@ func TestConfigFromEnv(t *testing.T) {
 				fips:                  asRef(false),
 			},
 			expected: haConfig{
+				Name: "group-live-plain-config",
 				Instances: [3]haInstance{
 					{"group-live-plain-config0", "group-live-plain-config0(9145)"},
 					{"group-live-plain-config1", "group-live-plain-config1(9145)"},
@@ -386,6 +392,7 @@ func TestTemplatingFromConfig(t *testing.T) {
 
 func applyTestDefaults(testConfig haConfig) haConfig {
 	baseName := "test-config"
+	setIfBlank(&testConfig.Name, baseName)
 	for i := 0; i < 3; i++ {
 		instName := fmt.Sprintf("%s-instance%d", baseName, i)
 		replAddress := fmt.Sprintf("%s(9145)", instName)
diff --git a/internal/ha/test_fixtures/group-live-minimal.ini b/internal/ha/test_fixtures/group-live-minimal.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
   GroupName=alpha
   GroupCertificateLabel=recoveryTLS
   KeyRepository=/run/runmqserver/ha/tls/key
diff --git a/internal/ha/test_fixtures/group-live-plain-ha.ini b/internal/ha/test_fixtures/group-live-plain-ha.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
   CipherSpec=NULL
   GroupName=alpha
   GroupCertificateLabel=recoveryTLS
diff --git a/internal/ha/test_fixtures/group-recovery-minimal.ini b/internal/ha/test_fixtures/group-recovery-minimal.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
   GroupName=beta
   GroupCertificateLabel=recoveryTLS
   GroupRole=Recovery
diff --git a/internal/ha/test_fixtures/minimal-config.ini b/internal/ha/test_fixtures/minimal-config.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
 NativeHAInstance:
   Name=test-config-instance0
   ReplicationAddress=test-config-instance0(9145)
diff --git a/internal/ha/test_fixtures/tls-basic-fips.ini b/internal/ha/test_fixtures/tls-basic-fips.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
   CertificateLabel=baseTLS
   KeyRepository=/run/runmqserver/ha/tls/key
   SSLFipsRequired=Yes
diff --git a/internal/ha/test_fixtures/tls-basic.ini b/internal/ha/test_fixtures/tls-basic.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
   CertificateLabel=baseTLS
   KeyRepository=/run/runmqserver/ha/tls/key
   SSLFipsRequired=No
diff --git a/internal/ha/test_fixtures/tls-full.ini b/internal/ha/test_fixtures/tls-full.ini
@@ -1,4 +1,5 @@
 NativeHALocalInstance:
+  Name=test-config
   CertificateLabel=baseTLS
   CipherSpec=some-cipher
   KeyRepository=/a/non/existant/path

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`NativeHALocalInstance:`
	`2`	`+ Name={{ .Name }}`
`2`	`3`	`{{ if .ShouldConfigureTLS }}`
`3`	`4`	`{{ if .CertificateLabel }}`
`4`	`5`	`CertificateLabel={{ .CertificateLabel }}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ func envConfigPresent() bool {`
`73`	`73`
`74`	`74`	`func loadConfigFromEnv(log logger.Logger) (haConfig, error) {`
`75`	`75`	`cfg := &haConfig{`
	`76`	`+ Name: os.Getenv("HOSTNAME"),`
`76`	`77`	`Instances: [3]haInstance{`
`77`	`78`	`{`
`78`	`79`	`Name: os.Getenv("MQ_NATIVE_HA_INSTANCE_0_NAME"),`
`@@ -113,6 +114,7 @@ func loadConfigFromEnv(log logger.Logger) (haConfig, error) {`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`type haConfig struct {`
	`117`	`+ Name string`
`116`	`118`	`Instances [3]haInstance`
`117`	`119`	`Group haGroupConfig`
`118`	`120`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`NativeHALocalInstance:`
	`2`	`+ Name=test-config`
`2`	`3`	`GroupName=alpha`
`3`	`4`	`GroupCertificateLabel=recoveryTLS`
`4`	`5`	`KeyRepository=/run/runmqserver/ha/tls/key`