From 6a1e94cc9eed499babbaa9bd1ceaec8de16904e8 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 24 Jul 2020 14:50:05 +0100 Subject: [PATCH 1/5] Updating terraform Moving .tfvars into root of module --- infrastructure/Makefile | 3 ++- infrastructure/main.tf | 6 +++--- infrastructure/{variables => }/prod-eu-west-1.tfvars | 0 3 files changed, 5 insertions(+), 4 deletions(-) rename infrastructure/{variables => }/prod-eu-west-1.tfvars (100%) diff --git a/infrastructure/Makefile b/infrastructure/Makefile index 129a367..41847f5 100644 --- a/infrastructure/Makefile +++ b/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" diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 8ccdb20..c22cd27 100644 --- a/infrastructure/main.tf +++ b/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 diff --git a/infrastructure/variables/prod-eu-west-1.tfvars b/infrastructure/prod-eu-west-1.tfvars similarity index 100% rename from infrastructure/variables/prod-eu-west-1.tfvars rename to infrastructure/prod-eu-west-1.tfvars From 1524758649c3f7a127189744f65cfe32bcea3cda Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 24 Jul 2020 14:50:20 +0100 Subject: [PATCH 2/5] Updating VSCode settings --- infrastructure/.vscode/settings.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 infrastructure/.vscode/settings.json diff --git a/infrastructure/.vscode/settings.json b/infrastructure/.vscode/settings.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/infrastructure/.vscode/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file From 17d4ae4705f4a8ca66befafbf95464530657d324 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 24 Jul 2020 14:50:34 +0100 Subject: [PATCH 3/5] Updating .circleci config --- .circleci/config.yml | 2 +- .circleci/old.config.yml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .circleci/old.config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 01c267c..6f98693 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,4 +10,4 @@ workflows: welcome: # Run the welcome/run job in its own container jobs: - - welcome/run \ No newline at end of file + - welcome/run diff --git a/.circleci/old.config.yml b/.circleci/old.config.yml new file mode 100644 index 0000000..01c267c --- /dev/null +++ b/.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 \ No newline at end of file From 42ed62034c0cf515d6900949088139857ef7f916 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 24 Jul 2020 14:50:47 +0100 Subject: [PATCH 4/5] Reordering gulpfile commands --- blog/gulpfile.js/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blog/gulpfile.js/index.js b/blog/gulpfile.js/index.js index 2de8ccb..1fcd7d6 100644 --- a/blog/gulpfile.js/index.js +++ b/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, ]), }; From 79ece69c5eceaa92508c3e1590b525e4b14f0410 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 24 Jul 2020 14:50:52 +0100 Subject: [PATCH 5/5] Updated submodule blog/themes/panaetius-theme --- blog/themes/panaetius-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/themes/panaetius-theme b/blog/themes/panaetius-theme index 78641f4..bde2234 160000 --- a/blog/themes/panaetius-theme +++ b/blog/themes/panaetius-theme @@ -1 +1 @@ -Subproject commit 78641f4935521d9a57a1c5b9db17ac8977df57d8 +Subproject commit bde22342b43ec73ad1f750ecbfa942838b1d27b1