Merge branch 'GoogleCloudPlatform:main' into deletion-protection-memcache-new

Author: rajeshgupthar

.ci/magician/cmd/delete_branches_test.go

@@ -1,32 +1,43 @@
 package cmd
 
 import (
-	"magician/exec"
-	"magician/github"
-	"os"
 	"testing"
 )
 
 func TestFetchPRNumber(t *testing.T) {
-	rnr, err := exec.NewRunner()
-	if err != nil {
-		t.Errorf("error creating Runner: %s", err)
-	}
-
-	githubToken, ok := os.LookupEnv("GITHUB_TOKEN_CLASSIC")
-	if !ok {
-		t.Errorf("did not provide GITHUB_TOKEN_CLASSIC environment variable")
+	mr := NewMockRunner()
+	gh := &mockGithub{
+		calledMethods: make(map[string][][]any),
+		commitMessage: "Add `additional_group_keys` attribute to `google_cloud_identity_group` resource (#9217) (#6504)\n\n* Add `additional_group_keys` attribute to `google_cloud_identity_group` resource\n\n* Update acceptance test to check for attribute\n\n* Fix test check\n\n* Add `output: true` to nested properties in output field\n[upstream:49d3741f9d4d810a0a4768363bb8498afa21c688]\n\nSigned-off-by: Modular Magician <[email protected]>",
 	}
 
-	gh := github.NewClient(githubToken)
-
-	prNumber, err := fetchPRNumber("8c6e61bb62d52c950008340deafc1e2a2041898a", "main", rnr, gh)
-
+	// Call function with mocks
+	prNumber, err := fetchPRNumber("8c6e61bb62d52c950008340deafc1e2a2041898a", "main", mr, gh)
 	if err != nil {
 		t.Errorf("error fetching PR number: %s", err)
 	}
 
 	if prNumber != "6504" {
 		t.Errorf("PR number is %s, expected 6504", prNumber)
 	}
+
+	// Verify GitHub API was called
+	if calls, ok := gh.calledMethods["GetCommitMessage"]; !ok || len(calls) == 0 {
+		t.Errorf("Expected GetCommitMessage to be called")
+	} else {
+		args := calls[0]
+		if len(args) != 3 {
+			t.Errorf("Expected GetCommitMessage to be called with 3 arguments, got %d", len(args))
+		} else {
+			if args[0] != "hashicorp" {
+				t.Errorf("Expected owner to be 'hashicorp', got '%s'", args[0])
+			}
+			if args[1] != "terraform-provider-google-beta" {
+				t.Errorf("Expected repo to be 'terraform-provider-google-beta', got '%s'", args[1])
+			}
+			if args[2] != "8c6e61bb62d52c950008340deafc1e2a2041898a" {
+				t.Errorf("Expected SHA to be '8c6e61bb62d52c950008340deafc1e2a2041898a', got '%s'", args[2])
+			}
+		}
+	}
 }

.ci/magician/cmd/mock_github_test.go

@@ -29,6 +29,7 @@ type mockGithub struct {
 	pullRequestComments []github.PullRequestComment
 	teamMembers         map[string][]github.User
 	calledMethods       map[string][][]any
+	commitMessage       string
 }
 
 func (m *mockGithub) GetPullRequest(prNumber string) (github.PullRequest, error) {
@@ -63,7 +64,7 @@ func (m *mockGithub) GetPullRequestComments(prNumber string) ([]github.PullReque
 
 func (m *mockGithub) GetCommitMessage(owner, repo, sha string) (string, error) {
 	m.calledMethods["GetCommitMessage"] = append(m.calledMethods["GetCommitMessage"], []any{owner, repo, sha})
-	return "commit message", nil
+	return m.commitMessage, nil
 }
 
 func (m *mockGithub) GetTeamMembers(organization, team string) ([]github.User, error) {

.ci/magician/github/set.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	utils "magician/utility"
 	"strings"
+	"time"
 )
 
 func (gh *Client) PostBuildStatus(prNumber, title, state, targetURL, commitSha string) error {
@@ -165,7 +166,10 @@ func (gh *Client) MergePullRequest(owner, repo, prNumber, commitSha string) erro
 		// Check if the error is "Merge already in progress" (405)
 		if strings.Contains(err.Error(), "Merge already in progress") {
 			fmt.Printf("Pull request %s is already being merged\n", prNumber)
-			return nil
+			// This status does not indicate that the Pull Request was merged
+			// Try again after 20s
+			time.Sleep(20 * time.Second)
+			return gh.MergePullRequest(owner, repo, prNumber, commitSha)
 		}
 		// Check if the PR is already merged (returns 405 Pull Request is not mergeable)
 		if strings.Contains(err.Error(), "Pull Request is not mergeable") {

.ci/magician/utility/utils.go

@@ -62,6 +62,7 @@ func makeHTTPRequest(url, method, credentials string, body any) (*http.Response,
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", credentials))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "application/json")
+
 	fmt.Println("")
 	fmt.Println("request url: ", url)
 	fmt.Println("request body: ", string(jsonBody))
@@ -79,6 +80,7 @@ func makeHTTPRequest(url, method, credentials string, body any) (*http.Response,
 	}
 
 	fmt.Println("response status-code: ", resp.StatusCode)
+	fmt.Println("response body: ", string(respBodyBytes))
 	fmt.Println("")
 
 	return resp, respBodyBytes, nil

mmv1/products/alloydb/Instance.yaml

@@ -363,6 +363,7 @@ properties:
                 The network attachment must be in the same region as the instance.
   - name: 'networkConfig'
     type: NestedObject
+    default_from_api: true
     description: |
       Instance level network configuration.
     properties:

mmv1/products/apigee/Organization.yaml

@@ -18,6 +18,7 @@ description: |
 references:
   guides:
     'Creating an API organization': 'https://cloud.google.com/apigee/docs/api-platform/get-started/create-org'
+    'Setting a custom endpoint (required for data residency)': 'https://registry.terraform.io/providers/hashicorp/google/latest/docs/guides/provider_reference#advanced-settings-configuration'
   api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations'
 docs:
 base_url: 'organizations'
@@ -75,6 +76,20 @@ examples:
     exclude_docs: true
     # Resource creation race
     skip_vcr: true
+  - name: 'apigee_organization_cloud_basic_data_residency'
+    exclude_test: true
+  # This is a more verbose version of the above that creates all
+  # the resources needed for the acceptance test.
+  - name: 'apigee_organization_cloud_basic_data_residency_test'
+    primary_resource_id: 'org'
+    test_env_vars:
+      org_id: 'ORG_ID'
+      billing_account: 'BILLING_ACCT'
+    ignore_read_extra:
+      - 'properties'
+    exclude_docs: true
+    # Resource creation race
+    skip_vcr: true
   - name: 'apigee_organization_cloud_full'
     exclude_test: true
   # This is a more verbose version of the above that creates all

mmv1/products/apigee/SecurityProfileV2.yaml

@@ -0,0 +1,101 @@
+# 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: 'SecurityProfileV2'
+description: |
+  Security profile for risk assessment version 2 in Apigee.
+references:
+  guides:
+    'Creating a security profile': 'https://cloud.google.com/apigee/docs/api-security/security-scores#security-profiles-v2'
+  api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.securityProfilesV2/create'
+docs:
+base_url: '{{org_id}}/securityProfilesV2'
+self_link: '{{org_id}}/securityProfilesV2/{{profile_id}}'
+create_url: '{{org_id}}/securityProfilesV2?security_profile_v2_id={{profile_id}}'
+update_verb: 'PATCH'
+update_mask: true
+import_format:
+  - '{{org_id}}/securityProfilesV2/{{profile_id}}'
+  - '{{org_id}}/{{profile_id}}'
+custom_code:
+  custom_import: "templates/terraform/custom_import/apigee_security_profile_v2.go.tmpl"
+examples:
+  - name: 'apigee_security_profile_v2_basic'
+    vars:
+      security_profile_id: "my-profile"
+    exclude_test: true
+  - name: 'apigee_security_profile_v2_basic_test'
+    primary_resource_id: 'security_profile_v2'
+    test_env_vars:
+      org_id: 'ORG_ID'
+      billing_account: 'BILLING_ACCT'
+    exclude_docs: true
+    skip_vcr: true
+    external_providers: ["time"]
+parameters:
+  - name: 'orgId'
+    type: String
+    description: |
+      The Apigee Organization associated with the Apigee Security Profile V2,
+      in the format `organizations/{{org_name}}`.
+    url_param_only: true
+    required: true
+    immutable: true
+  - name: 'profileId'
+    type: String
+    description: |
+      Resource ID of the security profile.
+    required: true
+    immutable: true
+    url_param_only: true
+properties:
+  - name: 'name'
+    type: String
+    description: |
+      Name of the security profile v2 resource,
+      in the format `organizations/{{org_name}}/securityProfilesV2/{{profile_id}}`.
+    output: true
+  - name: 'description'
+    type: String
+    description: |
+      Description of the security profile.
+  - name: 'profileAssessmentConfigs'
+    type: Map
+    description: |
+      A map of the assessment name and the assessment config.
+    required: true
+    key_name: 'assessment'
+    value_type:
+      name: profileAssessmentConfig
+      type: NestedObject
+      properties:
+        - name: 'weight'
+          type: Enum
+          description: |
+            The weight of the assessment.
+          required: true
+          enum_values:
+            - 'MINOR'
+            - 'MODERATE'
+            - 'MAJOR'
+  - name: 'createTime'
+    type: String
+    description: |
+      The timestamp at which this profile was created.
+    output: true
+  - name: 'updateTime'
+    type: String
+    description: |
+      The timestamp at which this profile was most recently updated.
+    output: true

mmv1/products/beyondcorp/Application.yaml

@@ -37,6 +37,12 @@ examples:
     vars:
       security_gateway_name: default
       application_name: google
+  - name: beyondcorp_security_gateway_application_vpc
+    primary_resource_id: example
+    primary_resource_name: 'fmt.Sprintf("default%s", context["random_suffix"]), fmt.Sprintf("google%s", context["random_suffix"])'
+    vars:
+      security_gateway_name: default
+      application_name: my-vm-service
 autogen_async: true
 async:
   operation:
@@ -109,6 +115,32 @@ properties:
           description: Optional. Ports of the application.
           item_type:
             type: Integer
+  - name: upstreams
+    type: Array
+    description: Optional. List of which upstream resource(s) to forward traffic to.
+    item_type:
+      type: NestedObject
+      properties:
+        - name: egressPolicy
+          type: NestedObject
+          description: Optional. Routing policy information.
+          properties:
+            - name: regions
+              type: Array
+              description: Required. List of regions where the application sends traffic to.
+              required: true
+              item_type:
+                type: String
+        - name: network
+          type: NestedObject
+          description: Network to forward traffic to.
+          properties:
+            - name: name
+              type: string
+              description: |-
+                Required. Network name is of the format:
+                `projects/{project}/global/networks/{network}`
+              required: true
   - name: name
     type: String
     description: Identifier. Name of the resource.

mmv1/products/bigtable/LogicalView.yaml

@@ -0,0 +1,73 @@
+# Copyright 2025 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: 'LogicalView'
+kind: 'bigtable#logicalView'
+description: |
+  A logical view object that can be referenced in SQL queries.
+references:
+  guides:
+  api: 'https://cloud.google.com/bigtable/docs/reference/admin/rest/v2/projects.instances.logicalViews'
+docs:
+id_format: 'projects/{{project}}/instances/{{instance}}/logicalViews/{{logical_view_id}}'
+base_url: 'projects/{{project}}/instances/{{instance}}/logicalViews?logicalViewId={{logical_view_id}}'
+self_link: 'projects/{{project}}/instances/{{instance}}/logicalViews/{{logical_view_id}}'
+create_url: 'projects/{{project}}/instances/{{instance}}/logicalViews?logicalViewId={{logical_view_id}}'
+update_url: 'projects/{{project}}/instances/{{instance}}/logicalViews/{{logical_view_id}}'
+update_verb: 'PATCH'
+update_mask: true
+delete_url: 'projects/{{project}}/instances/{{instance}}/logicalViews/{{logical_view_id}}'
+import_format:
+  - 'projects/{{project}}/instances/{{instance}}/logicalViews/{{logical_view_id}}'
+timeouts:
+  insert_minutes: 120
+  update_minutes: 20
+  delete_minutes: 20
+exclude_sweeper: true
+examples:
+  - name: 'bigtable_logical_view'
+    primary_resource_id: 'logical_view'
+    vars:
+      instance_name: 'bt-instance'
+      table_name: 'bt-table'
+      logical_view_name: 'bt-logical-view'
+    # bigtable instance does not use the shared HTTP client, this test creates an instance
+    skip_vcr: true
+parameters:
+  - name: 'logicalViewId'
+    type: String
+    description:
+      'The unique name of the logical view in the form
+      `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.'
+    url_param_only: true
+    required: true
+    immutable: true
+  - name: 'instance'
+    type: String
+    description: 'The name of the instance to create the logical view within.'
+    url_param_only: true
+    immutable: true
+    diff_suppress_func: 'tpgresource.CompareResourceNames'
+properties:
+  - name: 'name'
+    type: String
+    description:
+      'The unique name of the requested logical view. Values are of the form
+      `projects/<project>/instances/<instance>/logicalViews/<logicalViewId>`.'
+    output: true
+  - name: 'query'
+    type: String
+    description:
+      'The logical view''s select query.'
+    required: true