Use DNS delegated

Author: goruha

test/component_test.go

@@ -54,33 +54,12 @@ func TestComponent(t *testing.T) {
 
 		// Setup phase: Create DNS zones for testing
 		suite.Setup(t, func(t *testing.T, atm *helper.Atmos) {
-			randomID := suite.GetRandomIdentifier()
-			domainName := fmt.Sprintf("example-%s.net", randomID)
-
-			// Deploy the primary DNS zone
-			inputs := map[string]interface{}{
-				"domain_names": []string{domainName},
-			}
-
-			primaryDnsComponent := helper.NewAtmosComponent("dns-primary", "default-test", inputs)
-			atm.Deploy(primaryDnsComponent)
-
-			primaryZones := map[string]zone{}
-			atm.OutputStruct(primaryDnsComponent, "zones", &primaryZones)
-
-			primaryDomains := make([]string, 0, len(primaryZones))
-			for k := range primaryZones {
-				primaryDomains = append(primaryDomains, k)
-			}
-
-			primaryDomainName := primaryDomains[0]
-
 			// Deploy the delegated DNS zone
-			inputs = map[string]interface{}{
+			inputs := map[string]interface{}{
 				"zone_config": []map[string]interface{}{
 					{
-						"subdomain": randomID,
-						"zone_name": primaryDomainName,
+						"subdomain": suite.GetRandomIdentifier(),
+						"zone_name": "components.cptest.test-automation.app",
 					},
 				},
 			}
@@ -89,31 +68,16 @@ func TestComponent(t *testing.T) {
 
 		// Teardown phase: Destroy the DNS zones created during setup
 		suite.TearDown(t, func(t *testing.T, atm *helper.Atmos) {
-			dnsPrimaryComponent := helper.NewAtmosComponent("dns-primary", "default-test", map[string]interface{}{})
-
-			primaryZones := map[string]zone{}
-			atm.OutputStruct(dnsPrimaryComponent, "zones", &primaryZones)
-
-			primaryDomains := make([]string, 0, len(primaryZones))
-			for k := range primaryZones {
-				primaryDomains = append(primaryDomains, k)
-			}
-
-			primaryDomainName := primaryDomains[0]
-
-			randomID := suite.GetRandomIdentifier()
-
+			// Deploy the delegated DNS zone
 			inputs := map[string]interface{}{
 				"zone_config": []map[string]interface{}{
 					{
-						"subdomain": randomID,
-						"zone_name": primaryDomainName,
+						"subdomain": suite.GetRandomIdentifier(),
+						"zone_name": "components.cptest.test-automation.app",
 					},
 				},
 			}
-
-			atm.GetAndDestroy("dns-delegated", "default-test", inputs)
-			atm.GetAndDestroy("dns-primary", "default-test", map[string]interface{}{})
+			atm.GetAndDeploy("dns-delegated", "default-test", inputs)
 		})
 
 		// Test phase: Validate the functionality of the ALB component
@@ -194,6 +158,12 @@ func TestComponent(t *testing.T) {
 
 			schemaExistsInRdsInstance := aws.GetWhetherSchemaExistsInRdsPostgresInstance(t, dbUrl, int32(dbPort), adminUsername, adminUserPassword, databaseName)
 			assert.True(t, schemaExistsInRdsInstance)
+
+			schemaExistsInRdsInstance = aws.GetWhetherSchemaExistsInRdsPostgresInstance(t, masterHostname, int32(dbPort), adminUsername, adminUserPassword, databaseName)
+			assert.True(t, schemaExistsInRdsInstance)
+
+			schemaExistsInRdsInstance = aws.GetWhetherSchemaExistsInRdsPostgresInstance(t, replicasHostname, int32(dbPort), adminUsername, adminUserPassword, databaseName)
+			assert.True(t, schemaExistsInRdsInstance)
 		})
 
 		// Test phase: Validate the functionality of the ALB component
@@ -232,7 +202,7 @@ func TestComponent(t *testing.T) {
 			assert.Equal(t, expectedMasterHostname, masterHostname)
 
 			ssmKeyPaths := atm.OutputList(component, "ssm_key_paths")
-			assert.Equal(t, 6, len(ssmKeyPaths))
+			assert.Equal(t, 7, len(ssmKeyPaths))
 
 			kmsKeyArn := atm.Output(component, "kms_key_arn")
 			assert.NotEmpty(t, kmsKeyArn)
@@ -253,6 +223,23 @@ func TestComponent(t *testing.T) {
 
 			masterHostnameDNSRecord := aws.GetRoute53Record(t, delegatedDomainNZoneId, masterHostname, "CNAME", awsRegion)
 			assert.Equal(t, *masterHostnameDNSRecord.ResourceRecords[0].Value, configMap["endpoint"])
+
+			passwordSSMKey, ok := configMap["password_ssm_key"].(string)
+			assert.True(t, ok, "password_ssm_key should be a string")
+
+			adminUserPassword := aws.GetParameter(t, awsRegion, passwordSSMKey)
+
+			dbUrl, ok := configMap["endpoint"].(string)
+			assert.True(t, ok, "endpoint should be a string")
+
+			dbPort, ok := inputs["database_port"].(int)
+			assert.True(t, ok, "database_port should be an int")
+
+			schemaExistsInRdsInstance := aws.GetWhetherSchemaExistsInRdsPostgresInstance(t, dbUrl, int32(dbPort), adminUsername, adminUserPassword, databaseName)
+			assert.True(t, schemaExistsInRdsInstance)
+
+			schemaExistsInRdsInstance = aws.GetWhetherSchemaExistsInRdsPostgresInstance(t, masterHostname, int32(dbPort), adminUsername, adminUserPassword, databaseName)
+			assert.True(t, schemaExistsInRdsInstance)
 		})
 	})
 }

test/fixtures/stacks/catalog/usecase/serverless.yaml

@@ -17,19 +17,16 @@ components:
 
         dns_gbl_delegated_environment_name: "ue2"
 
-        # Serverless v1 configuration
-        engine_mode: serverless
-        instance_type: "" # serverless engine_mode ignores `var.instance_type`
-        engine_version: "13.12" # Latest supported version as of 08/28/2023
+        # Serverless v2 configuration
+        engine_mode: provisioned
+        instance_type: "db.serverless" # serverless engine_mode ignores `var.instance_type`
+        engine_version: "13.15" # Latest supported version as of 08/28/2023
         cluster_family: aurora-postgresql13
-        cluster_size: 0 # serverless
-        scaling_configuration:
-          - auto_pause: true
-            max_capacity: 4
-            min_capacity: 2
-            seconds_until_auto_pause: 300
-            timeout_action: null
-
+        cluster_size: 1
+         # serverless
+        serverlessv2_scaling_configuration:
+          min_capacity: 2
+          max_capacity: 4
         admin_user: postgres
         admin_password: "" # generate random password
         database_name: postgres