Skip to content

Commit 5b254e3

Browse files
authored
fix: lock_table param for s3 backend is deprecated (#5)
also fix a formatting issue and update default minimum Terraform version
1 parent 7a201ae commit 5b254e3

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

env-development/init.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,20 @@ aws_default_region="${AWS_DEFAULT_REGION:-us-east-1}"
3030
s3_bucket="${tf_spine}-devops-state-${aws_default_region}"
3131
s3_prefix="${TF_PROJECT_NAME}/state/${tf_env}"
3232

33-
tf_version="${TF_VERSION:-0.9.4}"
33+
tf_version="${TF_VERSION:-0.11.7}"
3434
tf_lock_table="${TF_LOCK_TABLE:-rk-terraformStateLock}"
3535

3636
FILE="terraform.tf"
3737

3838
export TF=$(cat <<EOF
3939
terraform {
4040
required_version = ">= ${tf_version}"
41+
4142
backend "s3" {
42-
bucket = "${s3_bucket}"
43-
region = "${aws_default_region}"
44-
key = "${s3_prefix}/${tf_env}.tfstate"
45-
lock_table = "${tf_lock_table}"
43+
bucket = "${s3_bucket}"
44+
region = "${aws_default_region}"
45+
key = "${s3_prefix}/${tf_env}.tfstate"
46+
dynamodb_table = "${tf_lock_table}"
4647
}
4748
}
4849
EOF

env-production/init.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ fi
2323
set -e
2424

2525
tf_spine="${TF_SPINE:-rk}"
26-
tf_env="production"
27-
26+
tf_env="prod"
2827

2928
aws_default_region="${AWS_DEFAULT_REGION:-us-east-1}"
3029

3130
s3_bucket="${tf_spine}-devops-state-${aws_default_region}"
3231
s3_prefix="${TF_PROJECT_NAME}/state/${tf_env}"
3332

34-
tf_version="${TF_VERSION:-0.9.4}"
33+
tf_version="${TF_VERSION:-0.11.7}"
3534
tf_lock_table="${TF_LOCK_TABLE:-rk-terraformStateLock}"
3635

3736
FILE="terraform.tf"
3837

3938
export TF=$(cat <<EOF
4039
terraform {
4140
required_version = ">= ${tf_version}"
41+
4242
backend "s3" {
43-
bucket = "${s3_bucket}"
44-
region = "${aws_default_region}"
45-
key = "${s3_prefix}/${tf_env}.tfstate"
46-
lock_table = "${tf_lock_table}"
43+
bucket = "${s3_bucket}"
44+
region = "${aws_default_region}"
45+
key = "${s3_prefix}/${tf_env}.tfstate"
46+
dynamodb_table = "${tf_lock_table}"
4747
}
4848
}
4949
EOF

env-staging/init.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,20 @@ aws_default_region="${AWS_DEFAULT_REGION:-us-east-1}"
3030
s3_bucket="${tf_spine}-devops-state-${aws_default_region}"
3131
s3_prefix="${TF_PROJECT_NAME}/state/${tf_env}"
3232

33-
FILE="terraform.tf"
34-
35-
tf_version="${TF_VERSION:-0.9.4}"
33+
tf_version="${TF_VERSION:-0.11.7}"
3634
tf_lock_table="${TF_LOCK_TABLE:-rk-terraformStateLock}"
3735

36+
FILE="terraform.tf"
37+
3838
export TF=$(cat <<EOF
3939
terraform {
4040
required_version = ">= ${tf_version}"
41+
4142
backend "s3" {
42-
bucket = "${s3_bucket}"
43-
region = "${aws_default_region}"
44-
key = "${s3_prefix}/${tf_env}.tfstate"
45-
lock_table = "${tf_lock_table}"
43+
bucket = "${s3_bucket}"
44+
region = "${aws_default_region}"
45+
key = "${s3_prefix}/${tf_env}.tfstate"
46+
dynamodb_table = "${tf_lock_table}"
4647
}
4748
}
4849
EOF

0 commit comments

Comments
 (0)