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

examples/aws-rds/aurora-mysql/rds-aurora-snap-blueprint.yaml

@@ -11,6 +11,7 @@ actions:
           instanceID: "{{ .Phases.createSnapshot.Output.instanceID }}"
           securityGroupID: "{{ .Phases.createSnapshot.Output.securityGroupID }}"
           allocatedStorage: "{{ .Phases.createSnapshot.Output.allocatedStorage }}"
+          dbSubnetGroup: "{{ .Phases.createSnapshot.Output.dbSubnetGroup }}"
     phases:
     - func: CreateRDSSnapshot
       name: createSnapshot
@@ -28,6 +29,7 @@ actions:
         snapshotID:  "{{ .ArtifactsIn.backupInfo.KeyValue.snapshotID }}"
         securityGroupID:  "{{ .ArtifactsIn.backupInfo.KeyValue.securityGroupID }}"
         dbEngine: "aurora-mysql"
+        dbSubnetGroup: "{{ .ArtifactsIn.backupInfo.KeyValue.dbSubnetGroup }}"
   delete:
     inputArtifactNames:
     - backupInfo

examples/aws-rds/postgresql/rds-postgres-blueprint.yaml

@@ -9,6 +9,7 @@ actions:
         keyValue:
           id: '{{ .Object.metadata.namespace }}-{{ toDate "2006-01-02T15:04:05.999999999Z07:00" .Time  | date "2006-01-02T15-04-05" }}'
           sgid: "{{ .Phases.backupSnapshots.Output.securityGroupID }}"
+          dbSubnetGroup: "{{ .Phases.backupSnapshots.Output.dbSubnetGroup }}"
     phases:
     - func: KubeTask
       name: backupSnapshots
@@ -42,6 +43,9 @@ actions:
 
             vpcsgid=$(aws rds describe-db-instances --db-instance-identifier="{{ index .Object.data "postgres.instanceid" }}" --region "{{ .Profile.Location.Region }}" --query 'DBInstances[].VpcSecurityGroups[].VpcSecurityGroupId' --output text)
             kando output securityGroupID $vpcsgid
+
+            dbSubnetGroup=$(aws rds describe-db-instances --db-instance-identifier="{{ index .Object.data "postgres.instanceid" }}" --region "{{ .Profile.Location.Region }}" --query 'DBInstances[0].DBSubnetGroup.DBSubnetGroupName' --output text)
+            kando output dbSubnetGroup $dbSubnetGroup
   restore:
     inputArtifactNames:
     - snapshot
@@ -77,7 +81,7 @@ actions:
             aws rds wait db-instance-deleted --region "{{ .Profile.Location.Region }}" --db-instance-identifier="{{ index .Object.data "postgres.instanceid" }}"
 
             # Restore instance from snapshot
-            aws rds restore-db-instance-from-db-snapshot --db-instance-identifier="{{ index .Object.data "postgres.instanceid" }}" --db-snapshot-identifier="{{ .ArtifactsIn.snapshot.KeyValue.id }}" --vpc-security-group-ids "{{ .ArtifactsIn.snapshot.KeyValue.sgid }}" --region "{{ .Profile.Location.Region }}"
+            aws rds restore-db-instance-from-db-snapshot --db-instance-identifier="{{ index .Object.data "postgres.instanceid" }}" --db-snapshot-identifier="{{ .ArtifactsIn.snapshot.KeyValue.id }}" --vpc-security-group-ids "{{ .ArtifactsIn.snapshot.KeyValue.sgid }}" --region "{{ .Profile.Location.Region }}" --db-subnet-group-name "{{ .ArtifactsIn.snapshot.KeyValue.dbSubnetGroup }}"
             aws rds wait db-instance-available --region "{{ .Profile.Location.Region }}" --db-instance-identifier="{{ index .Object.data "postgres.instanceid" }}"
   delete:
     inputArtifactNames:

examples/aws-rds/postgresql/rds-postgres-dump-blueprint.yaml

@@ -11,6 +11,7 @@ actions:
           instanceID: "{{ .Phases.createSnapshot.Output.instanceID }}"
           securityGroupID: "{{ .Phases.createSnapshot.Output.securityGroupID }}"
           backupID: "{{ .Phases.exportSnapshot.Output.backupID }}"
+          dbSubnetGroup: "{{ .Phases.createSnapshot.Output.dbSubnetGroup }}"
     phases:
     - func: CreateRDSSnapshot
       name: createSnapshot
@@ -33,6 +34,7 @@ actions:
         databases: '{{ index .Object.data "postgres.databases" }}'
         snapshotID: "{{ .Phases.createSnapshot.Output.snapshotID }}"
         backupArtifactPrefix: test-postgresql-instance/postgres
+        dbSubnetGroup: "{{ .Phases.createSnapshot.Output.dbSubnetGroup }}"
     - func: DeleteRDSSnapshot
       name: deleteSnapshot
       args:
@@ -57,7 +59,7 @@ actions:
         username: '{{ index .Phases.restoreSnapshots.Secrets.dbsecret.Data "username" | toString }}'
         password: '{{ index .Phases.restoreSnapshots.Secrets.dbsecret.Data "password" | toString }}'
         dbEngine: "PostgreSQL"
-
+        dbSubnetGroup: "{{ .ArtifactsIn.backupInfo.KeyValue.dbSubnetGroup }}"
   delete:
     phases:
     - func: KubeTask

examples/aws-rds/postgresql/rds-postgres-snap-blueprint.yaml

@@ -11,6 +11,7 @@ actions:
           instanceID: "{{ .Phases.createSnapshot.Output.instanceID }}"
           securityGroupID: "{{ .Phases.createSnapshot.Output.securityGroupID }}"
           allocatedStorage: "{{ .Phases.createSnapshot.Output.allocatedStorage }}"
+          dbSubnetGroup: "{{ .Phases.createSnapshot.Output.dbSubnetGroup }}"
     phases:
     - func: CreateRDSSnapshot
       name: createSnapshot
@@ -26,6 +27,7 @@ actions:
         instanceID:  "{{ .ArtifactsIn.backupInfo.KeyValue.instanceID }}"
         snapshotID:  "{{ .ArtifactsIn.backupInfo.KeyValue.snapshotID }}"
         securityGroupID:  "{{ .ArtifactsIn.backupInfo.KeyValue.securityGroupID }}"
+        dbSubnetGroup: "{{ .ArtifactsIn.backupInfo.KeyValue.dbSubnetGroup }}"
   delete:
     inputArtifactNames:
     - backupInfo