Rename to Muzo. Improve infra. Bump packaages.

Author: jch254

README.md

@@ -1,4 +1,4 @@
-# Beatbot-fulfillment-handler
+# Muzo-fulfillment-handler
 
 TODO
 

buildspec.yml

@@ -5,24 +5,24 @@ env:
     TF_VAR_remote_state_bucket: "603-terraform-remote-state"
     TF_VAR_remote_state_region: "ap-southeast-2"
     TF_VAR_region: "us-east-1"
-    TF_VAR_name: "beatbot-fulfillment-handler"
+    TF_VAR_name: "muzo-fulfillment-handler"
     TF_VAR_build_docker_image: "jch254/docker-node-terraform-aws"
     TF_VAR_build_docker_tag: "6.10.0"
     TF_VAR_github_repository_owner: "jch254"
-    TF_VAR_github_repository_name: "beatbot-fulfillment-handler"
+    TF_VAR_github_repository_name: "muzo-fulfillment-handler"
     TF_VAR_github_branch_name: "master"
     TF_VAR_artifacts_dir: "../dist" # executed from /infrastruture directory
     TF_VAR_runtime: "nodejs6.10"
     TF_VAR_handler: "index.handler"
-    TF_VAR_kms_key_arns: "[\"arn:aws:kms:us-east-1:982898479788:key/0b7b7ba8-721e-4b65-9ff0-21a9e091af76\", \"arn:aws:kms:us-east-1:982898479788:key/e83f1d78-5dc5-4aca-a00b-2fc2ac7bebe4\"]"
-    TF_VAR_ssm_parameter_arns: "[\"arn:aws:ssm:us-east-1:982898479788:parameter/beatbot-fulfillment-handler/*\", \"arn:aws:ssm:us-east-1:982898479788:parameter/github-token\"]"
+    TF_VAR_kms_key_arns: '["arn:aws:kms:us-east-1:982898479788:key/0b7b7ba8-721e-4b65-9ff0-21a9e091af76","arn:aws:kms:us-east-1:982898479788:key/e83f1d78-5dc5-4aca-a00b-2fc2ac7bebe4"]'
+    TF_VAR_ssm_parameter_arns: '["arn:aws:ssm:us-east-1:982898479788:parameter/muzo-fulfillment-handler/*","arn:aws:ssm:us-east-1:982898479788:parameter/shared/*"]'
 
 phases:
   install:
     commands:
       # Workaround until CodeBuild/CodePipeline retains file permissions
       - find ./scripts -name "*.bash" -exec chmod +x {} \;
-      - ./scripts/install.bash
+      - ./infrastructure/install.bash
 
   pre_build:
     commands:
@@ -32,17 +32,14 @@ phases:
       - export AWS_SECRET_ACCESS_KEY=`curl --silent http://169.254.170.2:80$AWS_CONTAINER_CREDENTIALS_RELATIVE_URI | jq -r '.SecretAccessKey'`
       - export AWS_SESSION_TOKEN=`curl --silent http://169.254.170.2:80$AWS_CONTAINER_CREDENTIALS_RELATIVE_URI | jq -r '.Token'`
 
-      - SPOTIFY_CLIENT_ID=$(aws ssm get-parameters --region $TF_VAR_region --name "/beatbot-fulfillment-handler/spotify-client-id" --with-decryption --query Parameters[0].Value)
-      - SPOTIFY_CLIENT_SECRET=$(aws ssm get-parameters --region $TF_VAR_region --name "/beatbot-fulfillment-handler/spotify-client-secret" --with-decryption --query Parameters[0].Value)
+      - SPOTIFY_CLIENT_ID=$(aws ssm get-parameters --region $TF_VAR_region --name "/muzo-fulfillment-handler/spotify-client-id" --with-decryption --query Parameters[0].Value)
+      - SPOTIFY_CLIENT_SECRET=$(aws ssm get-parameters --region $TF_VAR_region --name "/muzo-fulfillment-handler/spotify-client-secret" --with-decryption --query Parameters[0].Value)
       - export TF_VAR_environment_variables="{ SPOTIFY_CLIENT_ID = $SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET = $SPOTIFY_CLIENT_SECRET }"
 
-      - export TF_VAR_github_oauth_token=$(aws ssm get-parameters --region $TF_VAR_region --name "/github-token" --with-decryption --query Parameters[0].Value)
+      - export TF_VAR_github_oauth_token=$(aws ssm get-parameters --region $TF_VAR_region --name "/shared/github-token" --with-decryption --query Parameters[0].Value --output text)
 
   build:
     commands:
-      - ./scripts/build-artifacts.bash
-
-  post_build:
-    commands:
-      - ./scripts/run-tests.bash
-      - ./scripts/deploy-infrastructure.bash
+      - ./infrastructure/build-artifacts.bash
+      - ./infrastructure/run-tests.bash
+      - ./infrastructure/deploy-infrastructure.bash

infrastructure/README.md

@@ -1,10 +1,10 @@
 # Deployment/Infrastructure
 
-Beatbot-fulfillment-handler is a Lambda function built, tested and deployed to AWS by CodePipeline and Codebuild.
+Muzo-fulfillment-handler is a Lambda function built, tested and deployed to AWS by CodePipeline and Codebuild.
 
 ---
 
-**All commands below must be run in the /infrastructure directory.**
+**All commands below must be run in each /infrastructure subdirectory (e.g. /infrastructure/admin-api) then in the /infrastructure directory**
 
 To deploy to AWS, you must:
 
@@ -31,6 +31,7 @@ terraform init \
 
 ### Updating infrastructure
 
+1. Export all environment variables beginnging with TF_VAR_ as per [buildspec.yml](../buildspec.yml)
 1. Make necessary infrastructure code changes.
 1. Initialise Terraform:
 ```
@@ -45,6 +46,7 @@ terraform init \
 
 ### Destroying infrastructure (use with care)
 
+1. Export all environment variables beginnging with TF_VAR_ as per [buildspec.yml](../buildspec.yml)
 1. Initialise Terraform:
 ```
 terraform init \

scripts/build-artifacts.bash renamed to infrastructure/build-artifacts.bash

@@ -22,7 +22,6 @@ resource "aws_iam_role" "codebuild_role" {
 EOF
 }
 
-# TODO: Refine codebuild_policy perms
 data "template_file" "codebuild_policy" {
   template = "${file("${path.module}/codebuild-role-policy.tpl")}"
 
@@ -90,6 +89,7 @@ resource "aws_iam_role_policy" "codepipeline_policy" {
 resource "aws_s3_bucket" "artifacts" {
   bucket = "${var.name}-codepipeline-artifacts"
   acl = "private"
+  force_destroy = true
 }
 
 resource "aws_codepipeline" "codepipeline" {

scripts/deploy-infrastructure.bash renamed to infrastructure/deploy-infrastructure.bash

@@ -8,11 +8,11 @@ variable "log_retention" {
 }
 
 variable "kms_key_arns" {
-  description = "Array of escaped KMS Key ARNs used to decrypt secrets specified via ssm_parameter_arns variable"
+  description = "Array of KMS Key ARNs used to decrypt secrets specified via ssm_parameter_arns variable"
 }
 
 variable "ssm_parameter_arns" {
-  description = "Array of escaped SSM Parameter ARNs used to set secret build environment variables via SSM Parameter Store"
+  description = "Array of SSM Parameter ARNs used to set secret build environment variables via SSM Parameter Store"
 }
 
 variable "build_compute_type" {

scripts/install.bash renamed to infrastructure/install.bash

@@ -7,6 +7,7 @@ data "archive_file" "artifacts" {
 resource "aws_s3_bucket" "deployment" {
   bucket = "${var.name}-deployment"
   acl = "private"
+  force_destroy = true
 }
 
 resource "aws_s3_bucket_object" "artifacts" {

infrastructure/modules/build-pipeline/main.tf

@@ -1,7 +1,7 @@
 {
-  "name": "beatbot-fulfillment-handler",
+  "name": "muzo-fulfillment-handler",
   "version": "1.0.0",
-  "description": "BeatBot fulfillment handler",
+  "description": "Muzo fulfillment handler",
   "license": "MIT",
   "scripts": {
     "dev": "nodemon -e ts -w src/ -x 'ts-node src/'",
@@ -10,22 +10,22 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jch254/beatbot-fulfillment-handler"
+    "url": "https://github.com/jch254/muzo-fulfillment-handler"
   },
   "author": "Jordan Hornblow",
   "dependencies": {
     "spotify-web-api-node": "^2.4.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "^0.0.14",
-    "@types/node": "^8.0.2",
+    "@types/node": "^8.0.7",
     "@types/node-fetch": "^1.6.7",
     "nodemon": "^1.11.0",
     "rimraf": "^2.6.1",
-    "ts-node": "^3.0.6",
+    "ts-node": "^3.1.0",
     "tslint": "^5.4.3",
-    "tslint-config-airbnb": "^5.2.0",
+    "tslint-config-airbnb": "^5.2.1",
     "tsutils": "1.6.0",
-    "typescript": "^2.3.4"
+    "typescript": "^2.4.1"
   }
 }