From 621909ac38404ecefa468b91bf7aaba6015d995f Mon Sep 17 00:00:00 2001 From: "Jason Crowe (Mozilla)" Date: Tue, 27 Feb 2018 14:39:28 -0500 Subject: [PATCH 1/4] Add travis checks and a few lint fixups --- .travis.yml | 16 ++++++++++++++++ Dockerfile | 2 +- account-deploy | 1 + nubis-deploy | 3 ++- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e6af964 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +sudo: required + +language: ruby + +services: + - docker + +before_install: + - docker pull nubisproject/nubis-travis:master + +script: + - docker run --mount type=bind,source="$(pwd)",target=/nubis/files nubisproject/nubis-travis:master + +notifications: + slack: + secure: lrm/1GZQ+5z9AnwDe4IuHolAxR38EEXdcPEMvt8qoSdCNxBsn2ijPSgG+wwtZRB1wW6BXcWsyGVPr8b62zGRv0D/Ie2/wu6bUddeH8n3Rxc+YfjcoYrTXAt2EKpwloG7g0CNIumfRzH+99ootn3D7NTmwQPVZMAnQGTTZ7JaK2u8fCC6eHe6ISobocEQcIzZ+vDEaNFvvbcy7sACo/nl31CNfoRmTM/rZcUqMLTATKy7+APGoHAvJvqsfLhK44fNcIky/Fx1Lu2bFX6d7VIT6UhiK/BLXSx7LGuVcx8QsWCzyG4M2dfsONumLNka8P0lmlcXVreDphKPDKNHCS6YZT7kTIlpcNBaxAWvowoJstMvxnY409pYSIJ7k7xn8Oo910jSFmZ7zYK2nKMe8DH5OprzwU6JGv0koKqw0B/s2DRmnPGL2uSMC15a7S/hfSOsiF1MHfskZl8bEZNxkDG4/9lSZ647xe8JExmef8tOhb29TDMh+GWbtQ6dSVttKuYhb9IId1UPTKL/uRpjddd6iNKmTy+dHnnslFfyQHIvmet4v/JCVtipU9hlxl8hkifitMRjdfos2W4m8PNayMcTzKUrDbnG2Ep2jquJlPzNBltYm51cwhbV0D6xhrb0qzlz4MiAcgI0YOCw9d3lvxZK9AQiYGYFsVMgbPiHb2vSs28= diff --git a/Dockerfile b/Dockerfile index b227539..e57efa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Docker image containing all dependencies for running terraform in Nubis FROM alpine:3.6 -MAINTAINER Jason Crowe +LABEL maintainer="Jason Crowe " # Do not add a 'v' as pert of the version string (ie: v1.1.3) #+ This causes issues with extraction due to GitHub's methodology diff --git a/account-deploy b/account-deploy index e5c3c9e..12b1da5 100755 --- a/account-deploy +++ b/account-deploy @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC1117 STATE_REGION='eu-west-1' ACCOUNTS_DIR='/nubis/data/accounts' diff --git a/nubis-deploy b/nubis-deploy index eb8b9cf..6e2581a 100755 --- a/nubis-deploy +++ b/nubis-deploy @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC1117 MOUNT_VOLUME='/nubis/data' WORKING_PATH='/nubis/work' @@ -170,7 +171,7 @@ terraform-apply () { } terraform-do () { - declare -a _ACTION; _ACTION=( ${@} ) + declare -a _ACTION; _ACTION=( "${@}" ) cd "${TERRAFORM_PATH}" && terraform "${_ACTION[@]}" } From ea3a7f0128f7956857576fa05c2885688c348447 Mon Sep 17 00:00:00 2001 From: limed Date: Mon, 19 Mar 2018 14:33:46 -0700 Subject: [PATCH 2/4] Fixing typo --- account-deploy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account-deploy b/account-deploy index 12b1da5..b2988c4 100755 --- a/account-deploy +++ b/account-deploy @@ -45,7 +45,7 @@ show_help () { echo -en " New keys will be generated on the next apply\n" echo -en " taint-lambda Taint ALL lambda functions\n" echo -en " New functions will be downloaded on the next apply\n" - echo -en " update Update Terraform modules and providors\n\n" + echo -en " update Update Terraform modules and providers\n\n" } setup_account () { From 869c0b3ee4305a8018f3d464599db6690bf1539f Mon Sep 17 00:00:00 2001 From: "Philippe M. Chiasson" Date: Thu, 5 Apr 2018 10:37:54 -0400 Subject: [PATCH 3/4] Upgrade to Terraform 0.11.5 Fixes #50 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e57efa0..d118438 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL maintainer="Jason Crowe " #+ This causes issues with extraction due to GitHub's methodology #+ Where necesary the 'v' is specified in code below ENV AwCliVersion=1.10.38 \ - TerraformVersion=0.10.8 \ + TerraformVersion=0.11.5 \ UnicredsVersion=1.5.1 \ Toml2JSONVersion=0.1.0 WORKDIR /nubis From cd0e20650b4b445b55a2cbd6938cf4ea6168f7c4 Mon Sep 17 00:00:00 2001 From: "Nubisproject (Mozilla)" Date: Mon, 9 Apr 2018 18:50:19 +0000 Subject: [PATCH 4/4] Update CHANGELOG for v0.10.0 release [skip ci] --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2989322..10afe8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,42 @@ # Change Log +## [v0.10.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.10.0) (2018-04-09) +[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.9.0...v0.10.0) + +**Closed issues:** + +- Upgrade to Terraform 0.11.5 [\#50](https://github.com/nubisproject/nubis-docker-deploy/issues/50) + +**Merged pull requests:** + +- Upgrade to Terraform 0.11.5 [\#51](https://github.com/nubisproject/nubis-docker-deploy/pull/51) ([gozer](https://github.com/gozer)) +- Fixing typo [\#49](https://github.com/nubisproject/nubis-docker-deploy/pull/49) ([limed](https://github.com/limed)) +- Add travis checks and a few lint fixups [\#48](https://github.com/nubisproject/nubis-docker-deploy/pull/48) ([tinnightcap](https://github.com/tinnightcap)) + +## [v0.9.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.9.0) (2018-02-22) +[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.8.8...v0.9.0) + +**Closed issues:** + +- Tag v0.9.0 release [\#46](https://github.com/nubisproject/nubis-docker-deploy/issues/46) + +**Merged pull requests:** + +- Update CHANGELOG for v0.9.0 release \[skip ci\] [\#47](https://github.com/nubisproject/nubis-docker-deploy/pull/47) ([nubis-automation](https://github.com/nubis-automation)) +- Add show and taint to account subcommand [\#45](https://github.com/nubisproject/nubis-docker-deploy/pull/45) ([tinnightcap](https://github.com/tinnightcap)) + ## [v0.8.8](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.8.8) (2018-02-15) [Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.7.0...v0.8.8) **Closed issues:** - Upgrade to Terraform 0.10.8 [\#39](https://github.com/nubisproject/nubis-docker-deploy/issues/39) +- Tag v0.8.8 release [\#42](https://github.com/nubisproject/nubis-docker-deploy/issues/42) **Merged pull requests:** +- Update CHANGELOG for v0.8.8 release \[skip ci\] [\#44](https://github.com/nubisproject/nubis-docker-deploy/pull/44) ([nubis-automation](https://github.com/nubis-automation)) +- Update CHANGELOG for v0.8.8 release \[skip ci\] [\#43](https://github.com/nubisproject/nubis-docker-deploy/pull/43) ([nubis-automation](https://github.com/nubis-automation)) - Upgrade to Terraform 0.10.8 [\#41](https://github.com/nubisproject/nubis-docker-deploy/pull/41) ([gozer](https://github.com/gozer)) ## [v0.7.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.7.0) (2018-02-13)