fix!: Making Cloud Functions ADC Compliant by anshukaira · Pull Request #194 · GoogleCloudPlatform/terraform-google-cloud-functions

anshukaira · 2025-11-11T13:13:21Z

Making Cloud Functions ADC Compliant

Updated Makefile
Added metadata.yaml and metadata.display.yaml files
Updated python version for fixing build run in tests

apeabody · 2025-11-11T17:43:21Z

Thanks! After this PR is merged, you will want to open a PR to add:

      lint_env = {
        ENABLE_BPMETADATA = "1"
      }

at https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/b0c6241ea40cd940b153aa3c1e64b53711b4fde0/infra/terraform/test-org/org/locals.tf#L667

variables.tf

anshukaira · 2025-11-12T09:00:14Z

Thanks! After this PR is merged, you will want to open a PR to add:
      lint_env = {
        ENABLE_BPMETADATA = "1"
      }
at https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/b0c6241ea40cd940b153aa3c1e64b53711b4fde0/infra/terraform/test-org/org/locals.tf#L667

Created a PR
GoogleCloudPlatform/cloud-foundation-toolkit#3266

prabhu34 · 2025-11-19T13:35:45Z

@apeabody Need your help here. The builds fail with different errors each time w.r.t to the secure functions modules. Are you aware of the modules being used by any teams?

@amandakarina Can you help here as well ?

apeabody · 2025-11-19T18:11:09Z

@apeabody Need your help here. The builds fail with different errors each time w.r.t to the secure functions modules. Are you aware of the modules being used by any teams?

@amandakarina Can you help here as well ?

Hi @prabhu34 - Unfortunately I'm not familiar, but the current build failed due to:

the Compute Engine API not being enabled in time.
an project naming conflict.

For the later, assuming it's a random conflict, I recommend adding: random_project_id_length = 4 to the project factory module defintion as it implements a larger collusion domain than the default.

github-actions · 2026-01-18T23:03:36Z

This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days

anshukaira · 2026-01-21T11:00:11Z

Picking up this PR again, trying to resolve the build errors

anshukaira · 2026-01-21T12:36:38Z

@apeabody @prabhu34

I have tried increasing wait time, changing names and still this seem to have failures. Can you help in resolving this?

apeabody · 2026-01-21T20:40:19Z

@apeabody @prabhu34

I have tried increasing wait time, changing names and still this seem to have failures. Can you help in resolving this?

Hi @anshukaira You renamed the project to prj-scf-bq-trg, but didn't update the API list name, etc, to match. For example:

  serverless_project_extra_apis = {
    "prj-scf-bq-trigger" = ["compute.googleapis.com", "networksecurity.googleapis.com", "cloudfunctions.googleapis.com", "cloudbuild.googleapis.com", "eventarc.googleapis.com", "eventarcpublishing.googleapis.com"]
  }

anshukaira · 2026-01-22T13:16:46Z

hi @apeabody
thanks for the pointer, i missed it while trying to change the project name, and it has resolved the issue. can you please review this PR?

variables.tf

apeabody

Thanks @anshukaira!

apeabody · 2026-01-22T17:56:17Z

examples/cloud_function2_gcs_source/main.tf

 module "cloud_functions2" {
-  source  = "GoogleCloudPlatform/cloud-functions/google"
-  version = "~> 0.6"
+  source = "../../"


This is automatically rewritten during lint/tests, so the standard is to use a version in the committed version for customers.

Suggested change

source = "../../"

source = "GoogleCloudPlatform/cloud-functions/google"

version = "~> 0.7"

For future fix: update to use "released" version and depend on module swapper for lint and & tests

apeabody · 2026-01-22T17:56:49Z

examples/cloud_function2_pubsub_trigger/main.tf

 module "cloud_functions2" {
-  source  = "GoogleCloudPlatform/cloud-functions/google"
-  version = "~> 0.6"
+  source = "../../"


Suggested change

source = "../../"

source = "GoogleCloudPlatform/cloud-functions/google"

version = "~> 0.7"

Update:

Tried doing this in this test PR - https://github.com/GoogleCloudPlatform/terraform-google-cloud-functions/pull/205/checks?check_run_id=61342778210
and i am seeing failures in test as well as lint. scheduled a call on 26/01 to resolve this issue.

For future fix: update to use "released" version and depend on module swapper for lint and & tests

apeabody · 2026-01-26T16:44:47Z

examples/secure_cloud_function_bigquery_trigger/main.tf

@@ -35,9 +35,9 @@ module "secure_harness" {
  version = "~> 0.21.5"


For future change: It's bump the version constraint to "~> 0.23"

GoogleCloudPlatform/terraform-google-cloud-run#438

apeabody · 2026-01-26T16:49:23Z

examples/secure_cloud_function_internal_server/main.tf

@@ -36,7 +36,7 @@ module "secure_harness" {
  version = "~> 0.21.5"


For future change: It's bump the version constraint to "~> 0.23"

apeabody · 2026-01-26T16:49:31Z

examples/secure_cloud_function_with_sql/main.tf

@@ -39,8 +39,8 @@ module "secure_harness" {
  version = "~> 0.21.5"


For future change: It's bump the version constraint to "~> 0.23"

apeabody

Thanks @anshukaira!

Approved with the notes to please follow-up in a future fix PR.

anshukaira · 2026-02-03T06:00:32Z

Created a followup PR for this -- #212

kevcube · 2026-02-12T19:03:02Z

main.tf

+locals {
+  # If var.location is set, use it. Otherwise, use var.function_location.
+  # This makes the change backward-compatible.
+  effective_location = coalesce(var.location, var.function_location)
+}
+


This change is not backwards compatible because var.location has no default. So if this module 'A' is consumed in another module 'B', this change has broken module 'B' until it is updated.

ref: terraform-google-modules/terraform-example-foundation#1458

we have created a new major version by using ! as this is a breaking change. So, it should not be breaking other modules if they are using the old major version of cloud functions.

@krprabhat-eng but the major version was released as a minor version, 0.8.0.

Terraform's ~> 0.6 operator will resolve to 0.8, as in the linked PR

@anshukaira can we approve this & create a new major version for our use case.
@kevcube When we are releasing a new major version, can we simply rename function_location to location ?

Yes, removing function_location in favor of location in a new major release is fine @krprabhat-eng

anshukaira requested review from a team and prabhu34 as code owners November 11, 2025 13:13

anshukaira force-pushed the adc-compliance branch 6 times, most recently from 7108ad5 to 0467c6e Compare November 11, 2025 15:13

apeabody reviewed Nov 11, 2025

View reviewed changes

variables.tf Show resolved Hide resolved

anshukaira mentioned this pull request Nov 12, 2025

chore: adding enable metadata env var for lint testing GoogleCloudPlatform/cloud-foundation-toolkit#3266

Merged

anshukaira force-pushed the adc-compliance branch from 0467c6e to c0b22f9 Compare November 12, 2025 09:02

anshukaira changed the title ~~chore: Making Cloud Functions ADC Compliant~~ fix: Making Cloud Functions ADC Compliant Nov 12, 2025

anshukaira force-pushed the adc-compliance branch 10 times, most recently from 90d39f1 to 90c9629 Compare November 14, 2025 06:19

github-actions bot added the Stale label Jan 18, 2026

anshukaira requested review from ayushmjain and krprabhat-eng as code owners January 20, 2026 07:22

anshukaira requested a review from q2w as a code owner January 20, 2026 07:22

github-actions bot removed the Stale label Jan 20, 2026

anshukaira added 2 commits January 21, 2026 10:56

fix: Making Cloud Functions ADC Compliant

389e7af

Adding some validations

ecaa891

anshukaira force-pushed the adc-compliance branch from d6f392a to ecaa891 Compare January 21, 2026 10:57

anshukaira force-pushed the adc-compliance branch 4 times, most recently from 3be28a9 to 09d7fe2 Compare January 21, 2026 12:34

anshukaira force-pushed the adc-compliance branch from 09d7fe2 to 71675b7 Compare January 21, 2026 13:57

Fixing broken builds

69075bc

anshukaira force-pushed the adc-compliance branch from 71675b7 to 69075bc Compare January 22, 2026 10:50

anshukaira changed the title ~~fix: Making Cloud Functions ADC Compliant~~ fix!: Making Cloud Functions ADC Compliant Jan 22, 2026

krprabhat-eng approved these changes Jan 22, 2026

View reviewed changes

variables.tf Show resolved Hide resolved

apeabody requested changes Jan 22, 2026

View reviewed changes

apeabody reviewed Jan 26, 2026

View reviewed changes

apeabody approved these changes Jan 26, 2026

View reviewed changes

apeabody merged commit 564e92e into GoogleCloudPlatform:main Jan 26, 2026
7 checks passed

release-please bot mentioned this pull request Jan 26, 2026

chore(main): release 0.8.0 #211

Merged

anshukaira deleted the adc-compliance branch February 3, 2026 05:45

kevcube reviewed Feb 12, 2026

View reviewed changes

kevcube mentioned this pull request Feb 12, 2026

fix: provide default for var.location to improve backwards compatibility of ADC change. #213

Open

	source = "../../"
	source = "GoogleCloudPlatform/cloud-functions/google"
	version = "~> 0.7"

		@@ -35,9 +35,9 @@ module "secure_harness" {
		version = "~> 0.21.5"

		@@ -36,7 +36,7 @@ module "secure_harness" {
		version = "~> 0.21.5"

		@@ -39,8 +39,8 @@ module "secure_harness" {
		version = "~> 0.21.5"

Conversation

anshukaira commented Nov 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

apeabody commented Nov 11, 2025

Uh oh!

Uh oh!

anshukaira commented Nov 12, 2025

Uh oh!

prabhu34 commented Nov 19, 2025

Uh oh!

apeabody commented Nov 19, 2025

Uh oh!

github-actions bot commented Jan 18, 2026

Uh oh!

anshukaira commented Jan 21, 2026

Uh oh!

anshukaira commented Jan 21, 2026

Uh oh!

apeabody commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anshukaira commented Jan 22, 2026

Uh oh!

Uh oh!

apeabody left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

apeabody left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anshukaira commented Feb 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

anshukaira commented Nov 11, 2025 •

edited

Loading

apeabody commented Jan 21, 2026 •

edited

Loading