Merge pull request #91 from weaveworks/config-secrets-to-strings

Config secrets to strings.

Author: bigkevmcd

controllers/templates/generators/config/config.go

@@ -92,11 +92,11 @@ func secretToParams(ctx context.Context, k8sClient client.Client, key client.Obj
 	return mapToAnyMap(secret.Data), nil
 }
 
-func mapToAnyMap[V any](m map[string]V) map[string]any {
+func mapToAnyMap[V string | []byte](m map[string]V) map[string]any {
 	result := map[string]any{}
 
 	for k, v := range m {
-		result[k] = v
+		result[k] = string(v)
 	}
 
 	return result

controllers/templates/generators/config/config_test.go

@@ -152,8 +152,8 @@ func TestConfigGenerator_Generate(t *testing.T) {
 			},
 			want: []map[string]any{
 				{
-					"test-key1": []byte("test-value1"),
-					"test-key2": []byte("test-value2"),
+					"test-key1": "test-value1",
+					"test-key2": "test-value2",
 				},
 			},
 		},

tests/e2e/gitopsset_controller_test.go

@@ -569,7 +569,7 @@ func TestReconcilingUpdatingSecret(t *testing.T) {
 					Content: runtime.RawExtension{
 						Raw: mustMarshalJSON(t, test.NewConfigMap(func(c *corev1.ConfigMap) {
 							c.Data = map[string]string{
-								"testing": "{{ .Element.testKey | toString }}",
+								"testing": "{{ .Element.testKey }}",
 							}
 						})),
 					},
@@ -637,7 +637,7 @@ func TestReconcilingUpdatingSecret_in_matrix(t *testing.T) {
 					Content: runtime.RawExtension{
 						Raw: mustMarshalJSON(t, test.NewConfigMap(func(c *corev1.ConfigMap) {
 							c.Data = map[string]string{
-								"testing": "{{ .Element.testKey | toString }}",
+								"testing": "{{ .Element.testKey }}",
 								"team":    "{{ .Element.team }}",
 							}
 						})),