Merge branch 'develop'

.circleci/config.yml

@@ -10,4 +10,4 @@ workflows:
   welcome:
     # Run the welcome/run job in its own container
     jobs:
-      - welcome/run
+      - welcome/run

.circleci/old.config.yml

@@ -0,0 +1,13 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+# Use a package of configuration called an orb.
+orbs:
+  # Declare a dependency on the welcome-orb
+  welcome: circleci/welcome-orb@0.4.1
+# Orchestrate or schedule a set of jobs
+workflows:
+  # Name the workflow "welcome"
+  welcome:
+    # Run the welcome/run job in its own container
+    jobs:
+      - welcome/run

blog/gulpfile.js/index.js

@@ -59,6 +59,7 @@ async function buildTheme(cb) {
   await exec(
     `cd ${themeDir} && node ${themeDir}/node_modules/webpack/bin/webpack.js --config ${themeDir}/webpack.prod.js`
   );
+  cb();
 }
 
 // Clear ./static/dist
@@ -130,9 +131,9 @@ module.exports = {
   buildLunr: gulp.series(cleanJS, minifyJS, insertLunrJS),
   buildBlog: gulp.series([
     buildSearch,
-    buildHugo,
     buildTheme,
-    minifyImages,
     gulp.series(cleanJS, minifyJS, insertLunrJS),
+    buildHugo,
+    minifyImages,
   ]),
 };

infrastructure/.vscode/settings.json

@@ -0,0 +1 @@
+{}

infrastructure/Makefile

@@ -17,7 +17,8 @@
 .PHONY: apply destroy-backend destroy destroy-target plan-destroy plan plan-target prep
 
 -include Makefile.env
-VARS="variables/$(ENV)-$(REGION).tfvars"
+# VARS="variables/$(ENV)-$(REGION).tfvars"
+VARS="$(ENV)-$(REGION).tfvars"
 CURRENT_FOLDER=$(shell basename "$$(pwd)")
 S3_BUCKET="$(ENV)-$(REGION)-$(PROJECT)-terraform"
 DYNAMODB_TABLE="$(ENV)-$(REGION)-$(PROJECT)-terraform"

infrastructure/main.tf

@@ -85,9 +85,9 @@ data "archive_file" "lambda_main" {
 # }
 
 resource "aws_lambda_function" "directory_indexes" {
-  provider      = aws.us_east_1
-  function_name = "${var.stage}-${var.name}-directory_indexes"
-  filename      = "${var.source_file}.zip"
+  provider         = aws.us_east_1
+  function_name    = "${var.stage}-${var.name}-directory_indexes"
+  filename         = "${var.source_file}.zip"
   source_code_hash = data.archive_file.lambda_main.output_base64sha256
   # s3_bucket     = aws_s3_bucket.lambda_s3.id
   # s3_key        = var.lambda_key