Skip to content

Commit c44050d

Browse files
feat: * improved user experience for validating input variable values<br>* updated required terraform to be >= 1.9.0 (#171)
1 parent ffe5198 commit c44050d

File tree

24 files changed

+26
-24
lines changed

24 files changed

+26
-24
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ You need the following permissions to run this module.
130130

131131
| Name | Version |
132132
|------|---------|
133-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
133+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
134134
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
135135

136136
### Modules

examples/apps/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
terraform {
3-
required_version = ">= 1.3.0"
3+
required_version = ">= 1.9.0"
44
# Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
55
# module's version.tf (this example), and 1 example that will always use the latest provider version (jobs examples).
66
required_providers {

examples/jobs/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
terraform {
3-
required_version = ">= 1.3.0"
3+
required_version = ">= 1.9.0"
44
required_providers {
55
ibm = {
66
source = "IBM-Cloud/ibm"

main.tf

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
locals {
22
project_id = var.project_name == null ? var.existing_project_id : module.project[0].id
3-
# tflint-ignore: terraform_unused_declarations
4-
validate_project_name_id = (var.project_name != null && var.existing_project_id != null) || (var.project_name == null && var.existing_project_id == null) ? tobool("Please provide exactly one of var.project_name or var.existing_project_id. Passing neither or both is invalid.") : true
53
}
64

75
##############################################################################

modules/app/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need the following permissions to run this module.
3838

3939
| Name | Version |
4040
|------|---------|
41-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
41+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
4242
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
4343

4444
### Modules

modules/app/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/binding/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You need the following permissions to run this module.
3737

3838
| Name | Version |
3939
|------|---------|
40-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
40+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
4141
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
4242

4343
### Modules

modules/binding/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/build/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ You need the following permissions to run this module.
3535

3636
| Name | Version |
3737
|------|---------|
38-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
38+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
3939
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
4040

4141
### Modules

modules/build/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/config_map/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You need the following permissions to run this module.
3333

3434
| Name | Version |
3535
|------|---------|
36-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
36+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
3737
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
3838

3939
### Modules

modules/config_map/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/domain_mapping/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You need the following permissions to run this module.
3737

3838
| Name | Version |
3939
|------|---------|
40-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
40+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
4141
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
4242

4343
### Modules

modules/domain_mapping/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/job/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need the following permissions to run this module.
3838

3939
| Name | Version |
4040
|------|---------|
41-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
41+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
4242
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
4343

4444
### Modules

modules/job/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/project/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You need the following permissions to run this module.
3333

3434
| Name | Version |
3535
|------|---------|
36-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
36+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
3737
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
3838

3939
### Modules

modules/project/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

modules/secret/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ You need the following permissions to run this module.
3434

3535
| Name | Version |
3636
|------|---------|
37-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
37+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
3838
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.74.0, <2.0.0 |
3939

4040
### Modules

modules/secret/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
ibm = {

solutions/apps/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
terraform {
3-
required_version = ">= 1.3.0"
3+
required_version = ">= 1.9.0"
44
required_providers {
55
ibm = {
66
source = "IBM-Cloud/ibm"

solutions/project/version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
terraform {
3-
required_version = ">= 1.3.0"
3+
required_version = ">= 1.9.0"
44
required_providers {
55
ibm = {
66
source = "IBM-Cloud/ibm"

variables.tf

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ variable "project_name" {
1111
description = "The name of the project to which code engine resources will be added. It is required if var.existing_project_id is null."
1212
type = string
1313
default = null
14+
validation {
15+
condition = (var.project_name != null) != (var.existing_project_id != null)
16+
error_message = "Please provide exactly one of var.project_name or var.existing_project_id. Passing neither or both is invalid."
17+
}
1418
}
1519

1620
variable "existing_project_id" {

version.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33
required_providers {
44
# Use "greater than or equal to" range in modules
55
# tflint-ignore: terraform_unused_required_providers

0 commit comments

Comments
 (0)