Skip to content

Commit 0791a80

Browse files
NuruNuru
committed
Revert "minimum required Terraform version bumped to 0.13.0, context.tf updated, readme updated (#60)"
This reverts commit bd2d7ed.
1 parent 4f88b5d commit 0791a80

File tree

6 files changed

+8
-98
lines changed

6 files changed

+8
-98
lines changed

‎README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Available targets:
208208
209209
| Name | Version |
210210
|------|---------|
211-
| terraform | >= 0.13.0 |
211+
| terraform | >= 0.12.26 |
212212
| aws | >= 2.0 |
213213
| local | >= 1.2 |
214214
| null | >= 2.0 |
@@ -237,7 +237,7 @@ Available targets:
237237
| buildspec | Declaration to use for building the project. [For more info](http://docs.aws.amazon.com/codebuild/latest/userguide/build-spec-ref.html) | `string` | `""` | no |
238238
| cache\_type | The type of storage that will be used for the AWS CodeBuild project cache. Valid values: NO\_CACHE, LOCAL, and S3. Defaults to S3. If cache\_type is S3, it will create an S3 bucket for storing codebuild cache inside | `string` | `"S3"` | no |
239239
| codestar\_connection\_arn | CodeStar connection ARN required for Bitbucket integration with CodePipeline | `string` | `""` | no |
240-
| 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 |
240+
| 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 |
241241
| 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 |
242242
| ecs\_cluster\_name | ECS Cluster Name | `string` | n/a | yes |
243243
| enabled | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
@@ -250,9 +250,7 @@ Available targets:
250250
| 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 |
251251
| image\_repo\_name | ECR repository name to store the Docker image built by this module. Used as CodeBuild ENV variable when building Docker images. [For more info](http://docs.aws.amazon.com/codebuild/latest/userguide/sample-docker.html) | `string` | n/a | yes |
252252
| image\_tag | Docker image tag in the ECR repository, e.g. 'latest'. Used as CodeBuild ENV variable when building Docker images. [For more info](http://docs.aws.amazon.com/codebuild/latest/userguide/sample-docker.html) | `string` | `"latest"` | no |
253-
| 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 |
254253
| 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 |
255-
| 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 |
256254
| local\_cache\_modes | Specifies settings that AWS CodeBuild uses to store and reuse build dependencies. Valid values: LOCAL\_SOURCE\_CACHE, LOCAL\_DOCKER\_LAYER\_CACHE, and LOCAL\_CUSTOM\_CACHE | `list(string)` | `[]` | no |
257255
| name | Solution name, e.g. 'app' or 'jenkins' | `string` | `null` | no |
258256
| 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 & 4 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
| local | >= 1.2 |
99
| null | >= 2.0 |
@@ -32,7 +32,7 @@
3232
| buildspec | Declaration to use for building the project. [For more info](http://docs.aws.amazon.com/codebuild/latest/userguide/build-spec-ref.html) | `string` | `""` | no |
3333
| cache\_type | The type of storage that will be used for the AWS CodeBuild project cache. Valid values: NO\_CACHE, LOCAL, and S3. Defaults to S3. If cache\_type is S3, it will create an S3 bucket for storing codebuild cache inside | `string` | `"S3"` | no |
3434
| codestar\_connection\_arn | CodeStar connection ARN required for Bitbucket integration with CodePipeline | `string` | `""` | no |
35-
| 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 |
35+
| 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 |
3636
| 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 |
3737
| ecs\_cluster\_name | ECS Cluster Name | `string` | n/a | yes |
3838
| enabled | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
@@ -45,9 +45,7 @@
4545
| 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 |
4646
| image\_repo\_name | ECR repository name to store the Docker image built by this module. Used as CodeBuild ENV variable when building Docker images. [For more info](http://docs.aws.amazon.com/codebuild/latest/userguide/sample-docker.html) | `string` | n/a | yes |
4747
| image\_tag | Docker image tag in the ECR repository, e.g. 'latest'. Used as CodeBuild ENV variable when building Docker images. [For more info](http://docs.aws.amazon.com/codebuild/latest/userguide/sample-docker.html) | `string` | `"latest"` | no |
48-
| 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 |
4948
| 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 |
50-
| 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 |
5149
| local\_cache\_modes | Specifies settings that AWS CodeBuild uses to store and reuse build dependencies. Valid values: LOCAL\_SOURCE\_CACHE, LOCAL\_DOCKER\_LAYER\_CACHE, and LOCAL\_CUSTOM\_CACHE | `list(string)` | `[]` | no |
5250
| name | Solution name, e.g. 'app' or 'jenkins' | `string` | `null` | no |
5351
| 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

‎examples/complete/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.13.0"
2+
required_version = ">= 0.12.26"
33

44
required_providers {
55
aws = {

‎versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.13.0"
2+
required_version = ">= 0.12.26"
33

44
required_providers {
55
aws = {

0 commit comments

Comments
 (0)