diff --git a/README.md b/README.md index 61f202674..c04328054 100644 --- a/README.md +++ b/README.md @@ -912,7 +912,7 @@ module "cluster_pattern" { | [f5\_vsi](#input\_f5\_vsi) | A list describing F5 VSI workloads to create | 
list(
    object({
      name                   = string
      vpc_name               = string
      primary_subnet_name    = string
      secondary_subnet_names = list(string)
      secondary_subnet_security_group_names = list(
        object({
          group_name     = string
          interface_name = string
        })
      )
      ssh_keys                        = list(string)
      f5_image_name                   = string
      machine_type                    = string
      resource_group                  = optional(string)
      enable_management_floating_ip   = optional(bool)
      enable_external_floating_ip     = optional(bool)
      security_groups                 = optional(list(string))
      boot_volume_encryption_key_name = optional(string)
      hostname                        = string
      domain                          = string
      access_tags                     = optional(list(string), [])
      security_group = optional(
        object({
          name = string
          rules = list(
            object({
              name      = string
              direction = string
              source    = string
              tcp = optional(
                object({
                  port_max = number
                  port_min = number
                })
              )
              udp = optional(
                object({
                  port_max = number
                  port_min = number
                })
              )
              icmp = optional(
                object({
                  type = number
                  code = number
                })
              )
            })
          )
        })
      )
      block_storage_volumes = optional(list(
        object({
          name           = string
          profile        = string
          capacity       = optional(number)
          iops           = optional(number)
          encryption_key = optional(string)
        })
      ))
      load_balancers = optional(list(
        object({
          name                    = string
          type                    = string
          listener_port           = number
          listener_protocol       = string
          connection_limit        = number
          algorithm               = string
          protocol                = string
          health_delay            = number
          health_retries          = number
          health_timeout          = number
          health_type             = string
          pool_member_port        = string
          idle_connection_timeout = optional(number)
          security_group = optional(
            object({
              name = string
              rules = list(
                object({
                  name      = string
                  direction = string
                  source    = string
                  tcp = optional(
                    object({
                      port_max = number
                      port_min = number
                    })
                  )
                  udp = optional(
                    object({
                      port_max = number
                      port_min = number
                    })
                  )
                  icmp = optional(
                    object({
                      type = number
                      code = number
                    })
                  )
                })
              )
            })
          )
        })
      ))
    })
  )
| `[]` | no | | [key\_management](#input\_key\_management) | Key Protect instance variables | 
object({
    name              = optional(string)
    resource_group    = optional(string)
    use_data          = optional(bool)
    use_hs_crypto     = optional(bool)
    access_tags       = optional(list(string), [])
    service_endpoints = optional(string, "public-and-private")
    keys = optional(
      list(
        object({
          name             = string
          root_key         = optional(bool)
          payload          = optional(string)
          key_ring         = optional(string) # Any key_ring added will be created
          force_delete     = optional(bool)
          existing_key_crn = optional(string) # CRN of an existing key in the same or different account.
          endpoint         = optional(string) # can be public or private
          iv_value         = optional(string) # (Optional, Forces new resource, String) Used with import tokens. The initialization vector (IV) that is generated when you encrypt a nonce. The IV value is required to decrypt the encrypted nonce value that you provide when you make a key import request to the service. To generate an IV, encrypt the nonce by running ibmcloud kp import-token encrypt-nonce. Only for imported root key.
          encrypted_nonce  = optional(string) # The encrypted nonce value that verifies your request to import a key to Key Protect. This value must be encrypted by using the key that you want to import to the service. To retrieve a nonce, use the ibmcloud kp import-token get command. Then, encrypt the value by running ibmcloud kp import-token encrypt-nonce. Only for imported root key.
          policies = optional(
            object({
              rotation = optional(
                object({
                  interval_month = number
                })
              )
              dual_auth_delete = optional(
                object({
                  enabled = bool
                })
              )
            })
          )
        })
      )
    )
  })
| n/a | yes | | [network\_cidr](#input\_network\_cidr) | Network CIDR for the VPC. This is used to manage network ACL rules for cluster provisioning. | `string` | `"10.0.0.0/8"` | no | -| [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a letter and end with a letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters. | `string` | n/a | yes | +| [prefix](#input\_prefix) | A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters. | `string` | n/a | yes | | [region](#input\_region) | Region where VPC will be created. To find your VPC region, use `ibmcloud is regions` command to find available regions. | `string` | n/a | yes | | [resource\_groups](#input\_resource\_groups) | Object describing resource groups to create or reference | 
list(
    object({
      name       = string
      create     = optional(bool)
      use_prefix = optional(bool)
    })
  )
| n/a | yes | | [security\_groups](#input\_security\_groups) | Security groups for VPC | 
list(
    object({
      name           = string
      vpc_name       = string
      resource_group = optional(string)
      access_tags    = optional(list(string), [])
      rules = list(
        object({
          name      = string
          direction = string
          source    = string
          tcp = optional(
            object({
              port_max = number
              port_min = number
            })
          )
          udp = optional(
            object({
              port_max = number
              port_min = number
            })
          )
          icmp = optional(
            object({
              type = number
              code = number
            })
          )
        })
      )
    })
  )
| `[]` | no | diff --git a/examples/one-vpc-one-vsi/variables.tf b/examples/one-vpc-one-vsi/variables.tf index a5c4db456..b4ae40896 100644 --- a/examples/one-vpc-one-vsi/variables.tf +++ b/examples/one-vpc-one-vsi/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string default = "extra-simple" diff --git a/examples/override-example/variables.tf b/examples/override-example/variables.tf index 768f6da33..c6ab28aaf 100644 --- a/examples/override-example/variables.tf +++ b/examples/override-example/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string default = "land-zone-vsi-qs" diff --git a/patterns/dynamic_values/variables.tf b/patterns/dynamic_values/variables.tf index 0a98e2031..01ef079b9 100644 --- a/patterns/dynamic_values/variables.tf +++ b/patterns/dynamic_values/variables.tf @@ -3,7 +3,7 @@ ############################################################################## variable "prefix" { - description = "A unique identifier for resources. Must begin with a letter and end with a letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation { diff --git a/patterns/mixed/variables.tf b/patterns/mixed/variables.tf index 5079c7849..6d568b3a2 100644 --- a/patterns/mixed/variables.tf +++ b/patterns/mixed/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation { diff --git a/patterns/roks-quickstart/variables.tf b/patterns/roks-quickstart/variables.tf index 86c09523f..a636a6efc 100644 --- a/patterns/roks-quickstart/variables.tf +++ b/patterns/roks-quickstart/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 13 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 13 or fewer characters." type = string default = "lz-roks-qs" diff --git a/patterns/roks/module/variables.tf b/patterns/roks/module/variables.tf index ff1740022..dcbca23f9 100644 --- a/patterns/roks/module/variables.tf +++ b/patterns/roks/module/variables.tf @@ -3,7 +3,7 @@ ############################################################################## variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 13 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 13 or fewer characters." type = string validation { diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf index 296fed0b5..310cf1e2b 100644 --- a/patterns/roks/variables.tf +++ b/patterns/roks/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 13 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 13 or fewer characters." type = string validation { diff --git a/patterns/vpc/module/variables.tf b/patterns/vpc/module/variables.tf index 516bee552..792155f36 100644 --- a/patterns/vpc/module/variables.tf +++ b/patterns/vpc/module/variables.tf @@ -3,7 +3,7 @@ ############################################################################## variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation { diff --git a/patterns/vpc/variables.tf b/patterns/vpc/variables.tf index 575c535cb..29c58e0b5 100644 --- a/patterns/vpc/variables.tf +++ b/patterns/vpc/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation { diff --git a/patterns/vsi-extension/variables.tf b/patterns/vsi-extension/variables.tf index 76c3dc664..0d5aebda0 100644 --- a/patterns/vsi-extension/variables.tf +++ b/patterns/vsi-extension/variables.tf @@ -10,7 +10,7 @@ variable "region" { } variable "prefix" { - description = "The prefix to add to the VSI, block storage, security group, floating IP, and load balancer resources." + description = "The prefix to add to the VSI, block storage, security group, floating IP, and load balancer resources. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string default = "slz-vsi" } diff --git a/patterns/vsi-quickstart/variables.tf b/patterns/vsi-quickstart/variables.tf index b1a3095ca..e7db500a9 100644 --- a/patterns/vsi-quickstart/variables.tf +++ b/patterns/vsi-quickstart/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string default = "land-zone-vsi-qs" diff --git a/patterns/vsi/module/variables.tf b/patterns/vsi/module/variables.tf index 5f90ba8a7..2ce663924 100644 --- a/patterns/vsi/module/variables.tf +++ b/patterns/vsi/module/variables.tf @@ -3,7 +3,7 @@ ############################################################################## variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation { error_message = "Prefix must begin with a lowercase letter and contain only lowercase letters, numbers, and - characters. Prefixes must end with a lowercase letter or number and be 16 or fewer characters." diff --git a/patterns/vsi/variables.tf b/patterns/vsi/variables.tf index 1b78ed805..3249e8b89 100644 --- a/patterns/vsi/variables.tf +++ b/patterns/vsi/variables.tf @@ -9,7 +9,7 @@ variable "ibmcloud_api_key" { } variable "prefix" { - description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation { error_message = "Prefix must begin with a lowercase letter and contain only lowercase letters, numbers, and - characters. Prefixes must end with a lowercase letter or number and be 16 or fewer characters." diff --git a/ssh_key/variables.tf b/ssh_key/variables.tf index e2c1744cd..88f21e23e 100644 --- a/ssh_key/variables.tf +++ b/ssh_key/variables.tf @@ -3,7 +3,7 @@ ############################################################################## variable "prefix" { - description = "A unique identifier for resources. Must begin with a letter and end with a letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string default = "gcat-multizone-schematics" diff --git a/tests/pr_test.go b/tests/pr_test.go index 9ec1c0636..6306f3815 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -181,9 +181,6 @@ func TestRunROKSQuickStartPattern(t *testing.T) { func TestRunUpgradeROKSQuickStartPattern(t *testing.T) { t.Parallel() - // REMOVE SKIP AFTER ROKS QUICKSTART MERGED TO MAIN - t.Skip("ATTENTION: Skipping ROKS Quickstart pattern upgrade test until new pattern has been merged to main") - options := setupOptionsROKSQuickStartPattern(t, "rokqsu", roksQuickstartPatternTerraformDir) output, err := options.RunTestUpgrade() @@ -204,11 +201,12 @@ func setupOptionsRoksPattern(t *testing.T, prefix string) *testhelper.TestOption }) options.TerraformVars = map[string]interface{}{ - "prefix": options.Prefix, - "tags": options.Tags, - "region": options.Region, - "entitlement": "cloud_pak", - "flavor": "bx2.4x16", + "prefix": options.Prefix, + "tags": options.Tags, + "region": options.Region, + "entitlement": "cloud_pak", + "flavor": "bx2.4x16", + "enable_transit_gateway": false, } return options @@ -252,11 +250,12 @@ func setupOptionsVsiPattern(t *testing.T, prefix string) *testhelper.TestOptions }) options.TerraformVars = map[string]interface{}{ - "ssh_public_key": sshPublicKey, - "prefix": options.Prefix, - "tags": options.Tags, - "region": options.Region, - "add_atracker_route": add_atracker_route, + "ssh_public_key": sshPublicKey, + "prefix": options.Prefix, + "tags": options.Tags, + "region": options.Region, + "add_atracker_route": add_atracker_route, + "enable_transit_gateway": false, } return options @@ -298,10 +297,11 @@ func setupOptionsVpcPattern(t *testing.T, prefix string) *testhelper.TestOptions }) options.TerraformVars = map[string]interface{}{ - "prefix": options.Prefix, - "tags": options.Tags, - "region": options.Region, - "add_atracker_route": add_atracker_route, + "prefix": options.Prefix, + "tags": options.Tags, + "region": options.Region, + "add_atracker_route": add_atracker_route, + "enable_transit_gateway": false, } return options @@ -428,9 +428,10 @@ func TestRunVsiExtention(t *testing.T) { existingTerraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{ TerraformDir: vpcTerraformDir, Vars: map[string]interface{}{ - "prefix": prefix, - "region": region, - "tags": tags, + "prefix": prefix, + "region": region, + "tags": tags, + "enable_transit_gateway": false, }, // Set Upgrade to true to ensure latest version of providers and modules are used by terratest. // This is the same as setting the -upgrade=true flag with terraform. @@ -570,6 +571,7 @@ func TestRunVSIPatternSchematics(t *testing.T) { {Name: "prefix", Value: options.Prefix, DataType: "string"}, {Name: "ssh_public_key", Value: sshPublicKey(t), DataType: "string"}, {Name: "add_atracker_route", Value: add_atracker_route, DataType: "bool"}, + {Name: "enable_transit_gateway", Value: false, DataType: "bool"}, } err := options.RunSchematicTest() @@ -593,6 +595,7 @@ func TestRunRoksPatternSchematics(t *testing.T) { {Name: "tags", Value: options.Tags, DataType: "list(string)"}, {Name: "entitlement", Value: "cloud_pak", DataType: "string"}, {Name: "flavor", Value: "bx2.4x16", DataType: "string"}, + {Name: "enable_transit_gateway", Value: false, DataType: "bool"}, } err := options.RunSchematicTest() @@ -613,6 +616,7 @@ func TestRunVPCPatternSchematics(t *testing.T) { {Name: "prefix", Value: options.Prefix, DataType: "string"}, {Name: "tags", Value: options.Tags, DataType: "list(string)"}, {Name: "add_atracker_route", Value: add_atracker_route, DataType: "bool"}, + {Name: "enable_transit_gateway", Value: false, DataType: "bool"}, } err := options.RunSchematicTest() diff --git a/variables.tf b/variables.tf index 7c04ac89b..232d5467c 100644 --- a/variables.tf +++ b/variables.tf @@ -3,7 +3,7 @@ ############################################################################## variable "prefix" { - description = "A unique identifier for resources. Must begin with a letter and end with a letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters." + description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters." type = string validation {