Merge branch 'master' into opensearch_as_service

nais · Mar 2, 2022 · 457f867 · 457f867
2 parents b7acdcf + 968bf68
commit 457f867
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/config/environment_test.go b/pkg/config/environment_test.go
@@ -26,7 +26,7 @@ func TestKafkaEnvironmentConfigGenerated(t *testing.T) {
 	err := WriteKafkaEnvConfigToFile(test.SetupSecret(envKeys), tmpDest)
 	assert.NoError(t, err)
 
-	result, err := ioutil.ReadFile(filepath.Join(tmpDest, KafkaSchemaRegistryEnvName))
+	result, err := ioutil.ReadFile(filepath.Join(tmpDest, KafkaEnvName))
 	assert.NoError(t, err)
 
 	assert.True(t, strings.Contains(string(result), consts.KafkaClientTruststoreJksFile))

diff --git a/pkg/config/java.go b/pkg/config/java.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	JavaConfigName = "kafka.properties"
+	KafkaJavaConfigName = "kafka.properties"
 
 	KeyPassProp            = "ssl.key.password"
 	KeyStorePassProp       = "ssl.keystore.password"
@@ -30,7 +30,7 @@ ssl.truststore.type=JKS
 
 func NewJavaConfig(secret *v1.Secret, destinationPath string) error {
 	properties := fmt.Sprintf("# nais-cli %s\n", time.Now().Truncate(time.Minute))
-	properties += fmt.Sprintf(FileHeader, secret.Namespace, secret.Data[consts.KafkaBrokersKey], filepath.Join(destinationPath, JavaConfigName))
+	properties += fmt.Sprintf(FileHeader, secret.Namespace, secret.Data[consts.KafkaBrokersKey], filepath.Join(destinationPath, KafkaJavaConfigName))
 
 	envsToFile := map[string]string{
 		KeyPassProp:            string(secret.Data[consts.KafkaCredStorePasswordKey]),
@@ -44,7 +44,7 @@ func NewJavaConfig(secret *v1.Secret, destinationPath string) error {
 		properties += fmt.Sprintf("%s=%s\n", key, value)
 	}
 
-	if err := common.WriteToFile(destinationPath, JavaConfigName, []byte(properties)); err != nil {
+	if err := common.WriteToFile(destinationPath, KafkaJavaConfigName, []byte(properties)); err != nil {
 		return fmt.Errorf("write envs to file: %s", err)
 	}
 

diff --git a/pkg/config/java_test.go b/pkg/config/java_test.go
@@ -24,7 +24,7 @@ func TestJavaConfigGenerated(t *testing.T) {
 	err := NewJavaConfig(test.SetupSecret(envKeys), tmpDest)
 	assert.NoError(t, err)
 
-	result, err := ioutil.ReadFile(filepath.Join(tmpDest, JavaConfigName))
+	result, err := ioutil.ReadFile(filepath.Join(tmpDest, KafkaJavaConfigName))
 	assert.NoError(t, err)
 
 	assert.True(t, strings.Contains(string(result), consts.KafkaClientTruststoreJksFile))