fix(controllers): wip

Author: ndk

tests/kafkaconnector_test.go

@@ -22,30 +22,35 @@ func TestKafkaConnector(t *testing.T) {
 	defer cancel()
 
 	kafkaName := randName("kafka-service")
+	kafkaSecretName := randName("kafka-secret")
 	osName := randName("opensearch-service")
+	osSecretName := randName("os-secret")
 	topicName := randName("kafka-topic")
 	connectorName := randName("kafka-connector")
 	yml, err := loadExampleYaml("kafkaconnector.yaml", map[string]string{
 		// Kafka
-		"doc[0].metadata.name":  kafkaName,
-		"doc[0].spec.project":   cfg.Project,
-		"doc[0].spec.cloudName": cfg.PrimaryCloudName,
+		"doc[0].metadata.name":                  kafkaName,
+		"doc[0].spec.project":                   cfg.Project,
+		"doc[0].spec.cloudName":                 cfg.PrimaryCloudName,
+		"doc[0].spec.connInfoSecretTarget.name": kafkaSecretName,
 
 		// Kafka Topic
 		"doc[1].metadata.name":    topicName,
 		"doc[1].spec.project":     cfg.Project,
 		"doc[1].spec.serviceName": kafkaName,
 
 		// OpenSearch
-		"doc[2].metadata.name":  osName,
-		"doc[2].spec.project":   cfg.Project,
-		"doc[2].spec.cloudName": cfg.PrimaryCloudName,
+		"doc[2].metadata.name":                  osName,
+		"doc[2].spec.project":                   cfg.Project,
+		"doc[2].spec.cloudName":                 cfg.PrimaryCloudName,
+		"doc[2].spec.connInfoSecretTarget.name": osSecretName,
 
 		// Kafka Connector
-		"doc[3].metadata.name":          connectorName,
-		"doc[3].spec.project":           cfg.Project,
-		"doc[3].spec.serviceName":       kafkaName,
-		"doc[3].spec.userConfig.topics": topicName,
+		"doc[3].metadata.name":                  connectorName,
+		"doc[3].spec.project":                   cfg.Project,
+		"doc[3].spec.serviceName":               kafkaName,
+		"doc[3].spec.userConfig.topics":         topicName,
+		"doc[3].spec.userConfig.connection.url": `{{ fromSecret "` + osSecretName + `" "OPENSEARCH_URI" }}`,
 	})
 	require.NoError(t, err)
 	s := NewSession(ctx, k8sClient)

tests/kafkanativeacl_test.go

@@ -21,13 +21,15 @@ func TestKafkaNativeACL(t *testing.T) {
 	defer cancel()
 
 	kafkaName := randName("kafka-native-acl")
+	kafkaSecretName := randName("kafka-secret")
 	aclName := randName("kafka-acl")
 	yml, err := loadExampleYaml("kafkanativeacl.yaml", map[string]string{
-		"doc[0].metadata.name":    kafkaName,
-		"doc[0].spec.project":     cfg.Project,
-		"doc[1].metadata.name":    aclName,
-		"doc[1].spec.project":     cfg.Project,
-		"doc[1].spec.serviceName": kafkaName,
+		"doc[0].metadata.name":                  kafkaName,
+		"doc[0].spec.project":                   cfg.Project,
+		"doc[0].spec.connInfoSecretTarget.name": kafkaSecretName,
+		"doc[1].metadata.name":                  aclName,
+		"doc[1].spec.project":                   cfg.Project,
+		"doc[1].spec.serviceName":               kafkaName,
 	})
 	require.NoError(t, err)
 	s := NewSession(ctx, k8sClient)