Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCM-6104 consolidating repo changes for AMET structure back to template #41

Merged
merged 4 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# This file is for you! Please, updated to the versions agreed by your team.

terraform 1.9.1
pre-commit 3.6.0
nodejs 18.18.2
act 0.2.64
gitleaks 8.18.4
vale 3.6.0
pre-commit 3.6.0
terraform 1.9.2
tfsec 1.28.10
vale 3.6.0

# ==============================================================================
# The section below is reserved for Docker image versions.
Expand Down
Empty file.
19 changes: 11 additions & 8 deletions infrastructure/terraform/bin/terraform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
##
# Set Script Version
##
readonly script_ver="1.8.0";
readonly script_ver="1.8.1";

##
# Standardised failure function
Expand Down Expand Up @@ -399,13 +399,16 @@ fi;
pushd "${component_path}";
readonly component_name=$(basename ${component_path});

# Check for presence of tfenv (https://github.com/kamatama41/tfenv)
# and a .terraform-version file. If both present, ensure required
# version of terraform for this component is installed automagically.
tfenv_bin="$(which tfenv 2>/dev/null)";
if [[ -n "${tfenv_bin}" && -x "${tfenv_bin}" && -f .terraform-version ]]; then
${tfenv_bin} install;
fi;
# install terraform
# verify terraform version matches .tool-versions
echo ${PWD}
tool_version=$(grep "terraform " .tool-versions | cut -d ' ' -f 2)
asdf plugin-add terraform && asdf install terraform "${tool_version}"
current_version=$(terraform --version | head -n 1 | cut -d 'v' -f 2)

if [ -z "${current_version}" ] || [ "${current_version}" != "${tool_version}" ]; then
error_and_die "Terraform version mismatch. Expected: ${tool_version}, Actual: ${current_version}"
fi

# Regardless of bootstrapping or not, we'll be using this string.
# If bootstrapping, we will fill it with variables,
Expand Down
1 change: 0 additions & 1 deletion infrastructure/terraform/bootstrap/.terraform-version

This file was deleted.

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions infrastructure/terraform/bootstrap/dynamodb_table.tf

This file was deleted.

16 changes: 0 additions & 16 deletions infrastructure/terraform/bootstrap/kms_key_s3.tf

This file was deleted.

13 changes: 0 additions & 13 deletions infrastructure/terraform/bootstrap/locals.tf

This file was deleted.

23 changes: 0 additions & 23 deletions infrastructure/terraform/bootstrap/outputs.tf

This file was deleted.

12 changes: 0 additions & 12 deletions infrastructure/terraform/bootstrap/provider_aws.tf

This file was deleted.

14 changes: 0 additions & 14 deletions infrastructure/terraform/bootstrap/s3_bucket.tf

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions infrastructure/terraform/bootstrap/s3_bucket_policy.tf

This file was deleted.

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions infrastructure/terraform/bootstrap/s3_bucket_versioning.tf

This file was deleted.

37 changes: 0 additions & 37 deletions infrastructure/terraform/bootstrap/variables.tf

This file was deleted.

10 changes: 0 additions & 10 deletions infrastructure/terraform/bootstrap/versions.tf

This file was deleted.

Loading
Loading