declapract-typescript-ehmpathy 0.20.6 → 0.20.8

package/dist/practices/persist-with-rds/best-practice/package.json

@@ -4,12 +4,12 @@
     "yesql": "@declapract{check.minVersion('4.1.3')}"
   },
   "devDependencies": {
-    "sql-code-generator": "@declapract{check.minVersion('0.9.0')}",
-    "sql-dao-generator": "@declapract{check.minVersion('0.2.0')}",
-    "sql-schema-control": "@declapract{check.minVersion('0.7.3')}",
-    "sql-schema-generator": "@declapract{check.minVersion('0.21.1')}",
+    "sql-code-generator": "@declapract{check.minVersion('0.9.3')}",
+    "sql-dao-generator": "@declapract{check.minVersion('0.3.1')}",
+    "sql-schema-control": "@declapract{check.minVersion('1.5.0')}",
+    "sql-schema-generator": "@declapract{check.minVersion('0.21.4')}",
     "@types/yesql": "@declapract{check.minVersion('3.2.2')}",
-    "@types/pg": "@declapract{check.minVersion('7.14.3')}"
+    "@types/pg": "@declapract{check.minVersion('8.6.1')}"
   },
   "scripts": {
     "generate:dao": "npx sql-dao-generator generate && npm run fix:format",

package/dist/practices/persist-with-rds/best-practice/provision/schema/deploy.database.sh

@@ -39,6 +39,20 @@ if [ -z $POSTGRES_ADMIN_PASSWORD ]; then
   exit 1;
 fi;
 
+# check that the cicd password was provisioned, if in prod, since this is used to create the cicd user
+if [ "$ENVIRONMENT" = "prod" ]; then
+  CICD_USER_PASSWORD=$(aws ssm get-parameter --name "@declapract{variable.organizationName}.@declapract{variable.projectName}.$ENVIRONMENT.database.admin.password" --with-decryption --output text --query Parameter.Value)
+  if [ -z "$CICD_USER_PASSWORD" ]; then
+    echo "\nerror: CICD_USER_PASSWORD must be provisioned with terraform before running this"
+    exit 1;
+  fi;
+  if [ "$CICD_USER_PASSWORD" = "__IGNORED__" ]; then
+    echo "\nerror: CICD_USER_PASSWORD must be set to a value other than the default of '__IGNORED__'"
+    exit 1;
+  fi;
+fi;
+
+
 # define the postgres connecition string
 CLUSTER_HOST=$([ "$ENVIRONMENT" = 'prod' ] && echo "@declapract{variable.databaseClusterHost.prod}" || echo "@declapract{variable.databaseClusterHost.dev}");
 CLUSTER_CONNECTION_STRING=postgresql://postgres:$POSTGRES_ADMIN_PASSWORD@$CLUSTER_HOST:5432
@@ -60,12 +74,18 @@ psql $SVC_DB_CONNECTION_STRING -f $INIT_SQLS_DIR/.extensions.sql
 echo "\n 🔨 creating the schema..."
 psql $SVC_DB_CONNECTION_STRING -f $INIT_SQLS_DIR/.schema.sql
 
-echo "\n 🔨 creating the cicd user..."
-psql $SVC_DB_CONNECTION_STRING -f $INIT_SQLS_DIR/.user.cicd.sql
-
 if [ "$ENVIRONMENT" = "prod" ]; then
   echo "\n 🔨 granting reads to the datalakedb user..." # only in prod env; we dont want dev's testing data in our datalake
   psql $SVC_DB_CONNECTION_STRING -f $INIT_SQLS_DIR/.user.datalakedb.sql
 fi;
 
+echo "\n 🔨 creating the cicd user..."
+CICD_USER_CREATE_SQL_PATH=$INIT_SQLS_DIR/.user.cicd.sql
+if [ "$ENVIRONMENT" = "prod" ]; then
+  CICD_USER_CREATE_SQL_PATH_TEMP=$CICD_USER_CREATE_SQL_PATH.tmp # in prod, we must create a temp file which will have the actual password we'll use when creating the cicd user
+  cat $CICD_USER_CREATE_SQL_PATH | sed "s/__CHANG3_ME__/${CICD_USER_PASSWORD}/" > $CICD_USER_CREATE_SQL_PATH_TEMP # create the temp file w/ the actual password
+  psql $SVC_DB_CONNECTION_STRING -f $CICD_USER_CREATE_SQL_PATH_TEMP # run the temp create sql w/ the actual password
+  rm $CICD_USER_CREATE_SQL_PATH_TEMP # remove the temp file, so the password doesn't get checked in
+else
+  psql $SVC_DB_CONNECTION_STRING -f $CICD_USER_CREATE_SQL_PATH # otherwise, we can run the file directly. no password replacement required
 echo "\n 🎉 done"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "declapract-typescript-ehmpathy",
-  "version": "0.20.6",
+  "version": "0.20.8",
   "description": "declapract best practices declarations for typescript",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",