Merge branch 'main' into fix/null-ip-ranges

Author: imrannayer

.github/conventional-commit-lint.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Google LLC
+# Copyright 2022-2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # NOTE: This file is automatically generated from:
-# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github
 
 enabled: true
 always_check_pr_title: true

.github/trusted-contribution.yml

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2023-2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # NOTE: This file is automatically generated from:
-# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github
 
 annotations:
   - type: comment

.github/workflows/lint.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2023-2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
 # limitations under the License.
 
 # NOTE: This file is automatically generated from values at:
-# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf
 
 name: 'lint'
 
 on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - main
 
 concurrency:
   group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Google LLC
+# Copyright 2022-2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # NOTE: This file is automatically generated from:
-# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github
 
 name: "Close stale issues"
 on:

CODEOWNERS

@@ -1,5 +1,5 @@
 # NOTE: This file is automatically generated from values at:
-# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf
 
 * @terraform-google-modules/cft-admins @imrannayer
 

modules/create_environment_v2/README.md

@@ -81,7 +81,7 @@ module "simple-composer-environment" {
 | env\_variables | Variables of the airflow environment. | `map(string)` | `{}` | no |
 | environment\_size | The environment size controls the performance parameters of the managed Cloud Composer infrastructure that includes the Airflow database. Values for environment size are: `ENVIRONMENT_SIZE_SMALL`, `ENVIRONMENT_SIZE_MEDIUM`, and `ENVIRONMENT_SIZE_LARGE`. | `string` | `"ENVIRONMENT_SIZE_MEDIUM"` | no |
 | grant\_sa\_agent\_permission | Cloud Composer relies on Workload Identity as Google API authentication mechanism for Airflow. | `bool` | `true` | no |
-| image\_version | The version of the aiflow running in the cloud composer environment. | `string` | `"composer-2.5.0-airflow-2.6.3"` | no |
+| image\_version | The version of the aiflow running in the cloud composer environment. | `string` | `"composer-2.10.2-airflow-2.10.2"` | no |
 | kms\_key\_name | Customer-managed Encryption Key fully qualified resource name, i.e. projects/project-id/locations/location/keyRings/keyring/cryptoKeys/key. | `string` | `null` | no |
 | labels | The resource labels (a map of key/value pairs) to be applied to the Cloud Composer. | `map(string)` | `{}` | no |
 | maintenance\_end\_time | Time window specified for recurring maintenance operations in RFC3339 format | `string` | `null` | no |

modules/create_environment_v2/variables.tf

@@ -103,7 +103,7 @@ variable "env_variables" {
 variable "image_version" {
   type        = string
   description = "The version of the aiflow running in the cloud composer environment."
-  default     = "composer-2.5.0-airflow-2.6.3"
+  default     = "composer-2.10.2-airflow-2.10.2"
 }
 
 variable "pypi_packages" {

test/integration/composer_v2_sharedvpc_prereq/composer_v2_sharedvpc_prereq_test.go

@@ -27,7 +27,7 @@ func TestSimpleComposerEnvV2SharedVpcModule(t *testing.T) {
 	composer := tft.NewTFBlueprintTest(t)
 
 	composer.DefineVerify(func(assert *assert.Assertions) {
-		composer.DefaultVerify(assert)
+		// composer.DefaultVerify(assert)  // See PR 149 for more info
 
 		serviceprojectID := composer.GetStringOutput("service_project_id")