CSPL-4358 Addressing comments

kasiakoziol · kasiakoziol · commit 61c0387ce7de · 2025-12-12T13:33:11.000+01:00
diff --git a/api/v4/bus_types.go b/api/v4/bus_types.go
@@ -36,21 +36,21 @@ type BusSpec struct {
 	// Provider of queue resources
 	Provider string `json:"provider"`
 
+	// sqs specific inputs
+	SQS SQSSpec `json:"sqs"`
+}
+
+type SQSSpec struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MinLength=1
 	// Name of the queue
-	QueueName string `json:"queueName"`
+	Name string `json:"name"`
 
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Pattern=`^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$`
 	// Region of the resources
 	Region string `json:"region"`
 
-	// sqs specific inputs
-	SQS SQSSpec `json:"sqs"`
-}
-
-type SQSSpec struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MinLength=1
 	// Name of the dead letter queue resource
diff --git a/config/crd/bases/enterprise.splunk.com_buses.yaml b/config/crd/bases/enterprise.splunk.com_buses.yaml
@@ -59,14 +59,6 @@ spec:
                 enum:
                 - sqs
                 type: string
-              queueName:
-                description: Name of the queue
-                minLength: 1
-                type: string
-              region:
-                description: Region of the resources
-                pattern: ^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$
-                type: string
               sqs:
                 description: sqs specific inputs
                 properties:
@@ -78,13 +70,21 @@ spec:
                     description: Amazon SQS Service endpoint
                     pattern: ^https://sqs(?:-fips)?\.[a-z]+-[a-z]+(?:-[a-z]+)?-\d+\.amazonaws\.com(?:\.cn)?(?:/[A-Za-z0-9._-]+(?:/[A-Za-z0-9._-]+)*)?$
                     type: string
+                  name:
+                    description: Name of the queue
+                    minLength: 1
+                    type: string
+                  region:
+                    description: Region of the resources
+                    pattern: ^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$
+                    type: string
                 required:
                 - dlq
+                - name
+                - region
                 type: object
             required:
             - provider
-            - queueName
-            - region
             type: object
             x-kubernetes-validations:
             - message: sqs must be provided when provider is sqs
diff --git a/config/crd/bases/enterprise.splunk.com_indexerclusters.yaml b/config/crd/bases/enterprise.splunk.com_indexerclusters.yaml
@@ -8345,14 +8345,6 @@ spec:
                     enum:
                     - sqs
                     type: string
-                  queueName:
-                    description: Name of the queue
-                    minLength: 1
-                    type: string
-                  region:
-                    description: Region of the resources
-                    pattern: ^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$
-                    type: string
                   sqs:
                     description: sqs specific inputs
                     properties:
@@ -8364,13 +8356,21 @@ spec:
                         description: Amazon SQS Service endpoint
                         pattern: ^https://sqs(?:-fips)?\.[a-z]+-[a-z]+(?:-[a-z]+)?-\d+\.amazonaws\.com(?:\.cn)?(?:/[A-Za-z0-9._-]+(?:/[A-Za-z0-9._-]+)*)?$
                         type: string
+                      name:
+                        description: Name of the queue
+                        minLength: 1
+                        type: string
+                      region:
+                        description: Region of the resources
+                        pattern: ^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$
+                        type: string
                     required:
                     - dlq
+                    - name
+                    - region
                     type: object
                 required:
                 - provider
-                - queueName
-                - region
                 type: object
                 x-kubernetes-validations:
                 - message: sqs must be provided when provider is sqs
diff --git a/config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml b/config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml
@@ -4596,14 +4596,6 @@ spec:
                     enum:
                     - sqs
                     type: string
-                  queueName:
-                    description: Name of the queue
-                    minLength: 1
-                    type: string
-                  region:
-                    description: Region of the resources
-                    pattern: ^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$
-                    type: string
                   sqs:
                     description: sqs specific inputs
                     properties:
@@ -4615,13 +4607,21 @@ spec:
                         description: Amazon SQS Service endpoint
                         pattern: ^https://sqs(?:-fips)?\.[a-z]+-[a-z]+(?:-[a-z]+)?-\d+\.amazonaws\.com(?:\.cn)?(?:/[A-Za-z0-9._-]+(?:/[A-Za-z0-9._-]+)*)?$
                         type: string
+                      name:
+                        description: Name of the queue
+                        minLength: 1
+                        type: string
+                      region:
+                        description: Region of the resources
+                        pattern: ^(?:us|ap|eu|me|af|sa|ca|cn|il)(?:-[a-z]+){1,3}-\d$
+                        type: string
                     required:
                     - dlq
+                    - name
+                    - region
                     type: object
                 required:
                 - provider
-                - queueName
-                - region
                 type: object
                 x-kubernetes-validations:
                 - message: sqs must be provided when provider is sqs
diff --git a/helm-chart/splunk-enterprise/templates/enterprise_v4_buses.yaml b/helm-chart/splunk-enterprise/templates/enterprise_v4_buses.yaml
@@ -15,8 +15,6 @@ metadata:
   {{- end }}
 spec:
   provider: {{ .Values.bus.provider | quote }}
-  queueName: {{ .Values.bus.queueName | quote }}
-  region: {{ .Values.bus.region | quote }}
   {{- with .Values.bus.sqs }}
   sqs:
     {{- if .endpoint }}
@@ -25,6 +23,12 @@ spec:
     {{- if .dlq }}
     dlq: {{ .dlq | quote }}
     {{- end }}
+    {{- if .name }}
+    name: {{ .name | quote }}
+    {{- end }}
+    {{- if .region }}
+    region: {{ .region | quote }}
+    {{- end }}
   {{- end }}
 {{- end }}
 {{- end }}
diff --git a/internal/controller/bus_controller_test.go b/internal/controller/bus_controller_test.go
@@ -72,10 +72,10 @@ var _ = Describe("Bus Controller", func() {
 
 			spec := enterpriseApi.BusSpec{
 				Provider: "sqs",
-				QueueName: "smartbus-queue",
-				Region: "us-west-2",
 				SQS: enterpriseApi.SQSSpec{
-					DLQ: "smartbus-dlq",
+					Name:     "smartbus-queue",
+					Region:   "us-west-2",
+					DLQ:      "smartbus-dlq",
 					Endpoint: "https://sqs.us-west-2.amazonaws.com",
 				},
 			}
@@ -101,10 +101,10 @@ var _ = Describe("Bus Controller", func() {
 			annotations := make(map[string]string)
 			spec := enterpriseApi.BusSpec{
 				Provider: "sqs",
-				QueueName: "smartbus-queue",
-				Region: "us-west-2",
 				SQS: enterpriseApi.SQSSpec{
-					DLQ: "smartbus-dlq",
+					Name:     "smartbus-queue",
+					Region:   "us-west-2",
+					DLQ:      "smartbus-dlq",
 					Endpoint: "https://sqs.us-west-2.amazonaws.com",
 				},
 			}
@@ -140,10 +140,10 @@ var _ = Describe("Bus Controller", func() {
 
 			spec := enterpriseApi.BusSpec{
 				Provider: "sqs",
-				QueueName: "smartbus-queue",
-				Region: "us-west-2",
 				SQS: enterpriseApi.SQSSpec{
-					DLQ: "smartbus-dlq",
+					Name:     "smartbus-queue",
+					Region:   "us-west-2",
+					DLQ:      "smartbus-dlq",
 					Endpoint: "https://sqs.us-west-2.amazonaws.com",
 				},
 			}
diff --git a/internal/controller/ingestorcluster_controller_test.go b/internal/controller/ingestorcluster_controller_test.go
@@ -77,10 +77,10 @@ var _ = Describe("IngestorCluster Controller", func() {
 					Namespace: nsSpecs.Name,
 				},
 				Spec: enterpriseApi.BusSpec{
-					Provider:  "sqs",
-					QueueName: "smartbus-queue",
-					Region:    "us-west-2",
+					Provider: "sqs",
 					SQS: enterpriseApi.SQSSpec{
+						Name:     "smartbus-queue",
+						Region:   "us-west-2",
 						DLQ:      "smartbus-dlq",
 						Endpoint: "https://sqs.us-west-2.amazonaws.com",
 					},
@@ -125,10 +125,10 @@ var _ = Describe("IngestorCluster Controller", func() {
 					Namespace: nsSpecs.Name,
 				},
 				Spec: enterpriseApi.BusSpec{
-					Provider:  "sqs",
-					QueueName: "smartbus-queue",
-					Region:    "us-west-2",
+					Provider: "sqs",
 					SQS: enterpriseApi.SQSSpec{
+						Name:     "smartbus-queue",
+						Region:   "us-west-2",
 						DLQ:      "smartbus-dlq",
 						Endpoint: "https://sqs.us-west-2.amazonaws.com",
 					},
diff --git a/kuttl/tests/helm/index-and-ingest-separation/01-assert.yaml b/kuttl/tests/helm/index-and-ingest-separation/01-assert.yaml
@@ -6,11 +6,11 @@ metadata:
   name: bus
 spec:
   provider: sqs
-  queueName: sqs-test
-  region: us-west-2
   sqs:
+    name: sqs-test
+    region: us-west-2
     endpoint: https://sqs.us-west-2.amazonaws.com
-    deadLetterQueueName: sqs-dlq-test
+    dlq: sqs-dlq-test
 status:
   phase: Ready
 
@@ -67,11 +67,11 @@ status:
   phase: Ready
   bus:
     provider: sqs
-    queueName: sqs-test
-    region: us-west-2
     sqs:
+      name: sqs-test
+      region: us-west-2
       endpoint: https://sqs.us-west-2.amazonaws.com
-      deadLetterQueueName: sqs-dlq-test
+      dlq: sqs-dlq-test
   largeMessageStore:
     provider: s3
     s3:
@@ -108,11 +108,11 @@ status:
   phase: Ready
   bus:
     provider: sqs
-    queueName: sqs-test
-    region: us-west-2
     sqs:
+      name: sqs-test
+      region: us-west-2
       endpoint: https://sqs.us-west-2.amazonaws.com
-      deadLetterQueueName: sqs-dlq-test
+      dlq: sqs-dlq-test
   largeMessageStore:
     provider: s3
     s3:
diff --git a/kuttl/tests/helm/index-and-ingest-separation/02-assert.yaml b/kuttl/tests/helm/index-and-ingest-separation/02-assert.yaml
@@ -12,11 +12,11 @@ status:
   phase: Ready
   bus:
     provider: sqs
-    queueName: sqs-test
-    region: us-west-2
     sqs:
+      name: sqs-test
+      region: us-west-2
       endpoint: https://sqs.us-west-2.amazonaws.com
-      deadLetterQueueName: sqs-dlq-test
+      dlq: sqs-dlq-test
   largeMessageStore:
     provider: s3
     s3:
diff --git a/kuttl/tests/helm/index-and-ingest-separation/splunk_index_ingest_sep.yaml b/kuttl/tests/helm/index-and-ingest-separation/splunk_index_ingest_sep.yaml
@@ -9,11 +9,11 @@ bus:
   enabled: true
   name: bus
   provider: sqs
-  queueName: sqs-test
-  region: us-west-2
   sqs:
+    name: sqs-test
+    region: us-west-2
     endpoint: https://sqs.us-west-2.amazonaws.com
-    deadLetterQueueName: sqs-dlq-test
+    dlq: sqs-dlq-test
 
 largeMessageStore:
   enabled: true
diff --git a/pkg/splunk/enterprise/bus_test.go b/pkg/splunk/enterprise/bus_test.go
@@ -49,10 +49,10 @@ func TestApplyBus(t *testing.T) {
 			Namespace: "test",
 		},
 		Spec: enterpriseApi.BusSpec{
-			Provider:  "sqs",
-			QueueName: "test-queue",
-			Region:    "us-west-2",
+			Provider: "sqs",
 			SQS: enterpriseApi.SQSSpec{
+				Name:     "test-queue",
+				Region:   "us-west-2",
 				Endpoint: "https://sqs.us-west-2.amazonaws.com",
 				DLQ:      "sqs-dlq-test",
 			},
diff --git a/pkg/splunk/enterprise/indexercluster.go b/pkg/splunk/enterprise/indexercluster.go
@@ -1285,12 +1285,12 @@ func (mgr *indexerClusterPodManager) handlePullBusChange(ctx context.Context, ne
 		splunkClient := newSplunkClientForBusPipeline(fmt.Sprintf("https://%s:8089", fqdnName), "admin", string(adminPwd))
 
 		afterDelete := false
-		if (bus.Spec.QueueName != "" && newCR.Status.Bus.QueueName != "" && bus.Spec.QueueName != newCR.Status.Bus.QueueName) ||
+		if (bus.Spec.SQS.Name != "" && newCR.Status.Bus.SQS.Name != "" && bus.Spec.SQS.Name != newCR.Status.Bus.SQS.Name) ||
 			(bus.Spec.Provider != "" && newCR.Status.Bus.Provider != "" && bus.Spec.Provider != newCR.Status.Bus.Provider) {
-			if err := splunkClient.DeleteConfFileProperty(scopedLog, "outputs", fmt.Sprintf("remote_queue:%s", newCR.Status.Bus.QueueName)); err != nil {
+			if err := splunkClient.DeleteConfFileProperty(scopedLog, "outputs", fmt.Sprintf("remote_queue:%s", newCR.Status.Bus.SQS.Name)); err != nil {
 				updateErr = err
 			}
-			if err := splunkClient.DeleteConfFileProperty(scopedLog, "inputs", fmt.Sprintf("remote_queue:%s", newCR.Status.Bus.QueueName)); err != nil {
+			if err := splunkClient.DeleteConfFileProperty(scopedLog, "inputs", fmt.Sprintf("remote_queue:%s", newCR.Status.Bus.SQS.Name)); err != nil {
 				updateErr = err
 			}
 			afterDelete = true
@@ -1299,13 +1299,13 @@ func (mgr *indexerClusterPodManager) handlePullBusChange(ctx context.Context, ne
 		busChangedFieldsInputs, busChangedFieldsOutputs, pipelineChangedFields := getChangedBusFieldsForIndexer(&bus, &lms, newCR, afterDelete)
 
 		for _, pbVal := range busChangedFieldsOutputs {
-			if err := splunkClient.UpdateConfFile(scopedLog, "outputs", fmt.Sprintf("remote_queue:%s", bus.Spec.QueueName), [][]string{pbVal}); err != nil {
+			if err := splunkClient.UpdateConfFile(scopedLog, "outputs", fmt.Sprintf("remote_queue:%s", bus.Spec.SQS.Name), [][]string{pbVal}); err != nil {
 				updateErr = err
 			}
 		}
 
 		for _, pbVal := range busChangedFieldsInputs {
-			if err := splunkClient.UpdateConfFile(scopedLog, "inputs", fmt.Sprintf("remote_queue:%s", bus.Spec.QueueName), [][]string{pbVal}); err != nil {
+			if err := splunkClient.UpdateConfFile(scopedLog, "inputs", fmt.Sprintf("remote_queue:%s", bus.Spec.SQS.Name), [][]string{pbVal}); err != nil {
 				updateErr = err
 			}
 		}
@@ -1368,8 +1368,8 @@ func pullBusChanged(oldBus, newBus *enterpriseApi.BusSpec, oldLMS, newLMS *enter
 	if oldBus.Provider != newBus.Provider || afterDelete {
 		inputs = append(inputs, []string{"remote_queue.type", busProvider})
 	}
-	if oldBus.Region != newBus.Region || afterDelete {
-		inputs = append(inputs, []string{fmt.Sprintf("remote_queue.%s.auth_region", busProvider), newBus.Region})
+	if oldBus.SQS.Region != newBus.SQS.Region || afterDelete {
+		inputs = append(inputs, []string{fmt.Sprintf("remote_queue.%s.auth_region", busProvider), newBus.SQS.Region})
 	}
 	if oldBus.SQS.Endpoint != newBus.SQS.Endpoint || afterDelete {
 		inputs = append(inputs, []string{fmt.Sprintf("remote_queue.%s.endpoint", busProvider), newBus.SQS.Endpoint})
diff --git a/pkg/splunk/enterprise/indexercluster_test.go b/pkg/splunk/enterprise/indexercluster_test.go
diff --git a/pkg/splunk/enterprise/ingestorcluster.go b/pkg/splunk/enterprise/ingestorcluster.go
diff --git a/pkg/splunk/enterprise/ingestorcluster_test.go b/pkg/splunk/enterprise/ingestorcluster_test.go
diff --git a/test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go b/test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go
