Tidy up after merge

Author: Kai Hendry

.gitignore

@@ -1 +1,3 @@
-lambda2sns
+process-bin
+push-bin
+packaged.yaml

.travis.yml

@@ -10,7 +10,8 @@ install:
 deploy:
   # dev
   - provider: script
-    script: aws configure set profile.uneet-dev.aws_access_key_id $AWS_ACCESS_KEY_ID &&
+    script: >
+      aws configure set profile.uneet-dev.aws_access_key_id $AWS_ACCESS_KEY_ID &&
       aws configure set profile.uneet-dev.aws_secret_access_key $AWS_SECRET_ACCESS_KEY &&
       aws configure set profile.uneet-dev.region ap-southeast-1 &&
       aws configure --profile uneet-dev list &&
@@ -20,7 +21,8 @@ deploy:
       branch: master
   # demo
   - provider: script
-    script: aws configure set profile.uneet-demo.aws_access_key_id $AWS_915001051872_ID &&
+    script: >
+       aws configure set profile.uneet-demo.aws_access_key_id $AWS_915001051872_ID &&
        aws configure set profile.uneet-demo.aws_secret_access_key $AWS_915001051872_SECRET &&
        aws configure set profile.uneet-demo.region ap-southeast-1 &&
        aws configure --profile uneet-demo list &&
@@ -30,7 +32,12 @@ deploy:
       branch: master
   # production
   - provider: script
-    script: AWS_ACCESS_KEY_ID=$AWS_192458993663_ID AWS_SECRET_ACCESS_KEY=$AWS_192458993663_SECRET make prod
+    script: >
+        aws configure set profile.uneet-prod.aws_access_key_id $AWS_192458993663_ID &&
+        aws configure set profile.uneet-prod.aws_secret_access_key $AWS_192458993663_SECRET &&
+        aws configure set profile.uneet-prod.region ap-southeast-1 &&
+        aws configure --profile uneet-prod list &&
+        make prod
     skip_cleanup: true
     on:
       branch: master

Makefile

@@ -5,15 +5,14 @@ DEPLOY_S3_PREFIX = lambda2sqs
 
 .PHONY: clean build test deploy
 
+build: push-bin process-bin validate
+
 push-bin: push/
 	cd push; GO111MODULE=on go mod tidy; GOOS=linux GOARCH=amd64 go build -o ../push-bin .
 
 process-bin: process/
 	cd process; GO111MODULE=on go mod tidy; GOOS=linux GOARCH=amd64 go build -o ../process-bin .
 
-test:
-	go test ./...
-
 push-logs:
 	sam logs -n ut_lambda2sqs_push -t
 
@@ -27,11 +26,12 @@ destroy:
 	aws cloudformation delete-stack \
 		--stack-name $(STACK_NAME)
 
-dev: push-bin process-bin
+validate: template.yaml
 	sam validate --template template.yaml
-	sam package --template-file template.yaml --s3-bucket dev-media-unee-t --s3-prefix $(DEPLOY_S3_PREFIX) --output-template-file packaged.yaml
-	AWS_PROFILE=uneet-dev sam deploy --template-file ./packaged.yaml --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM
 
+dev: build
+	AWS_PROFILE=uneet-dev sam package --template-file template.yaml --s3-bucket dev-media-unee-t --s3-prefix $(DEPLOY_S3_PREFIX) --output-template-file packaged.yaml
+	AWS_PROFILE=uneet-dev sam deploy --template-file ./packaged.yaml --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM
 
 demo: build
 	AWS_PROFILE=uneet-demo sam package --template-file template.yaml --s3-bucket demo-media-unee-t --s3-prefix $(DEPLOY_S3_PREFIX) --output-template-file packaged.yaml
@@ -41,7 +41,6 @@ prod: build
 	AWS_PROFILE=uneet-prod sam package --template-file template.yaml --s3-bucket prod-media-unee-t --s3-prefix $(DEPLOY_S3_PREFIX) --output-template-file packaged.yaml
 	AWS_PROFILE=uneet-prod sam deploy --template-file ./packaged.yaml --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM --parameter-overrides DefaultSecurityGroup=sg-9f5b5ef8 PrivateSubnets=subnet-0df289b6d96447a84,subnet-0e41c71ad02ee7e99,subnet-01cb9ee064743ac56
 
-
 lint:
 	cfn-lint template.yaml
 

go.mod

@@ -2,15 +2,6 @@
 
 STAGE=dev
 
-domain() {
-	case $1 in
-		prod) echo auroradb.unee-t.com
-		;;
-		*) echo auroradb.$1.unee-t.com
-		;;
-	esac
-}
-
 show_help() {
 cat << EOF
 Usage: ${0##*/} [-p]
@@ -43,11 +34,12 @@ done
 AWS_PROFILE=uneet-$STAGE
 shift "$((OPTIND-1))"   # Discard the options and sentinel --
 
-echo Connecting to ${STAGE^^} $(domain $STAGE)
+echo Connecting to ${STAGE^^}
 
-MYSQL_PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_ROOT_PASSWORD --with-decryption --query Parameters[0].Value --output text)
-MYSQL_USER=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_USER --with-decryption --query Parameters[0].Value --output text)
+MYSQL_PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names UNTEDB_ROOT_PASS --with-decryption --query Parameters[0].Value --output text)
+MYSQL_USER=$(aws --profile $AWS_PROFILE ssm get-parameters --names UNTEDB_ROOT_USER --with-decryption --query Parameters[0].Value --output text)
+MYSQL_HOST=$(aws --profile $AWS_PROFILE ssm get-parameters --names UNTEDB_HOST --with-decryption --query Parameters[0].Value --output text)
 
 echo $STAGE
 echo "SELECT * FROM log_lambdas ORDER BY id DESC LIMIT 10\G;" |
-mysql -s -h $(domain $STAGE) -P 3306 -u root --password=$MYSQL_PASSWORD unee_t_enterprise
+mysql -s -h $MYSQL_HOST -P 3306 -u $MYSQL_USER --password=$MYSQL_PASSWORD unee_t_enterprise