Skip to content

Commit 53fccec

Browse files
authored
Pin GitHub provider to 3.0.0 (#30)
1 parent 7b25c75 commit 53fccec

File tree

14 files changed

+38
-129
lines changed

14 files changed

+38
-129
lines changed

.github/workflows/auto-context.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
make init
2828
make github/init/context.tf
2929
make readme/build
30-
echo "::set-output name=create_pull_request::true"
30+
echo "::set-output name=create_pull_request=true"
3131
fi
3232
else
3333
echo "This module has not yet been updated to support the context.tf pattern! Please update in order to support automatic updates."
@@ -38,8 +38,6 @@ jobs:
3838
uses: cloudposse/actions/github/[email protected]
3939
with:
4040
token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
41-
committer: 'cloudpossebot <[email protected]>'
42-
author: 'cloudpossebot <[email protected]>'
4341
commit-message: Update context.tf from origin source
4442
title: Update context.tf
4543
body: |-

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ Available targets:
425425

426426
| Name | Version |
427427
|------|---------|
428-
| terraform | >= 0.13.0 |
428+
| terraform | >= 0.12.26 |
429429
| aws | >= 2.0 |
430430
| random | >= 2.0 |
431431

@@ -496,7 +496,7 @@ Available targets:
496496
| codepipeline\_s3\_bucket\_force\_destroy | A boolean that indicates all objects should be deleted from the CodePipeline artifact store S3 bucket so that the bucket can be destroyed without error | `bool` | `false` | no |
497497
| container\_cpu | Atlantis CPUs per task | `number` | `256` | no |
498498
| container\_memory | Atlantis memory per task | `number` | `512` | no |
499-
| context | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | <pre>object({<br> enabled = bool<br> namespace = string<br> environment = string<br> stage = string<br> name = string<br> delimiter = string<br> attributes = list(string)<br> tags = map(string)<br> additional_tag_map = map(string)<br> regex_replace_chars = string<br> label_order = list(string)<br> id_length_limit = number<br> label_key_case = string<br> label_value_case = string<br> })</pre> | <pre>{<br> "additional_tag_map": {},<br> "attributes": [],<br> "delimiter": null,<br> "enabled": true,<br> "environment": null,<br> "id_length_limit": null,<br> "label_key_case": null,<br> "label_order": [],<br> "label_value_case": null,<br> "name": null,<br> "namespace": null,<br> "regex_replace_chars": null,<br> "stage": null,<br> "tags": {}<br>}</pre> | no |
499+
| context | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | <pre>object({<br> enabled = bool<br> namespace = string<br> environment = string<br> stage = string<br> name = string<br> delimiter = string<br> attributes = list(string)<br> tags = map(string)<br> additional_tag_map = map(string)<br> regex_replace_chars = string<br> label_order = list(string)<br> id_length_limit = number<br> })</pre> | <pre>{<br> "additional_tag_map": {},<br> "attributes": [],<br> "delimiter": null,<br> "enabled": true,<br> "environment": null,<br> "id_length_limit": null,<br> "label_order": [],<br> "name": null,<br> "namespace": null,<br> "regex_replace_chars": null,<br> "stage": null,<br> "tags": {}<br>}</pre> | no |
500500
| default\_backend\_image | ECS default (bootstrap) image | `string` | `"cloudposse/default-backend:0.1.2"` | no |
501501
| delimiter | Delimiter to be used between `namespace`, `environment`, `stage`, `name` and `attributes`.<br>Defaults to `-` (hyphen). Set to `""` to use no delimiter at all. | `string` | `null` | no |
502502
| desired\_count | Atlantis desired number of tasks | `number` | `1` | no |
@@ -513,7 +513,6 @@ Available targets:
513513
| ecs\_cluster\_name | Name of the ECS cluster to deploy Atlantis | `string` | n/a | yes |
514514
| enabled | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
515515
| environment | Environment, e.g. 'uw2', 'us-west-2', OR 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
516-
| github\_anonymous | Github Anonymous API (if `true`, token must not be set as GITHUB\_TOKEN or `github_token`) | `bool` | `false` | no |
517516
| github\_oauth\_token | GitHub OAuth token. If not provided the token is looked up from SSM | `string` | `""` | no |
518517
| github\_oauth\_token\_ssm\_name | SSM param name to lookup `github_oauth_token` if not provided | `string` | `""` | no |
519518
| github\_webhooks\_token | GitHub OAuth Token with permissions to create webhooks. If not provided the token is looked up from SSM | `string` | `""` | no |
@@ -522,9 +521,7 @@ Available targets:
522521
| hostname | Atlantis URL | `string` | `""` | no |
523522
| id\_length\_limit | Limit `id` to this many characters.<br>Set to `0` for unlimited length.<br>Set to `null` for default, which is `0`.<br>Does not affect `id_full`. | `number` | `null` | no |
524523
| kms\_key\_id | KMS key ID used to encrypt SSM SecureString parameters | `string` | `""` | no |
525-
| label\_key\_case | The letter case of label keys (`tag` names) (i.e. `name`, `namespace`, `environment`, `stage`, `attributes`) to use in `tags`.<br>Possible values: `lower`, `title`, `upper`. <br>Default value: `title`. | `string` | `null` | no |
526524
| label\_order | The naming order of the id output and Name tag.<br>Defaults to ["namespace", "environment", "stage", "name", "attributes"].<br>You can omit any of the 5 elements, but at least one must be present. | `list(string)` | `null` | no |
527-
| label\_value\_case | The letter case of output label values (also used in `tags` and `id`).<br>Possible values: `lower`, `title`, `upper` and `none` (no transformation). <br>Default value: `lower`. | `string` | `null` | no |
528525
| launch\_type | The ECS launch type (valid options: FARGATE or EC2) | `string` | `"FARGATE"` | no |
529526
| name | Solution name, e.g. 'app' or 'jenkins' | `string` | `null` | no |
530527
| namespace | Namespace, which could be your organization name or abbreviation, e.g. 'eg' or 'cp' | `string` | `null` | no |

context.tf

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
module "this" {
2222
source = "cloudposse/label/null"
23-
version = "0.23.0" // requires Terraform >= 0.13.0
23+
version = "0.22.1" // requires Terraform >= 0.12.26
2424

2525
enabled = var.enabled
2626
namespace = var.namespace
@@ -54,8 +54,6 @@ variable "context" {
5454
regex_replace_chars = string
5555
label_order = list(string)
5656
id_length_limit = number
57-
label_key_case = string
58-
label_value_case = string
5957
})
6058
default = {
6159
enabled = true
@@ -70,8 +68,6 @@ variable "context" {
7068
regex_replace_chars = null
7169
label_order = []
7270
id_length_limit = null
73-
label_key_case = null
74-
label_value_case = null
7571
}
7672
description = <<-EOT
7773
Single object for setting entire context at once.
@@ -80,16 +76,6 @@ variable "context" {
8076
Individual variable settings (non-null) override settings in context object,
8177
except for attributes, tags, and additional_tag_map, which are merged.
8278
EOT
83-
84-
validation {
85-
condition = var.context["label_key_case"] == null ? true : contains(["lower", "title", "upper"], var.context["label_key_case"])
86-
error_message = "Allowed values: `lower`, `title`, `upper`."
87-
}
88-
89-
validation {
90-
condition = var.context["label_value_case"] == null ? true : contains(["lower", "title", "upper", "none"], var.context["label_value_case"])
91-
error_message = "Allowed values: `lower`, `title`, `upper`, `none`."
92-
}
9379
}
9480

9581
variable "enabled" {
@@ -179,33 +165,4 @@ variable "id_length_limit" {
179165
EOT
180166
}
181167

182-
variable "label_key_case" {
183-
type = string
184-
default = null
185-
description = <<-EOT
186-
The letter case of label keys (`tag` names) (i.e. `name`, `namespace`, `environment`, `stage`, `attributes`) to use in `tags`.
187-
Possible values: `lower`, `title`, `upper`.
188-
Default value: `title`.
189-
EOT
190-
191-
validation {
192-
condition = var.label_key_case == null ? true : contains(["lower", "title", "upper"], var.label_key_case)
193-
error_message = "Allowed values: `lower`, `title`, `upper`."
194-
}
195-
}
196-
197-
variable "label_value_case" {
198-
type = string
199-
default = null
200-
description = <<-EOT
201-
The letter case of output label values (also used in `tags` and `id`).
202-
Possible values: `lower`, `title`, `upper` and `none` (no transformation).
203-
Default value: `lower`.
204-
EOT
205-
206-
validation {
207-
condition = var.label_value_case == null ? true : contains(["lower", "title", "upper", "none"], var.label_value_case)
208-
error_message = "Allowed values: `lower`, `title`, `upper`, `none`."
209-
}
210-
}
211168
#### End of copy of cloudposse/terraform-null-label/variables.tf

docs/terraform.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
| Name | Version |
55
|------|---------|
6-
| terraform | >= 0.13.0 |
6+
| terraform | >= 0.12.26 |
77
| aws | >= 2.0 |
88
| random | >= 2.0 |
99

@@ -74,7 +74,7 @@
7474
| codepipeline\_s3\_bucket\_force\_destroy | A boolean that indicates all objects should be deleted from the CodePipeline artifact store S3 bucket so that the bucket can be destroyed without error | `bool` | `false` | no |
7575
| container\_cpu | Atlantis CPUs per task | `number` | `256` | no |
7676
| container\_memory | Atlantis memory per task | `number` | `512` | no |
77-
| context | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | <pre>object({<br> enabled = bool<br> namespace = string<br> environment = string<br> stage = string<br> name = string<br> delimiter = string<br> attributes = list(string)<br> tags = map(string)<br> additional_tag_map = map(string)<br> regex_replace_chars = string<br> label_order = list(string)<br> id_length_limit = number<br> label_key_case = string<br> label_value_case = string<br> })</pre> | <pre>{<br> "additional_tag_map": {},<br> "attributes": [],<br> "delimiter": null,<br> "enabled": true,<br> "environment": null,<br> "id_length_limit": null,<br> "label_key_case": null,<br> "label_order": [],<br> "label_value_case": null,<br> "name": null,<br> "namespace": null,<br> "regex_replace_chars": null,<br> "stage": null,<br> "tags": {}<br>}</pre> | no |
77+
| context | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | <pre>object({<br> enabled = bool<br> namespace = string<br> environment = string<br> stage = string<br> name = string<br> delimiter = string<br> attributes = list(string)<br> tags = map(string)<br> additional_tag_map = map(string)<br> regex_replace_chars = string<br> label_order = list(string)<br> id_length_limit = number<br> })</pre> | <pre>{<br> "additional_tag_map": {},<br> "attributes": [],<br> "delimiter": null,<br> "enabled": true,<br> "environment": null,<br> "id_length_limit": null,<br> "label_order": [],<br> "name": null,<br> "namespace": null,<br> "regex_replace_chars": null,<br> "stage": null,<br> "tags": {}<br>}</pre> | no |
7878
| default\_backend\_image | ECS default (bootstrap) image | `string` | `"cloudposse/default-backend:0.1.2"` | no |
7979
| delimiter | Delimiter to be used between `namespace`, `environment`, `stage`, `name` and `attributes`.<br>Defaults to `-` (hyphen). Set to `""` to use no delimiter at all. | `string` | `null` | no |
8080
| desired\_count | Atlantis desired number of tasks | `number` | `1` | no |
@@ -91,7 +91,6 @@
9191
| ecs\_cluster\_name | Name of the ECS cluster to deploy Atlantis | `string` | n/a | yes |
9292
| enabled | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
9393
| environment | Environment, e.g. 'uw2', 'us-west-2', OR 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
94-
| github\_anonymous | Github Anonymous API (if `true`, token must not be set as GITHUB\_TOKEN or `github_token`) | `bool` | `false` | no |
9594
| github\_oauth\_token | GitHub OAuth token. If not provided the token is looked up from SSM | `string` | `""` | no |
9695
| github\_oauth\_token\_ssm\_name | SSM param name to lookup `github_oauth_token` if not provided | `string` | `""` | no |
9796
| github\_webhooks\_token | GitHub OAuth Token with permissions to create webhooks. If not provided the token is looked up from SSM | `string` | `""` | no |
@@ -100,9 +99,7 @@
10099
| hostname | Atlantis URL | `string` | `""` | no |
101100
| id\_length\_limit | Limit `id` to this many characters.<br>Set to `0` for unlimited length.<br>Set to `null` for default, which is `0`.<br>Does not affect `id_full`. | `number` | `null` | no |
102101
| kms\_key\_id | KMS key ID used to encrypt SSM SecureString parameters | `string` | `""` | no |
103-
| label\_key\_case | The letter case of label keys (`tag` names) (i.e. `name`, `namespace`, `environment`, `stage`, `attributes`) to use in `tags`.<br>Possible values: `lower`, `title`, `upper`. <br>Default value: `title`. | `string` | `null` | no |
104102
| label\_order | The naming order of the id output and Name tag.<br>Defaults to ["namespace", "environment", "stage", "name", "attributes"].<br>You can omit any of the 5 elements, but at least one must be present. | `list(string)` | `null` | no |
105-
| label\_value\_case | The letter case of output label values (also used in `tags` and `id`).<br>Possible values: `lower`, `title`, `upper` and `none` (no transformation). <br>Default value: `lower`. | `string` | `null` | no |
106103
| launch\_type | The ECS launch type (valid options: FARGATE or EC2) | `string` | `"FARGATE"` | no |
107104
| name | Solution name, e.g. 'app' or 'jenkins' | `string` | `null` | no |
108105
| namespace | Namespace, which could be your organization name or abbreviation, e.g. 'eg' or 'cp' | `string` | `null` | no |

examples/complete/context.tf

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
module "this" {
2222
source = "cloudposse/label/null"
23-
version = "0.23.0" // requires Terraform >= 0.13.0
23+
version = "0.22.1" // requires Terraform >= 0.12.26
2424

2525
enabled = var.enabled
2626
namespace = var.namespace
@@ -54,8 +54,6 @@ variable "context" {
5454
regex_replace_chars = string
5555
label_order = list(string)
5656
id_length_limit = number
57-
label_key_case = string
58-
label_value_case = string
5957
})
6058
default = {
6159
enabled = true
@@ -70,8 +68,6 @@ variable "context" {
7068
regex_replace_chars = null
7169
label_order = []
7270
id_length_limit = null
73-
label_key_case = null
74-
label_value_case = null
7571
}
7672
description = <<-EOT
7773
Single object for setting entire context at once.
@@ -80,16 +76,6 @@ variable "context" {
8076
Individual variable settings (non-null) override settings in context object,
8177
except for attributes, tags, and additional_tag_map, which are merged.
8278
EOT
83-
84-
validation {
85-
condition = var.context["label_key_case"] == null ? true : contains(["lower", "title", "upper"], var.context["label_key_case"])
86-
error_message = "Allowed values: `lower`, `title`, `upper`."
87-
}
88-
89-
validation {
90-
condition = var.context["label_value_case"] == null ? true : contains(["lower", "title", "upper", "none"], var.context["label_value_case"])
91-
error_message = "Allowed values: `lower`, `title`, `upper`, `none`."
92-
}
9379
}
9480

9581
variable "enabled" {
@@ -179,33 +165,4 @@ variable "id_length_limit" {
179165
EOT
180166
}
181167

182-
variable "label_key_case" {
183-
type = string
184-
default = null
185-
description = <<-EOT
186-
The letter case of label keys (`tag` names) (i.e. `name`, `namespace`, `environment`, `stage`, `attributes`) to use in `tags`.
187-
Possible values: `lower`, `title`, `upper`.
188-
Default value: `title`.
189-
EOT
190-
191-
validation {
192-
condition = var.label_key_case == null ? true : contains(["lower", "title", "upper"], var.label_key_case)
193-
error_message = "Allowed values: `lower`, `title`, `upper`."
194-
}
195-
}
196-
197-
variable "label_value_case" {
198-
type = string
199-
default = null
200-
description = <<-EOT
201-
The letter case of output label values (also used in `tags` and `id`).
202-
Possible values: `lower`, `title`, `upper` and `none` (no transformation).
203-
Default value: `lower`.
204-
EOT
205-
206-
validation {
207-
condition = var.label_value_case == null ? true : contains(["lower", "title", "upper", "none"], var.label_value_case)
208-
error_message = "Allowed values: `lower`, `title`, `upper`, `none`."
209-
}
210-
}
211168
#### End of copy of cloudposse/terraform-null-label/variables.tf

0 commit comments

Comments
 (0)