[Minor] Modify Create DB instance in RDS test to use DBsubnetGroup (#…

…1959) * Update RDS postgres app implementation, execute postgres command from Deployment Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Fix Lint Remove unnecessary trailing new line Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Initialize testWorkloadName field Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Move BastionWorkload function to be used as utility * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Remove export of BastionWorkload() utility function Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Add app name in error messages Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Update RDS Aurora app implementation, execute mysql query from Deployment Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Remove unused methods from rds aurora app Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Add helper methods to add DBSubnetGroup Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * add callers to create and delete dbsubnetGroups in rds postgres app test Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * add callers to create and delete dbsubnetGroups in rds aurora app test Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Refactor code * Refactor code Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * remove duplicate import Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * minor refactor * correct indentation * Fix error * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Update RDS Aurora app implementation, execute mysql query from Deployment Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Remove unused methods from rds aurora app Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Minor refactor Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * minor refactor * Minor refactor * Modify Create RDS Snapshot function to add dbSubnetGroup as outputArtifact * Modify RestoreRDSSnapshot and ExportRDSLocation function to accept dbSubnetGroup as optional argument Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Add provision to enable/disable public access for RDS instances created during test Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Pass VpcId while creating security group * Modify Create RDS Snapshot function to add dbSubnetGroup as outputArtifact * Modify RestoreRDSSnapshot and ExportRDSLocation function to accept dbSubnetGroup as optional argument Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Use securityGroup ID instead of security group name to authorizeSecurityGroupIngress Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Modify Create RDS Snapshot function to add dbSubnetGroup as outputArtifact * Modify RestoreRDSSnapshot and ExportRDSLocation function to accept dbSubnetGroup as optional argument Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Minor Fix * Modify Create RDS Snapshot function to add dbSubnetGroup as outputArtifact * Modify RestoreRDSSnapshot and ExportRDSLocation function to accept dbSubnetGroup as optional argument Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Modify RDS postgres blueprint to use DBsubnetGroup Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Modify RDS postgres dump blueprint to use DBsubnetGroup Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Modify RDS postgres snap blueprint to use DBsubnetGroup * Modify RDS Aurora snap blueprint example to use DBsubnetGroup Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Modify Create Db instance in test to us DbsubnetGroup Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com> * Resolve merge conflict --------- Signed-off-by: Akanksha Kumari <akankshakumari393@gmail.com>
kanisterio · Mar 30, 2023 · 22e52b1 · 22e52b1
1 parent 4e69773
commit 22e52b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/app/rds_aurora_mysql.go b/pkg/app/rds_aurora_mysql.go
@@ -175,7 +175,7 @@ func (a *RDSAuroraMySQLDB) Install(ctx context.Context, namespace string) error
 
 	// Create RDS instance
 	log.Info().Print("Creating RDS Aurora DB cluster.", field.M{"app": a.name, "id": a.id})
-	_, err = rdsCli.CreateDBCluster(ctx, AuroraDBStorage, AuroraDBInstanceClass, a.id, string(function.DBEngineAuroraMySQL), a.dbName, a.username, a.password, []string{a.securityGroupID})
+	_, err = rdsCli.CreateDBCluster(ctx, AuroraDBStorage, AuroraDBInstanceClass, a.id, a.dbSubnetGroup, string(function.DBEngineAuroraMySQL), a.dbName, a.username, a.password, []string{a.securityGroupID})
 	if err != nil {
 		return errors.Wrap(err, "Error creating DB cluster")
 	}

diff --git a/pkg/app/rds_postgres.go b/pkg/app/rds_postgres.go
@@ -180,7 +180,7 @@ func (pdb *RDSPostgresDB) Install(ctx context.Context, ns string) error {
 
 	// Create RDS instance
 	log.Info().Print("Creating RDS instance.", field.M{"app": pdb.name, "id": pdb.id})
-	_, err = rdsCli.CreateDBInstance(ctx, awssdk.Int64(20), dbInstanceType, pdb.id, "postgres", pdb.username, pdb.password, []string{pdb.securityGroupID}, awssdk.Bool(pdb.publicAccess), nil, "")
+	_, err = rdsCli.CreateDBInstance(ctx, awssdk.Int64(20), dbInstanceType, pdb.id, "postgres", pdb.username, pdb.password, []string{pdb.securityGroupID}, awssdk.Bool(pdb.publicAccess), nil, pdb.dbSubnetGroup)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/aws/rds/rds.go b/pkg/aws/rds/rds.go
@@ -53,17 +53,16 @@ func (r RDS) CreateDBInstance(ctx context.Context, storage *int64, instanceClass
 		DBInstanceClass:      &instanceClass,
 		DBInstanceIdentifier: &instanceID,
 		Engine:               &engine,
+		DBSubnetGroupName:    aws.String(dbSubnetGroup),
 	}
 
 	// check if the instance is being restored from an existing cluster
 	switch {
 	case restoredClusterID != nil && publicAccess != nil:
 		dbi.DBClusterIdentifier = restoredClusterID
-		dbi.DBSubnetGroupName = aws.String(dbSubnetGroup)
 		dbi.PubliclyAccessible = publicAccess
 	case restoredClusterID != nil && publicAccess == nil:
 		dbi.DBClusterIdentifier = restoredClusterID
-		dbi.DBSubnetGroupName = aws.String(dbSubnetGroup)
 	default:
 		// if not restoring from an existing cluster, create a new instance input
 		dbi.AllocatedStorage = storage
@@ -75,10 +74,11 @@ func (r RDS) CreateDBInstance(ctx context.Context, storage *int64, instanceClass
 	return r.CreateDBInstanceWithContext(ctx, dbi)
 }
 
-func (r RDS) CreateDBCluster(ctx context.Context, storage int64, instanceClass, instanceID, engine, dbName, username, password string, sgIDs []string) (*rds.CreateDBClusterOutput, error) {
+func (r RDS) CreateDBCluster(ctx context.Context, storage int64, instanceClass, instanceID, dbSubnetGroup, engine, dbName, username, password string, sgIDs []string) (*rds.CreateDBClusterOutput, error) {
 	dbi := &rds.CreateDBClusterInput{
 		DBClusterIdentifier: &instanceID,
 		DatabaseName:        &dbName,
+		DBSubnetGroupName:   aws.String(dbSubnetGroup),
 		Engine:              &engine,
 		MasterUsername:      &username,
 		MasterUserPassword:  &password,