Skip to content

Commit 39785d4

Browse files
committed
Small tweaks to variable names
1 parent 6e4639a commit 39785d4

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

action.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ inputs:
3333
aws_create_vpc:
3434
description: 'Bool, whether an AWS VPC should be created in the action. Otherwise, the existing default VPC will be used.'
3535
default: "false"
36-
infrastructure_only:
37-
description: 'Set to true to provision infrastructure (with Terraform) but skip the app deployment (with ansible)'
38-
default: "false"
39-
additional_tags:
36+
aws_additional_tags:
4037
description: 'A list of additional tags that will be included on created resources. Example: `{"key1": "value1", "key2": "value2"}`'
4138
required: false
4239
default: '{}'
40+
infrastructure_only:
41+
description: 'Set to true to provision infrastructure (with Terraform) but skip the app deployment (with ansible)'
42+
default: "false"
43+
4344

4445
# Terraform configuration
4546
tf_state_bucket:
@@ -98,7 +99,7 @@ runs:
9899
STACK_DESTROY: ${{ inputs.tf_stack_destroy }}
99100
AWS_RESOURCE_IDENTIFIER: ${{ inputs.aws_resource_identifier }}
100101
CREATE_VPC: ${{ inputs.aws_create_vpc }}
101-
ADDITIONAL_TAGS: ${{ inputs.additional_tags }}
102+
AWS_ADDITIONAL_TAGS: ${{ inputs.aws_additional_tags }}
102103

103104

104105
# Skip ansible deployment if deploying only infrastructure

operations/_scripts/generate/generate_provider.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ provider \"aws\" {
3535
default_tags {
3636
tags = merge(
3737
local.aws_tags,
38-
var.additional_tags
38+
var.aws_additional_tags
3939
)
4040
}
4141
}

operations/_scripts/generate/generate_tf_vars.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ region = \"${AWS_DEFAULT_REGION}\"
8484
# Route53
8585
route53_zone_id = \"${ROUTE53_ZONE_ID}\"
8686
87-
additional_tags = ${ADDITIONAL_TAGS}
87+
aws_additional_tags = ${AWS_ADDITIONAL_TAGS}
8888
8989
9090
" > "${GITHUB_ACTION_PATH}/operations/deployment/terraform/terraform.tfvars"

operations/deployment/terraform/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ locals {
77
GitHubBranchName = "${var.app_branch_name}"
88
GitHubAction = "bitovi/github-actions-deploy-stackstorm"
99
OperationsRepoEnvironment = "deployment"
10-
created_with = "terraform"
10+
CreatedWith = "terraform"
1111
}
1212
}

operations/deployment/terraform/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ variable "route53_zone_id" {
138138
type = string
139139
}
140140

141-
variable "additional_tags" {
141+
variable "aws_additional_tags" {
142142
type = map(string)
143-
description = "A list of strings that will be added to created resources"
143+
description = "A list of tags that will be added to created resources"
144144
default = {}
145145

146146
}

0 commit comments

Comments
 (0)