From 35fcdf79cca21eef510301d9396e87aadb723da2 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 16 Sep 2021 13:38:11 -0600
Subject: [PATCH] Add DBItentifier and remove old DB

---
 cloudformation/lib/api.js |  2 +-
 cloudformation/lib/db.js  | 46 ++-------------------------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/cloudformation/lib/api.js b/cloudformation/lib/api.js
index 4815d246..40543880 100644
--- a/cloudformation/lib/api.js
+++ b/cloudformation/lib/api.js
@@ -223,7 +223,7 @@ const stack = {
                         { Name: 'MAPBOX_TOKEN', Value: cf.ref('MapboxToken') },
                         { Name: 'MAILGUN_API_KEY', Value: cf.ref('MailGun') },
                         { Name: 'OPENCOLLECTIVE_API_KEY', Value: cf.ref('OpenCollective') },
-                        { Name: 'POSTGRES', Value: cf.join(['postgresql://openaddresses:', cf.ref('DatabasePassword'), '@', cf.getAtt('DBInstance', 'Endpoint.Address'), ':5432/openaddresses']) },
+                        { Name: 'POSTGRES', Value: cf.join(['postgresql://openaddresses:', cf.ref('DatabasePassword'), '@', cf.getAtt('DBInstanceVPC', 'Endpoint.Address'), ':5432/openaddresses']) },
                         { Name: 'SharedSecret', Value: cf.ref('SharedSecret') },
                         { Name: 'GithubSecret', Value: cf.ref('GithubSecret') },
                         { Name: 'Bucket', Value: cf.ref('Bucket') },
diff --git a/cloudformation/lib/db.js b/cloudformation/lib/db.js
index 94f9095a..25b6b786 100644
--- a/cloudformation/lib/db.js
+++ b/cloudformation/lib/db.js
@@ -23,6 +23,7 @@ const stack = {
             Properties: {
                 Engine: 'postgres',
                 DBName: 'openaddresses',
+                DBInstanceIdentifier: cf.stackName,
                 KmsKeyId: cf.ref('OAKMS'),
                 EngineVersion: '13.3',
                 MasterUsername: 'openaddresses',
@@ -52,25 +53,6 @@ const stack = {
                 }]
             }
         },
-        DBInstance: {
-            Type: 'AWS::RDS::DBInstance',
-            Properties: {
-                Engine: 'postgres',
-                DBName: 'openaddresses',
-                EngineVersion: '13.3',
-                MasterUsername: 'openaddresses',
-                MasterUserPassword: cf.ref('DatabasePassword'),
-                AllowMajorVersionUpgrade: true,
-                AllocatedStorage: 10,
-                MaxAllocatedStorage: 100,
-                BackupRetentionPeriod: 10,
-                StorageType: 'gp2',
-                DBInstanceClass: cf.ref('DatabaseType'),
-                DBSecurityGroups: [cf.ref('DBSecurityGroup')],
-                DBSubnetGroupName: cf.ref('DBSubnet'),
-                PubliclyAccessible: true
-            }
-        },
         DBSubnet: {
             Type: 'AWS::RDS::DBSubnetGroup',
             Properties: {
@@ -85,32 +67,8 @@ const stack = {
                 ]
             }
         },
-        DBSecurityGroup: {
-            Type: 'AWS::RDS::DBSecurityGroup',
-            Properties: {
-                GroupDescription: cf.join('-', [cf.stackName, 'rds-sg']),
-                EC2VpcId: 'vpc-3f2aa15a',
-                DBSecurityGroupIngress: [{
-                    EC2SecurityGroupId: cf.getAtt('APIServiceSecurityGroup', 'GroupId')
-                },{
-                    CIDRIP: '0.0.0.0/0'
-                }]
-            }
-        }
-
     },
     Outputs: {
-        DBVPC: {
-            Description: 'Postgres Connection String',
-            Value: cf.join([
-                'postgresql://openaddresses',
-                ':',
-                cf.ref('DatabasePassword'),
-                '@',
-                cf.getAtt('DBInstanceVPC', 'Endpoint.Address'),
-                ':5432/openaddresses'
-            ])
-        },
         DB: {
             Description: 'Postgres Connection String',
             Value: cf.join([
@@ -118,7 +76,7 @@ const stack = {
                 ':',
                 cf.ref('DatabasePassword'),
                 '@',
-                cf.getAtt('DBInstance', 'Endpoint.Address'),
+                cf.getAtt('DBInstanceVPC', 'Endpoint.Address'),
                 ':5432/openaddresses'
             ])
         }