update cmft templates with stackrefs

dev-resources/template/1_db.yml

@@ -1,12 +1,14 @@
 AWSTemplateFormatVersion: "2010-09-09"
 Description: "Postgres DB for SQL LRS"
 Parameters:
-  # Networking
+  VPCStackName:
+    Description: Name of VPC Stack (Optional, but if not provided must provide VPCId and DBSubnets).
+    Type: String
   VPCId:
-    Description: "VPC on which to run SQL LRS"
+    Description: "VPC on which to run SQL LRS (if not provided, will attempt to use parameter VPC on VPCStackName)"
     Type: AWS::EC2::VPC::Id
   DBSubnets:
-    Description: Subnets on which to run services
+    Description: Subnets on which the DB is running (if no subnets are provided, will attempt to deploy with PrivateSubnetOne and PrivateSubnetTwo on the VPC provided via VPCStackName)
     Type: List<AWS::EC2::Subnet::Id>
 
   # Postgres
@@ -31,7 +33,7 @@ Parameters:
   DBInstanceClass:
     Description: For provisioned aurora, the instance class to use
     Type: String
-    Default: "db.r4.large"
+    Default: "db.t4g.medium"
   DBName:
     Description: PG Database name. Ignored if DBSnapshotIdentifier is provided
     Type: String
@@ -58,26 +60,42 @@ Parameters:
     AllowedValues:
       - true
       - false
-    Default: true
+    Default: false
 
 Conditions:
-  DBProvisioned: !Equals [!Ref DBEngineMode, "provisioned"]
-  DBSnapshotIdentifierProvided: !Not [!Equals [!Ref DBSnapshotIdentifier, ""]]
+  DBProvisioned:
+    !Equals [!Ref DBEngineMode, "provisioned"]
+  DBSnapshotIdentifierProvided:
+    !Not [!Equals [!Ref DBSnapshotIdentifier, ""]]
+  VPCIdProvided:
+    !Not [!Equals [!Ref VPCId, ""]]
+  DBSubnetsProvided:
+    !Not [!Equals [!Join ["", !Ref DBSubnets], ""]]
 
 Resources:
+
   # PostgreSQL Database
   DBSubnetGroup:
     Description: Subnet group to allow instance access to db
     Type: AWS::RDS::DBSubnetGroup
     Properties:
       DBSubnetGroupDescription: SQL LRS App Instance Subnet Group
-      SubnetIds: !Ref DBSubnets
+      SubnetIds: !If
+        - DBSubnetsProvided
+        - !Ref DBSubnets
+        - - Fn::ImportValue:
+              !Join [":", [!Ref "VPCStackName", "PrivateSubnetOne"]]
+          - Fn::ImportValue:
+              !Join [":", [!Ref "VPCStackName", "PrivateSubnetTwo"]]
 
   DBInstanceSG:
     Type: AWS::EC2::SecurityGroup
     Properties:
       GroupDescription: Access to RDS instances
-      VpcId: !Ref VPCId
+      VpcId: !If
+        - VPCIdProvided
+        - !Ref VPCId
+        - Fn::ImportValue: !Join [":", [!Ref "VPCStackName", "VPC"]]
 
   DBCluster:
     Description: PostgreSQL DB Cluster
@@ -99,7 +117,7 @@ Resources:
         - DBSnapshotIdentifierProvided
         - !Ref AWS::NoValue
         - !Sub "{{resolve:ssm-secure:${DBMasterUserPasswordPath}:${DBMasterUserPasswordVersion}}}"
-      # DBClusterIdentifier: !Sub '${AWS::StackName}-db'
+      # DBClusterIdentifier: !Sub "${AWS::StackName}-db"
       BackupRetentionPeriod: !If
         - DBSnapshotIdentifierProvided
         - !Ref AWS::NoValue
@@ -145,3 +163,13 @@ Outputs:
     Value: !Ref DBInstanceSG
     Export:
       Name: !Sub "${AWS::StackName}:DBInstanceSG"
+  DBName:
+    Description: Name of the DB
+    Value: !Ref DBName
+    Export:
+      Name: !Sub "${AWS::StackName}:DBName"
+  DBMasterUserName:
+    Description: DB Master username
+    Value: !Ref DBMasterUserName
+    Export:
+      Name: !Sub "${AWS::StackName}:DBMasterUserName"