-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'GoogleCloudPlatform:main' into main
- Loading branch information
Showing
118 changed files
with
3,718 additions
and
476 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: ensure-service-team-labels | ||
|
|
||
| permissions: | ||
| issues: write | ||
|
|
||
| on: | ||
| schedule: | ||
| # Runs at 00:00 UTC every day | ||
| - cron: '0 0 * * *' | ||
| workflow_call: | ||
|
|
||
| jobs: | ||
| modify-labels: | ||
| if: github.repository == 'GoogleCloudPlatform/magic-modules' || github.repository == 'hashicorp/terraform-provider-google' | ||
| runs-on: ubuntu-22.04 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| steps: | ||
| - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2 | ||
| with: | ||
| repository: GoogleCloudPlatform/magic-modules | ||
| - name: Set up Go | ||
| uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 | ||
| with: | ||
| go-version: '^1.23.0' | ||
| - name: Build issue-labeler | ||
| run: | | ||
| cd tools/issue-labeler | ||
| go build | ||
| - name: Run issue-labeler | ||
| run: | | ||
| cd tools/issue-labeler | ||
| ./issue-labeler setup-labels ${{ github.repository }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,6 +73,7 @@ type Examples struct { | |
| // - :CUST_ID | ||
| // - :IDENTITY_USER | ||
| // - :CHRONICLE_ID | ||
| // - :VMWAREENGINE_PROJECT | ||
| // This list corresponds to the `get*FromEnv` methods in provider_test.go. | ||
| TestEnvVars map[string]string `yaml:"test_env_vars,omitempty"` | ||
|
|
||
|
|
@@ -215,19 +216,20 @@ func (e *Examples) SetHCLText() { | |
| originalTestEnvVars := e.TestEnvVars | ||
| docTestEnvVars := make(map[string]string) | ||
| docs_defaults := map[string]string{ | ||
| "PROJECT_NAME": "my-project-name", | ||
| "CREDENTIALS": "my/credentials/filename.json", | ||
| "REGION": "us-west1", | ||
| "ORG_ID": "123456789", | ||
| "ORG_DOMAIN": "example.com", | ||
| "ORG_TARGET": "123456789", | ||
| "BILLING_ACCT": "000000-0000000-0000000-000000", | ||
| "MASTER_BILLING_ACCT": "000000-0000000-0000000-000000", | ||
| "SERVICE_ACCT": "[email protected]", | ||
| "CUST_ID": "A01b123xz", | ||
| "IDENTITY_USER": "cloud_identity_user", | ||
| "PAP_DESCRIPTION": "description", | ||
| "CHRONICLE_ID": "00000000-0000-0000-0000-000000000000", | ||
| "PROJECT_NAME": "my-project-name", | ||
| "CREDENTIALS": "my/credentials/filename.json", | ||
| "REGION": "us-west1", | ||
| "ORG_ID": "123456789", | ||
| "ORG_DOMAIN": "example.com", | ||
| "ORG_TARGET": "123456789", | ||
| "BILLING_ACCT": "000000-0000000-0000000-000000", | ||
| "MASTER_BILLING_ACCT": "000000-0000000-0000000-000000", | ||
| "SERVICE_ACCT": "[email protected]", | ||
| "CUST_ID": "A01b123xz", | ||
| "IDENTITY_USER": "cloud_identity_user", | ||
| "PAP_DESCRIPTION": "description", | ||
| "CHRONICLE_ID": "00000000-0000-0000-0000-000000000000", | ||
| "VMWAREENGINE_PROJECT": "my-vmwareengine-project", | ||
| } | ||
|
|
||
| // Apply doc defaults to test_env_vars from YAML | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # Copyright 2024 Google Inc. | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| --- | ||
| name: 'EnvironmentAddonsConfig' | ||
| api_resource_type_kind: AddonsConfig | ||
| description: Enable/Disable add-ons for an Apigee environment. | ||
| references: | ||
| guides: | ||
| 'Enable Analytics Add-On': 'https://cloud.google.com/apigee/docs/api-platform/reference/manage-analytics-add-on' | ||
| api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.environments.addonsConfig/setAddonEnablement' | ||
| docs: | ||
| base_url: '{{env_id}}' | ||
| self_link: '{{env_id}}/addonsConfig' | ||
| create_url: '{{env_id}}/addonsConfig:setAddonEnablement' | ||
| update_url: '{{env_id}}/addonsConfig:setAddonEnablement' | ||
| update_verb: 'POST' | ||
| exclude_delete: true | ||
| timeouts: | ||
| insert_minutes: 5 | ||
| update_minutes: 5 | ||
| async: | ||
| actions: ['create', 'update'] | ||
| type: 'OpAsync' | ||
| operation: | ||
| base_url: '{{op_id}}' | ||
| import_format: | ||
| - '{{env_id}}' | ||
| id_format: '{{env_id}}' | ||
| custom_code: | ||
| custom_import: 'templates/terraform/custom_import/apigee_env_addons.go.tmpl' | ||
| decoder: 'templates/terraform/decoders/apigee_env_addons.go.tmpl' | ||
| examples: | ||
| - name: 'apigee_env_addons_analytics_test' | ||
| primary_resource_id: 'apigee_org_addons' | ||
| test_env_vars: | ||
| org_id: 'ORG_ID' | ||
| billing_account: 'BILLING_ACCT' | ||
| exclude_docs: true | ||
| - name: 'apigee_env_addons_enable_analytics' | ||
| exclude_test: true | ||
| parameters: | ||
| - name: 'envId' | ||
| type: String | ||
| description: | | ||
| The Apigee environment group associated with the Apigee environment, | ||
| in the format `organizations/{{org_name}}/environments/{{env_name}}`. | ||
| url_param_only: true | ||
| required: true | ||
| immutable: true | ||
| properties: | ||
| - name: 'analyticsEnabled' | ||
| type: Boolean | ||
| description: Flag to enable/disable Analytics. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.