Add ControlPlaneAccess support for Apigee #12825

akspi · 2025-01-21T23:38:57Z

Adds support for ControlPlaneAccess for Terraform

Manual Test

➜  akshaypai@feferson:~$ cat main.tf 
resource "google_apigee_control_plane_access" "apigee_control_plane_access" {
  name       = "<redacted-project-id>"
  synchronizer_identities = [
    "serviceAccount:<redacted-sa-email>",
  ]
  analytics_publisher_identities = [
    "serviceAccount:<redacted-sa-email>",
  ]
}

➜  akshaypai@feferson:~$ TF_CLI_CONFIG_FILE="$HOME/tf-dev-override.tfrc" terraform plan
Terraform will perform the following actions:

  # google_apigee_control_plane_access.apigee_control_plane_access will be updated in-place
  ~ resource "google_apigee_control_plane_access" "apigee_control_plane_access" {
      ~ analytics_publisher_identities = [
          + "serviceAccount:<redacted-sa-email>",
        ]
        id                             = "organizations/<redacted-project-id>/controlPlaneAccess"
        name                           = "<redacted-project-id>"
      ~ synchronizer_identities        = [
          + "serviceAccount:<redacted-sa-email>",
        ]
    }

➜  akshaypai@feferson:~$ TF_LOG=DEBUG TF_LOG_PATH=output.log TF_CLI_CONFIG_FILE="$HOME/tf-dev-override.tfrc" terraform apply
google_apigee_control_plane_access.apigee_control_plane_access: Modifying... [id=organizations/<redacted-project-id>/controlPlaneAccess]
google_apigee_control_plane_access.apigee_control_plane_access: Modifications complete after 1s [id=organizations/<redacted-project-id>/controlPlaneAccess]

Apply complete! Resources: 0 added, 1 changed, 0 destroyed.

2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: ---[ REQUEST ]---------------------------------------
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: GET /v1/organizations/<redacted-project-id>/controlPlaneAccess?alt=json HTTP/1.1
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: Host: apigee.googleapis.com
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: User-Agent: Terraform/1.10.4 (+https://www.terraform.io) Terraform-Plugin-SDK/2.33.0 terraform-provider-google/dev6
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: Content-Type: application/json
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: Accept-Encoding: gzip
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google
2025-01-21T23:34:20.760Z [DEBUG] provider.terraform-provider-google: -----------------------------------------------------
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: 2025/01/21 23:34:21 [DEBUG] Google API Response Details:
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: ---[ RESPONSE ]--------------------------------------
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: HTTP/2.0 200 OK
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: Content-Type: application/json; charset=UTF-8
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: Date: Tue, 21 Jan 2025 23:34:21 GMT
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: Server: ESF
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: Vary: Origin
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: Vary: X-Origin
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: Vary: Referer
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: X-Content-Type-Options: nosniff
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: X-Frame-Options: SAMEORIGIN
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: X-Xss-Protection: 0
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: {
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google:   "synchronizerIdentities": [
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: "serviceAccount:<redacted-sa-email>"
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google:   ],
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google:   "analyticsPublisherIdentities": [
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: "serviceAccount:<redacted-sa-email>"
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google:   ]
2025-01-21T23:34:21.073Z [DEBUG] provider.terraform-provider-google: }

Release Notes

`google_control_plane_access`

github-actions · 2025-01-21T23:39:40Z

Hello! I am a robot. Tests will require approval from a repository maintainer to run.

@roaks3, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

modular-magician · 2025-01-21T23:50:07Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 5 files changed, 567 insertions(+), 2 deletions(-))
google-beta provider: Diff ( 5 files changed, 567 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 79 insertions(+))

modular-magician · 2025-01-21T23:55:04Z

Tests analytics

Total tests: 55
Passed tests: 16
Skipped tests: 36
Affected tests: 3

Click here to see the affected service packages

apigee

Action taken

Found 3 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample

TestAccApigeeEnvironmentAddonsConfig_apigeeEnvAddonsAnalyticsTestExample

TestAccApigeeEnvironment_apigeeEnvironmentUpdateTest

Get to know how VCR tests work

modular-magician · 2025-01-22T00:06:26Z

🔴 Tests failed during RECORDING mode:
TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample [Error message] [Debug log]
TestAccApigeeEnvironmentAddonsConfig_apigeeEnvAddonsAnalyticsTestExample [Error message] [Debug log]
TestAccApigeeEnvironment_apigeeEnvironmentUpdateTest [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

github-actions · 2025-01-24T09:40:59Z

@roaks3 This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

github-actions · 2025-01-28T09:41:27Z

@GoogleCloudPlatform/terraform-team @roaks3 This PR has been waiting for review for 1 week. Please take a look! Use the label disable-review-reminders to disable these notifications.

roaks3

The test results seem to indicate that these fields aren't returned from the API, so they may need ignore_read: true

mmv1/products/apigee/ControlPlaneAccess.yaml

github-actions · 2025-02-11T09:41:51Z

@akspi, this PR is waiting for action from you. If no action is taken, this PR will be closed in 28 days.

Please address any comments or change requests, or re-request review from a core reviewer if no action is required.

This notification can be disabled with the disable-automatic-closure label.

github-actions · 2025-02-25T09:42:39Z

@akspi, this PR is waiting for action from you. If no action is taken, this PR will be closed in 14 days.

Please address any comments or change requests, or re-request review from a core reviewer if no action is required.

This notification can be disabled with the disable-automatic-closure label.

github-actions · 2025-03-07T09:42:37Z

@akspi, this PR is waiting for action from you. If no action is taken, this PR will be closed in 2 weekdays.

Please address any comments or change requests, or re-request review from a core reviewer if no action is required.

This notification can be disabled with the disable-automatic-closure label.

modular-magician · 2025-03-10T22:37:20Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 6 files changed, 756 insertions(+), 2 deletions(-))
google-beta provider: Diff ( 6 files changed, 756 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 81 insertions(+))

modular-magician · 2025-03-10T22:42:15Z

Tests analytics

Total tests: 56
Passed tests: 18
Skipped tests: 36
Affected tests: 2

Click here to see the affected service packages

apigee

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample

TestAccApigeeControlPlaneAccess_update

Get to know how VCR tests work

modular-magician · 2025-03-10T22:50:57Z

🟢 Tests passed during RECORDING mode:
TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample [Debug log]
TestAccApigeeControlPlaneAccess_update [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.

🟢 All tests passed!

View the build log or the debug log for each test

github-actions · 2025-03-13T09:42:54Z

@roaks3 This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

github-actions · 2025-03-17T09:43:16Z

@GoogleCloudPlatform/terraform-team @roaks3 This PR has been waiting for review for 1 week. Please take a look! Use the label disable-review-reminders to disable these notifications.

roaks3

Overall LGTM, just some minor suggestions

mmv1/products/apigee/ControlPlaneAccess.yaml

roaks3 · 2025-03-18T01:35:09Z

mmv1/products/apigee/ControlPlaneAccess.yaml

+id_format: 'organizations/{{name}}/controlPlaneAccess'
+base_url: ''
+self_link: 'organizations/{{name}}/controlPlaneAccess'
+create_url: 'organizations/{{name}}/controlPlaneAccess'


create_url and update_url can be removed, they default to self_link

Was there an issue with removing these?

Oops this was missed. PTAL

mmv1/templates/terraform/examples/apigee_control_plane_access_basic_test.tf.tmpl

mmv1/third_party/terraform/services/apigee/resource_apigee_control_plane_access_test.go

modular-magician · 2025-03-28T22:17:28Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 6 files changed, 721 insertions(+), 2 deletions(-))
google-beta provider: Diff ( 6 files changed, 721 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 81 insertions(+))

modular-magician · 2025-03-28T22:22:24Z

Tests analytics

Total tests: 57
Passed tests: 18
Skipped tests: 37
Affected tests: 2

Click here to see the affected service packages

apigee

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample

TestAccApigeeControlPlaneAccess_update

Get to know how VCR tests work

modular-magician · 2025-03-28T22:30:22Z

🟢 Tests passed during RECORDING mode:
TestAccApigeeControlPlaneAccess_apigeeControlPlaneAccessBasicTestExample [Debug log]
TestAccApigeeControlPlaneAccess_update [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.

🟢 All tests passed!

View the build log or the debug log for each test

github-actions · 2025-04-02T09:43:24Z

@roaks3 This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

roaks3

LGTM, just the stray comment that might have been lost in the last commit

modular-magician · 2025-04-02T18:54:17Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 6 files changed, 721 insertions(+), 2 deletions(-))
google-beta provider: Diff ( 6 files changed, 721 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 81 insertions(+))

modular-magician · 2025-04-02T18:59:27Z

Tests analytics

Total tests: 57
Passed tests: 20
Skipped tests: 37
Affected tests: 0

Click here to see the affected service packages

apigee

🟢 All tests passed!

View the build log

Co-authored-by: Akshay Pai <[email protected]>

github-actions bot requested a review from roaks3 January 21, 2025 23:39

modular-magician added the service/apigee label Jan 21, 2025

roaks3 reviewed Jan 28, 2025

View reviewed changes

mmv1/products/apigee/ControlPlaneAccess.yaml Outdated Show resolved Hide resolved

mmv1/products/apigee/ControlPlaneAccess.yaml Outdated Show resolved Hide resolved

akspi force-pushed the main branch from 7be7590 to 7d99a0c Compare March 10, 2025 22:25

github-actions bot requested a review from roaks3 March 10, 2025 22:26

roaks3 reviewed Mar 18, 2025

View reviewed changes

akspi force-pushed the main branch from 7d99a0c to 4f44984 Compare March 28, 2025 22:05

github-actions bot requested a review from roaks3 March 28, 2025 22:06

roaks3 reviewed Apr 2, 2025

View reviewed changes

Add ControlPlaneAccess support for Apigee

03d2dd0

akspi force-pushed the main branch from 4f44984 to 03d2dd0 Compare April 2, 2025 18:42

github-actions bot requested a review from roaks3 April 2, 2025 18:43

roaks3 approved these changes Apr 2, 2025

View reviewed changes

roaks3 added this pull request to the merge queue Apr 2, 2025

Merged via the queue into GoogleCloudPlatform:main with commit 208b384 Apr 2, 2025
24 checks passed

Dawid212 pushed a commit to Dawid212/magic-modules that referenced this pull request Apr 9, 2025

Add ControlPlaneAccess support for Apigee (GoogleCloudPlatform#12825)

2a7aab7

Co-authored-by: Akshay Pai <[email protected]>

pandirigoog pushed a commit to pandirigoog/magic-modules that referenced this pull request Apr 14, 2025

Add ControlPlaneAccess support for Apigee (GoogleCloudPlatform#12825)

443e9da

Co-authored-by: Akshay Pai <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ControlPlaneAccess support for Apigee #12825

Add ControlPlaneAccess support for Apigee #12825

akspi commented Jan 21, 2025 •

edited

Loading

github-actions bot commented Jan 21, 2025

modular-magician commented Jan 21, 2025

modular-magician commented Jan 21, 2025

modular-magician commented Jan 22, 2025

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 28, 2025

roaks3 left a comment

github-actions bot commented Feb 11, 2025

github-actions bot commented Feb 25, 2025

github-actions bot commented Mar 7, 2025

modular-magician commented Mar 10, 2025

modular-magician commented Mar 10, 2025

modular-magician commented Mar 10, 2025

github-actions bot commented Mar 13, 2025

github-actions bot commented Mar 17, 2025

roaks3 left a comment

roaks3 Mar 18, 2025

roaks3 Apr 2, 2025

akspi Apr 2, 2025

modular-magician commented Mar 28, 2025

modular-magician commented Mar 28, 2025

modular-magician commented Mar 28, 2025

github-actions bot commented Apr 2, 2025

roaks3 left a comment

modular-magician commented Apr 2, 2025

modular-magician commented Apr 2, 2025

Add ControlPlaneAccess support for Apigee #12825

Add ControlPlaneAccess support for Apigee #12825

Conversation

akspi commented Jan 21, 2025 • edited Loading

github-actions bot commented Jan 21, 2025

modular-magician commented Jan 21, 2025

Diff report

modular-magician commented Jan 21, 2025

Tests analytics

Action taken

modular-magician commented Jan 22, 2025

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 28, 2025

roaks3 left a comment

Choose a reason for hiding this comment

github-actions bot commented Feb 11, 2025

github-actions bot commented Feb 25, 2025

github-actions bot commented Mar 7, 2025

modular-magician commented Mar 10, 2025

Diff report

modular-magician commented Mar 10, 2025

Tests analytics

Action taken

modular-magician commented Mar 10, 2025

github-actions bot commented Mar 13, 2025

github-actions bot commented Mar 17, 2025

roaks3 left a comment

Choose a reason for hiding this comment

roaks3 Mar 18, 2025

Choose a reason for hiding this comment

roaks3 Apr 2, 2025

Choose a reason for hiding this comment

akspi Apr 2, 2025

Choose a reason for hiding this comment

modular-magician commented Mar 28, 2025

Diff report

modular-magician commented Mar 28, 2025

Tests analytics

Action taken

modular-magician commented Mar 28, 2025

github-actions bot commented Apr 2, 2025

roaks3 left a comment

Choose a reason for hiding this comment

modular-magician commented Apr 2, 2025

Diff report

modular-magician commented Apr 2, 2025

Tests analytics

akspi commented Jan 21, 2025 •

edited

Loading