FAQ | This is a LIVE service | Changelog

Commit f3156541 authored by UIS DevOps Renovate Bot's avatar UIS DevOps Renovate Bot Committed by Dave Hart
Browse files

chore(deps)!: update terraform googlecloudplatform/lb-http/google to v12 

BREAKING CHANGE: Remove the `use_ssl_certificates` variable as the load
balancer module no longer accepts it.

Update tests and examples to use a more recent version (v23) of the SQL
module to resolve provider version conflicts.

Modify tests to only verify Google provider versions >= 6 as this is the
minimum version supported by Google's load balancer module.
parent aaf15e5f

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -58,9 +58,10 @@ tests: 
  tags:

    - $GKE_RUNNER_TAG

  parallel:

    # This matrix runs each of our test files in parallel targeting v4.x and v5.x of the Google Terraform provider

    # separately as we support both. It also ensures that subnet CIDR ranges do not clash when testing the VPC

    # Access/static egress IP configurations.

    # This matrix can run each of our test files in parallel targeting different versions of the

    # Google Terraform provider separately (although we currently only support >=6 due to

    # dependency constraints). It also ensures that subnet CIDR ranges do not clash when testing

    # the VPC Access/static egress IP configurations.

    matrix:

      - TEST_FILE:

          - cloud_run_service.tftest.hcl
@@ -68,26 +69,25 @@ tests: 
          - load_balancer.tftest.hcl

          - pre_deploy_job.tftest.hcl

        GOOGLE_PROVIDER_VERSION_CONSTRAINT:

          - "> 4, < 5"

          - "> 5, < 6"

          - ">= 6"

      - TEST_FILE:

          - monitoring.tftest.hcl

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: "> 4, < 5"

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: ">= 6"

        TF_VAR_static_egress_ip_cidr_range: "10.0.0.0/28"

        TF_VAR_test_ip_cidr_range: "10.0.0.16/28"

      - TEST_FILE:

          - monitoring.tftest.hcl

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: "> 5, < 6"

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: ">= 6"

        TF_VAR_static_egress_ip_cidr_range: "10.0.0.32/28"

        TF_VAR_test_ip_cidr_range: "10.0.0.48/28"

      - TEST_FILE:

          - vpc_access.tftest.hcl

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: "> 4, < 5"

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: ">= 6"

        TF_VAR_static_egress_ip_cidr_range: "10.0.0.64/28"

        TF_VAR_test_ip_cidr_range: "10.0.0.80/28"

      - TEST_FILE:

          - vpc_access.tftest.hcl

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: "> 5, < 6"

        GOOGLE_PROVIDER_VERSION_CONSTRAINT: ">= 6"

        TF_VAR_static_egress_ip_cidr_range: "10.0.0.96/28"

        TF_VAR_test_ip_cidr_range: "10.0.0.112/28"

README.md

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ For more information on how the pre-deploy Cloud Run job works see the 
| <a name="input_template_labels"></a> [template\_labels](#input\_template\_labels) | A set of key/value label pairs to assign to the Cloud Run service revision. | `map(string)` | `{}` | no |

| <a name="input_timeout_seconds"></a> [timeout\_seconds](#input\_timeout\_seconds) | The maximum duration, in seconds, the instance is allowed for responding to a<br>request. Maximum is 900s. | `string` | `"300s"` | no |

| <a name="input_traffic"></a> [traffic](#input\_traffic) | Configure traffic allocation between one or more service revisions. | <pre>list(object({<br>    type     = optional(string)<br>    revision = optional(string)<br>    percent  = optional(number)<br>    tag      = optional(string)<br>  }))</pre> | `[]` | no |

| <a name="input_use_ssl_certificates"></a> [use\_ssl\_certificates](#input\_use\_ssl\_certificates) | Whether to use the custom TLS certs in var.ssl\_certificates for the load<br>balancer or the Google-managed certs for the specified var.dns\_names. | `bool` | `false` | no |

| <a name="input_volumes"></a> [volumes](#input\_volumes) | Configure one or more volumes for the service. See<br>https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/cloud_run_v2_service#nested_volumes<br>for more information on these options. | <pre>list(object({<br>    name = string<br>    secret = optional(object({<br>      secret       = string<br>      default_mode = optional(number)<br>      items = optional(list(object({<br>        path    = string<br>        version = optional(string)<br>        mode    = optional(number)<br>      })), [])<br>    }))<br>    cloud_sql_instance = optional(object({<br>      instances = optional(list(string))<br>    }))<br>  }))</pre> | `[]` | no |

| <a name="input_vpc_access"></a> [vpc\_access](#input\_vpc\_access) | Configure VPC access for the Cloud Run service. For more information on these<br>options see<br>https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/cloud_run_v2_service#nested_vpc_access | <pre>object({<br>    connector = optional(string)<br>    egress    = optional(string)<br>    network_interfaces = optional(object({<br>      network    = optional(string)<br>      subnetwork = optional(string)<br>      tags       = optional(string)<br>    }))<br>  })</pre> | `null` | no |

| <a name="input_vpc_access_connector_max_throughput"></a> [vpc\_access\_connector\_max\_throughput](#input\_vpc\_access\_connector\_max\_throughput) | Optional. The maximum throughput of the connector in megabytes per second.<br>Defaults to 300. | `number` | `300` | no |

docs/examples.md

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ module "webapp" { 


module "sql" {

  source  = "GoogleCloudPlatform/sql-db/google//modules/postgresql"

  version = "~> 17.0"

  version = "~> 23.0"



  database_version            = "POSTGRES_15"

  name                        = "test-sql-1234"
@@ -210,7 +210,7 @@ module "webapp" { 


module "sql" {

  source  = "GoogleCloudPlatform/sql-db/google//modules/postgresql"

  version = "~> 17.0"

  version = "~> 23.0"



  database_version            = "POSTGRES_15"

  name                        = "test-sql-1234"

load_balancer.tf

+3 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ module "webapp_http_load_balancer" { 


  # The double slash is important(!)

  source  = "GoogleCloudPlatform/lb-http/google//modules/serverless_negs"

  version = "~> 9.0"

  version = "~> 12.0"



  project = var.project

  name    = var.name
@@ -42,8 +42,7 @@ module "webapp_http_load_balancer" { 
  ssl_policy                      = var.ssl_policy == null ? google_compute_ssl_policy.default[0].id : var.ssl_policy

  https_redirect                  = true



  # Use custom TLS certs if var.use_ssl_certificates is true, otherwise, use the Google-managed certs.

  use_ssl_certificates = var.use_ssl_certificates

  # Specify custom TLS certs, otherwise the Google-managed certs will be used.

  ssl_certificates = var.ssl_certificates



  # Whether to create an IPv6 address to the load balancer.

tests/setup/main.tf

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ module "sql" { 
  count = var.create_test_sql_instances ? 2 : 0



  source                      = "GoogleCloudPlatform/sql-db/google//modules/postgresql"

  version                     = "~> 17.0"

  version                     = "~> 23.0"

  database_version            = "POSTGRES_15"

  name                        = "${random_id.name.hex}-${count.index}"

  project_id                  = var.project