Skip to content

Commit ce2f5f3

Browse files
committed
Adding missing README and fixed name
1 parent 39785d4 commit ce2f5f3

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ The following inputs can be used as `steps.with` keys:
7575
| `aws_ec2_instance_profile` | string | | [The AWS IAM instance profile](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) to use for the EC2 instance. Use if you want to pass an AWS role with specific permissions granted to the instance |
7676
| `aws_resource_identifier` | string | `${org}-${repo}-${branch}` | Auto-generated by default so it's unique for org/repo/branch. Set to override with custom naming the unique AWS resource identifier for the deployment. |
7777
| `aws_create_vpc` | bool | `false` | Whether an AWS VPC should be created in the action. Otherwise, the existing default VPC will be used. |
78+
| `aws_extra_tags` | json | | A list of additional tags that will be included on created resources. Example: `{"key1": "value1", "key2": "value2"}`. |
7879
| `infrastructure_only` | bool | `false` | Set to true to provision infrastructure (with Terraform) but skip the app deployment (with ansible) |
7980
| **Teraform configuration** |
8081
| `tf_state_bucket` | string | `${org}-${repo}-${branch}-tf-state` | AWS S3 bucket to use for Terraform state. By default, a new deployment will be created for each unique branch. Hardcode if you want to keep a shared resource state between the several branches. |

action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ 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-
aws_additional_tags:
36+
aws_extra_tags:
3737
description: 'A list of additional tags that will be included on created resources. Example: `{"key1": "value1", "key2": "value2"}`'
3838
required: false
3939
default: '{}'
@@ -99,7 +99,7 @@ runs:
9999
STACK_DESTROY: ${{ inputs.tf_stack_destroy }}
100100
AWS_RESOURCE_IDENTIFIER: ${{ inputs.aws_resource_identifier }}
101101
CREATE_VPC: ${{ inputs.aws_create_vpc }}
102-
AWS_ADDITIONAL_TAGS: ${{ inputs.aws_additional_tags }}
102+
AWS_EXTRA_TAGS: ${{ inputs.aws_extra_tags }}
103103

104104

105105
# 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.aws_additional_tags
38+
var.aws_extra_tags
3939
)
4040
}
4141
}

operations/deployment/terraform/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ variable "route53_zone_id" {
138138
type = string
139139
}
140140

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

0 commit comments

Comments
 (0)