CSPL-4360 Fixing tests after merge

Author: kasiakoziol

pkg/splunk/enterprise/indexercluster_test.go

@@ -2111,6 +2111,8 @@ func TestGetChangedQueueFieldsForIndexer(t *testing.T) {
 		{fmt.Sprintf("remote_queue.%s.large_message_store.endpoint", provider), os.Spec.S3.Endpoint},
 		{fmt.Sprintf("remote_queue.%s.large_message_store.path", provider), os.Spec.S3.Path},
 		{fmt.Sprintf("remote_queue.%s.dead_letter_queue.name", provider), queue.Spec.SQS.DLQ},
+		{fmt.Sprintf("remote_queue.%s.max_count.max_retries_per_part", provider), "4"},
+		{fmt.Sprintf("remote_queue.%s.retry_policy", provider), "max_count"},
 	}, queueChangedFieldsInputs)
 
 	assert.Equal(t, 12, len(queueChangedFieldsOutputs))

pkg/splunk/enterprise/util.go

@@ -417,8 +417,8 @@ func GetSmartstoreRemoteVolumeSecrets(ctx context.Context, volume enterpriseApi.
 	return accessKey, secretKey, namespaceScopedSecret.ResourceVersion, nil
 }
 
-// GetBusRemoteVolumeSecrets is used to retrieve access key and secrete key for Index & Ingestion separation
-func GetBusRemoteVolumeSecrets(ctx context.Context, volume enterpriseApi.VolumeSpec, client splcommon.ControllerClient, cr splcommon.MetaObject) (string, string, error) {
+// GetQueueRemoteVolumeSecrets is used to retrieve access key and secrete key for Index & Ingestion separation
+func GetQueueRemoteVolumeSecrets(ctx context.Context, volume enterpriseApi.VolumeSpec, client splcommon.ControllerClient, cr splcommon.MetaObject) (string, string, error) {
 	namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), volume.SecretRef)
 	if err != nil {
 		return "", "", err

pkg/splunk/enterprise/util_test.go

@@ -2624,8 +2624,8 @@ func TestUpdateCRStatus(t *testing.T) {
 		WithStatusSubresource(&enterpriseApi.Standalone{}).
 		WithStatusSubresource(&enterpriseApi.MonitoringConsole{}).
 		WithStatusSubresource(&enterpriseApi.IndexerCluster{}).
-		WithStatusSubresource(&enterpriseApi.Bus{}).
-		WithStatusSubresource(&enterpriseApi.LargeMessageStore{}).
+		WithStatusSubresource(&enterpriseApi.Queue{}).
+		WithStatusSubresource(&enterpriseApi.ObjectStorage{}).
 		WithStatusSubresource(&enterpriseApi.IngestorCluster{}).
 		WithStatusSubresource(&enterpriseApi.SearchHeadCluster{})
 	c := builder.Build()
@@ -3307,8 +3307,8 @@ func TestGetCurrentImage(t *testing.T) {
 		WithStatusSubresource(&enterpriseApi.MonitoringConsole{}).
 		WithStatusSubresource(&enterpriseApi.IndexerCluster{}).
 		WithStatusSubresource(&enterpriseApi.SearchHeadCluster{}).
-		WithStatusSubresource(&enterpriseApi.Bus{}).
-		WithStatusSubresource(&enterpriseApi.LargeMessageStore{}).
+		WithStatusSubresource(&enterpriseApi.Queue{}).
+		WithStatusSubresource(&enterpriseApi.ObjectStorage{}).
 		WithStatusSubresource(&enterpriseApi.IngestorCluster{})
 	client := builder.Build()
 	client.Create(ctx, &current)