Added tests

Signed-off-by: desmax74 <mdessi@redhat.com>

Author: desmax74

test/e2e/cco_helm_rendering_test.go

@@ -32,6 +32,8 @@ const (
 	kindCredentialsReq    = "CredentialsRequest"
 	ccoSecretName         = "test-release-cloud-creds"
 	ccoNamespace          = "openshift-cloud-credential-operator"
+	testBucket            = "trustify-storage"
+	testRegionUSEast1     = "us-east-1"
 )
 
 func testDatabaseValues() map[string]interface{} {
@@ -45,7 +47,7 @@ func testDatabaseValues() map[string]interface{} {
 
 func awsValues() map[string]interface{} {
 	return map[string]interface{}{
-		fieldAppDomain:    testAppDomain,
+		fieldAppDomain:     testAppDomain,
 		fieldCloudProvider: "aws",
 		fieldCloudCredentials: map[string]interface{}{
 			"aws": map[string]interface{}{
@@ -58,20 +60,20 @@ func awsValues() map[string]interface{} {
 				},
 			},
 		},
-		"storage": map[string]interface{}{
-			"type":   "s3",
-			"bucket": "trustify-storage",
-			"region": "us-east-1",
+		fieldStorage: map[string]interface{}{
+			fieldType:   "s3",
+			fieldBucket: testBucket,
+			fieldRegion: testRegionUSEast1,
 		},
-		"database": testDatabaseValues(),
-		"metrics":  map[string]interface{}{fieldEnabled: false},
-		"tracing":  map[string]interface{}{fieldEnabled: false},
+		fieldDatabase: testDatabaseValues(),
+		fieldMetrics:  map[string]interface{}{fieldEnabled: false},
+		fieldTracing:  map[string]interface{}{fieldEnabled: false},
 	}
 }
 
 func gcpValues() map[string]interface{} {
 	return map[string]interface{}{
-		fieldAppDomain:    testAppDomain,
+		fieldAppDomain:     testAppDomain,
 		fieldCloudProvider: "gcp",
 		fieldCloudCredentials: map[string]interface{}{
 			"gcp": map[string]interface{}{
@@ -83,14 +85,14 @@ func gcpValues() map[string]interface{} {
 				},
 			},
 		},
-		"storage": map[string]interface{}{
-			"type":   "s3",
-			"bucket": "trustify-storage",
-			"region": "us-central1",
+		fieldStorage: map[string]interface{}{
+			fieldType:   "s3",
+			fieldBucket: testBucket,
+			fieldRegion: "us-central1",
 		},
-		"database": testDatabaseValues(),
-		"metrics":  map[string]interface{}{fieldEnabled: false},
-		"tracing":  map[string]interface{}{fieldEnabled: false},
+		fieldDatabase: testDatabaseValues(),
+		fieldMetrics:  map[string]interface{}{fieldEnabled: false},
+		fieldTracing:  map[string]interface{}{fieldEnabled: false},
 	}
 }
 
@@ -167,7 +169,8 @@ func TestHelmRenderAWSCredentialsRequest(t *testing.T) {
 	providerSpec, _ := spec["providerSpec"].(map[string]interface{})
 	require.NotNil(t, providerSpec, "providerSpec should exist")
 	assert.Equal(t, "AWSProviderSpec", providerSpec["kind"], "providerSpec should be AWSProviderSpec")
-	assert.Equal(t, "cloudcredential.openshift.io/v1", providerSpec[fieldAPIVersion], "providerSpec apiVersion should match")
+	assert.Equal(t, "cloudcredential.openshift.io/v1",
+		providerSpec[fieldAPIVersion], "providerSpec apiVersion should match")
 
 	entries, ok := providerSpec["statementEntries"].([]interface{})
 	assert.True(t, ok, "statementEntries should be a list")
@@ -217,16 +220,16 @@ func TestHelmRenderNoCredentialsRequestWithoutCloudProvider(t *testing.T) {
 	chartPath := getChartPath(t)
 	values := map[string]interface{}{
 		fieldAppDomain: testAppDomain,
-		"storage": map[string]interface{}{
-			"type":      "s3",
-			"bucket":    "test-bucket",
-			"region":    "us-east-1",
+		fieldStorage: map[string]interface{}{
+			fieldType:   "s3",
+			fieldBucket: "test-bucket",
+			fieldRegion: testRegionUSEast1,
 			"accessKey": "test-key",
 			"secretKey": "test-secret",
 		},
-		"database": testDatabaseValues(),
-		"metrics":  map[string]interface{}{fieldEnabled: false},
-		"tracing":  map[string]interface{}{fieldEnabled: false},
+		fieldDatabase: testDatabaseValues(),
+		fieldMetrics:  map[string]interface{}{fieldEnabled: false},
+		fieldTracing:  map[string]interface{}{fieldEnabled: false},
 	}
 
 	rendered := renderHelmChart(t, chartPath, values)
@@ -314,16 +317,16 @@ func TestHelmRenderStorageEnvVarsWithoutCCO(t *testing.T) {
 	chartPath := getChartPath(t)
 	values := map[string]interface{}{
 		fieldAppDomain: testAppDomain,
-		"storage": map[string]interface{}{
-			"type":      "s3",
-			"bucket":    "trustify-storage",
-			"region":    "us-east-1",
+		fieldStorage: map[string]interface{}{
+			fieldType:   "s3",
+			fieldBucket: testBucket,
+			fieldRegion: testRegionUSEast1,
 			"accessKey": "explicit-access-key",
 			"secretKey": "explicit-secret-key",
 		},
-		"database": testDatabaseValues(),
-		"metrics":  map[string]interface{}{fieldEnabled: false},
-		"tracing":  map[string]interface{}{fieldEnabled: false},
+		fieldDatabase: testDatabaseValues(),
+		fieldMetrics:  map[string]interface{}{fieldEnabled: false},
+		fieldTracing:  map[string]interface{}{fieldEnabled: false},
 	}
 
 	rendered := renderHelmChart(t, chartPath, values)

test/e2e/helpers_test.go

@@ -61,6 +61,13 @@ const (
 	fieldImporter    = "importer"
 	fieldIngress     = "ingress"
 	fieldHelm        = "helm"
+	fieldStorage     = "storage"
+	fieldDatabase    = "database"
+	fieldMetrics     = "metrics"
+	fieldTracing     = "tracing"
+	fieldType        = "type"
+	fieldBucket      = "bucket"
+	fieldRegion      = "region"
 
 	// Common test skip messages.
 	skipE2ETest         = "skipping e2e test in short mode"

test/e2e/operator_health_test.go

@@ -275,7 +275,7 @@ func TestOperatorMetricsEndpoint(t *testing.T) {
 	assert.NotEmpty(t, service.Spec.Ports, "metrics service should have ports")
 
 	for _, port := range service.Spec.Ports {
-		if port.Name == "https" || port.Name == "metrics" {
+		if port.Name == "https" || port.Name == fieldMetrics {
 			t.Logf("Metrics port: %s -> %d", port.Name, port.Port)
 		}
 	}