fixup! implement handling for customized storage bucket names

Author: andrewazores

internal/controllers/common/resource_definitions/resource_definitions.go

@@ -1466,6 +1466,12 @@ func NewCoreContainer(cr *model.CryostatInstance, specs *ServiceSpecs, imageTag
 					Value: *cr.Spec.ObjectStorageOptions.StorageBucketNameOptions.ArchivedRecordings,
 				})
 			}
+			if cr.Spec.ObjectStorageOptions.StorageBucketNameOptions.ArchivedReports != nil {
+				envs = append(envs, corev1.EnvVar{
+					Name:  "CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME",
+					Value: *cr.Spec.ObjectStorageOptions.StorageBucketNameOptions.ArchivedReports,
+				})
+			}
 			if cr.Spec.ObjectStorageOptions.StorageBucketNameOptions.EventTemplates != nil {
 				envs = append(envs, corev1.EnvVar{
 					Name:  "STORAGE_BUCKETS_EVENT_TEMPLATES_NAME",

internal/controllers/reconciler_test.go

@@ -970,7 +970,7 @@ func (c *controllerTest) commonTests() {
 			It("Should update the core deployment", func() {
 				secretOptional := false
 				t.checkCoreHasEnvironmentVariables([]corev1.EnvVar{
-					corev1.EnvVar{
+					{
 						Name: "QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID",
 						ValueFrom: &corev1.EnvVarSource{
 							FieldRef:         nil,
@@ -985,7 +985,7 @@ func (c *controllerTest) commonTests() {
 							},
 						},
 					},
-					corev1.EnvVar{
+					{
 						Name: "QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY",
 						ValueFrom: &corev1.EnvVarSource{
 							FieldRef:         nil,
@@ -1000,29 +1000,71 @@ func (c *controllerTest) commonTests() {
 							},
 						},
 					},
-					corev1.EnvVar{
+					{
 						Name:  "QUARKUS_S3_ENDPOINT_OVERRIDE",
 						Value: "https://example.com:1234",
 					},
-					corev1.EnvVar{
+					{
 						Name:  "QUARKUS_S3_PATH_STYLE_ACCESS",
 						Value: "true",
 					},
-					corev1.EnvVar{
+					{
 						Name:  "QUARKUS_S3_AWS_REGION",
 						Value: "region-east-1",
 					},
-					corev1.EnvVar{
+					{
 						Name:  "QUARKUS_S3_SYNC_CLIENT_TLS_TRUST_MANAGERS_PROVIDER_TYPE",
 						Value: "trust-all",
 					},
-					corev1.EnvVar{
+					{
 						Name:  "STORAGE_METADATA_STORAGE_MODE",
 						Value: "tagging",
 					},
 				})
 			})
 		})
+		Context("with S3 storage bucket names configuration", func() {
+			BeforeEach(func() {
+				secretName := "external-s3-creds"
+				t.StorageSecret = t.NewExternalStorageSecret(secretName)
+				t.objs = append(t.objs, t.NewCryostatWithCustomizedStorageBucketNames().Object, t.StorageSecret)
+			})
+			JustBeforeEach(func() {
+				t.reconcileCryostatFully()
+			})
+			It("Should update the core deployment", func() {
+				t.checkCoreHasEnvironmentVariables([]corev1.EnvVar{
+					{
+						Name:  "STORAGE_BUCKETS_ARCHIVES_NAME",
+						Value: "a",
+					},
+					{
+						Name:  "CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME",
+						Value: "b",
+					},
+					{
+						Name:  "STORAGE_BUCKETS_EVENT_TEMPLATES_NAME",
+						Value: "c",
+					},
+					{
+						Name:  "STORAGE_BUCKETS_PROBE_TEMPLATES_NAME",
+						Value: "d",
+					},
+					{
+						Name:  "STORAGE_BUCKETS_HEAP_DUMPS_NAME",
+						Value: "e",
+					},
+					{
+						Name:  "STORAGE_BUCKETS_THREAD_DUMPS_NAME",
+						Value: "f",
+					},
+					{
+						Name:  "STORAGE_BUCKETS_METADATA_NAME",
+						Value: "z",
+					},
+				})
+			})
+		})
 		Context("with custom PVC spec overriding all defaults", func() {
 			BeforeEach(func() {
 				t.objs = append(t.objs, t.NewCryostatWithPVCSpec().Object)

internal/test/resources.go

@@ -244,6 +244,36 @@ func (r *TestResources) NewCryostatWithExternalS3(secretName string) *model.Cryo
 	return cr
 }
 
+func (r *TestResources) NewCryostatWithCustomizedStorageBucketNames() *model.CryostatInstance {
+	cr := r.NewCryostat()
+	providerUrl := "https://example.com:1234"
+	region := "region-east-1"
+
+	archivedRecordings := "a"
+	archivedReports := "b"
+	eventTemplates := "c"
+	probeTemplates := "d"
+	heapDumps := "e"
+	threadDumps := "f"
+	metadata := "z"
+	cr.Spec.ObjectStorageOptions = &operatorv1beta2.ObjectStorageOptions{
+		Provider: &operatorv1beta2.ObjectStorageProviderOptions{
+			URL:    &providerUrl,
+			Region: &region,
+		},
+		StorageBucketNameOptions: &operatorv1beta2.StorageBucketNameOptions{
+			ArchivedRecordings:     &archivedRecordings,
+			ArchivedReports:        &archivedReports,
+			EventTemplates:         &eventTemplates,
+			JMCAgentProbeTemplates: &probeTemplates,
+			HeapDumps:              &heapDumps,
+			ThreadDumps:            &threadDumps,
+			Metadata:               &metadata,
+		},
+	}
+	return cr
+}
+
 func (r *TestResources) NewCryostatWithPVCSpecLegacy() *model.CryostatInstance {
 	cr := r.NewCryostat()
 	cr.Spec.StorageOptions = &operatorv1beta2.StorageConfigurations{