Fixing feedback regarding repeated usage of constants

Author: jmusselwhite

Makefile

@@ -18,7 +18,7 @@ SHELL := /usr/bin/env bash
 # All is the first target in the file so it will get picked up when you just run 'make' on its own
 linting: check_shell check_python check_golang check_terraform check_docker check_base_files check_headers check_trailing_whitespace
 
-SQLNAME := demo-postgres-3
+SQLNAME := demo-postgres-5
 
 # The .PHONY directive tells make that this isn't a real target and so
 # the presence of a file named 'check_shell' won't cause this target to stop

README.md

@@ -109,15 +109,21 @@ If you don't have a Google Cloud account you can sign up for a [free account](ht
 
 ## Deployment
 
-Deployment is fully automated except for a few prompts for user input. In order
-to deploy you need to run **create.sh** and follow the prompts. The script
+Deployment is fully automated. In order
+to deploy you need to run **create.sh**. The script
 takes the following parameters, in order:
 * A name for your Cloud SQL instance
 * A username for a new Postgres user that you will use to connect to the
 instance with
 * A username for the pgAdmin console
 
-Example: `./create.sh INSTANCE_NAME POSTGRES_USERNAME PGADMIN_USERNAME`
+The script requires the following environment variables to be defined:
+* USER_PASSWORD - the password to login to the Postgres instance
+* PG_ADMIN_CONSOLE_PASSWORD - the password to login to the pgAdmin UI
+
+Here is what it looks like to run **create.sh**:  
+
+```USER_PASSWORD=password PG_ADMIN_CONSOLE_PASSWORD=password ./create.sh INSTANCE_NAME POSTGRES_USERNAME PGADMIN_USERNAME```
 
 **create.sh** will run the following scripts:
 1. enable_apis.sh - enables the Kubernetes Engine API and Cloud SQL Admin API

scripts/cluster.sh

@@ -19,8 +19,10 @@
 
 set -o errexit
 
-CLUSTER_NAME=postgres-demo-cluster
-PROJECT=$(gcloud config get-value core/project)
+ROOT=$(dirname "${BASH_SOURCE[0]}")
+source "${ROOT}"/constants.sh
+
+
 
 # This line is just to eliminate a warning that GKE behavior will change in the
 # future. If we just set the new behavior now it doesn't warn us

scripts/constants.sh

@@ -0,0 +1,11 @@
+PROJECT=$(gcloud config get-value core/project)
+
+CLUSTER_ZONE=$(gcloud config get-value compute/zone)
+CLUSTER_NAME=postgres-demo-cluster
+
+INSTANCE_REGION=$(gcloud config get-value compute/region)
+
+SA_NAME=postgres-demo-sa
+NODE_SA_NAME=postgres-demo-node-sa
+FULL_SA_NAME=$SA_NAME@$PROJECT.iam.gserviceaccount.com
+FULL_NODE_SA_NAME=$NODE_SA_NAME@$PROJECT.iam.gserviceaccount.com

scripts/delete_resources.sh

@@ -18,13 +18,8 @@
 # Cloud SQL instance takes a long time so deleting it is a separate step
 # that includes a prompt in another script
 
-SA_NAME=postgres-demo-sa
-NODE_SA_NAME=postgres-demo-node-sa
-PROJECT=$(gcloud config get-value core/project)
-CLUSTER_ZONE=$(gcloud config get-value compute/zone)
-
-FULL_SA_NAME=$SA_NAME@$PROJECT.iam.gserviceaccount.com
-FULL_NODE_SA_NAME=$NODE_SA_NAME@$PROJECT.iam.gserviceaccount.com
+ROOT=$(dirname "${BASH_SOURCE[0]}")
+source "${ROOT}"/constants.sh
 
 gcloud container clusters delete \
 postgres-demo-cluster --zone "$CLUSTER_ZONE" --quiet

scripts/service_account.sh

@@ -20,19 +20,14 @@
 # The second is for the GKE nodes and it gets the minimal permissions needed
 # for logging and monitoring as recommended by the GKE documentation
 
-SA_NAME=postgres-demo-sa
-NODE_SA_NAME=postgres-demo-node-sa
-PROJECT=$(gcloud config get-value core/project)
+ROOT=$(dirname "${BASH_SOURCE[0]}")
+source "${ROOT}"/constants.sh
 
 if [ -z "$PROJECT" ]; then
   echo "No default project set. Please set one with gcloud config"
   exit 1
 fi
 
-FULL_SA_NAME=$SA_NAME@$PROJECT.iam.gserviceaccount.com
-
-FULL_NODE_SA_NAME=$NODE_SA_NAME@$PROJECT.iam.gserviceaccount.com
-
 gcloud iam service-accounts create "$SA_NAME" --display-name "$SA_NAME"
 
 gcloud iam service-accounts create "$NODE_SA_NAME" --display-name "$NODE_SA_NAME"

validate.sh

@@ -18,16 +18,12 @@
 # make sure the Cloud SQL instance is up, as well as the GKE cluster and pod
 
 ROOT=$(dirname "${BASH_SOURCE[0]}")
-
-CLUSTER_NAME=postgres-demo-cluster
+source "${ROOT}"/scripts/constants.sh
 
 help() {
   echo "./validate.sh INSTANCE_NAME"
 }
 
-CLUSTER_ZONE=$(gcloud config get-value compute/zone)
-
-export CLUSTER_ZONE
 if [ -z "$CLUSTER_ZONE" ]; then
   echo "Make sure that compute/zone is set in gcloud config"
   exit 1