Skip to content

Commit d82cfb4

Browse files
committed
DOPS-101 Add variable for account alias for main terraform project
This alias needs to match the one used in bootstrap project to use correct names for S3 bucket and DynamoDB table.
1 parent 19cb916 commit d82cfb4

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

bin/common-terraform.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ function init_terraform() {
5151
#shellcheck disable=SC2086,SC2046
5252
$DOCKER_TERRAFORM init \
5353
-input="$INPUT_ENABLED" \
54-
-backend-config bucket=tf-state.${PROJECT_NAME}.${AWS_DEFAULT_REGION}.$(get_aws_account_id) \
55-
-backend-config dynamodb_table=TerraformStatelock-${PROJECT_NAME} \
56-
-backend-config region=${AWS_DEFAULT_REGION} \
57-
-backend-config encrypt=true
54+
-backend-config region=${AWS_DEFAULT_REGION}
55+
5856
# Generate an SSH keypair if none exists yet
5957
if [[ ! -f ~/.ssh/id_rsa.pub ]]; then
6058
#shellcheck disable=SC2174

terraform/terraform.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ terraform {
44
# ./bootstrap project. See ./bootstrap/README.md for details.
55
#===================================================================
66
backend "s3" {
7-
bucket = "moduscreate-devops-demo-tf-state-us-east-1"
7+
bucket = "${var.backend_account_alias}-tf-state-us-east-1"
88
key = "terraform-state.tfstate"
9-
dynamodb_table = "moduscreate-devops-demo-state-lock"
10-
region = "us-east-1"
9+
dynamodb_table = "${var.backend_account_alias}-state-lock"
10+
region = "${var.aws_region}"
1111
encrypt = "true"
1212
}
1313
}

terraform/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,8 @@ variable "newrelic_alert_email" {
111111
description = "New Relic alert email"
112112
default = ""
113113
}
114+
115+
variable "backend_account_alias" {
116+
description = "Account alias, or prefix, used by bootstrap project"
117+
default = "moduscreate-devops-demo"
118+
}

0 commit comments

Comments
 (0)