Sync feature branch 7.0.0 aug 04 (#14736)

Author: c2thorn

.ci/magician/cmd/templates/vcr/post_replay.tmpl

@@ -31,6 +31,7 @@ None
 {{end}}
 </blockquote>
 </details>
+
 {{ if gt (len .ReplayingResult.FailedTests) 0 -}}
 #### Action taken
 <details>
@@ -52,4 +53,4 @@ None
 {{- end}}
 
 View the [build log](https://storage.cloud.google.com/{{.LogBucket}}/{{.Version}}/refs/heads/{{.Head}}/artifacts/{{.BuildID}}/build-log/replaying_test.log)
-{{- end}}
+{{- end}}

.ci/magician/cmd/vcr_merge_eap.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"magician/exec"
-	"magician/github"
 	"magician/source"
 	"os"
 
@@ -26,11 +25,6 @@ var vcrMergeEapCmd = &cobra.Command{
 		clNumber := args[0]
 		fmt.Println("CL number:", clNumber)
 
-		githubToken, ok := os.LookupEnv("GITHUB_TOKEN_CLASSIC")
-		if !ok {
-			return fmt.Errorf("did not provide GITHUB_TOKEN_CLASSIC environment variable")
-		}
-
 		baseBranch := os.Getenv("BASE_BRANCH")
 		if baseBranch == "" {
 			return fmt.Errorf("environment variable BASE_BRANCH is empty")
@@ -41,12 +35,11 @@ var vcrMergeEapCmd = &cobra.Command{
 			return fmt.Errorf("error creating Runner: %w", err)
 		}
 
-		gh := github.NewClient(githubToken)
-		return execVCRMergeEAP(gh, clNumber, baseBranch, rnr)
+		return execVCRMergeEAP(clNumber, baseBranch, rnr)
 	},
 }
 
-func execVCRMergeEAP(gh GithubClient, clNumber, baseBranch string, runner source.Runner) error {
+func execVCRMergeEAP(clNumber, baseBranch string, runner source.Runner) error {
 	head := "auto-cl-" + clNumber
 	mergeCassettes("gs://ci-vcr-cassettes/private", baseBranch, fmt.Sprintf("refs/heads/%s", head), runner)
 	return nil

.ci/magician/github/membership_data.go

@@ -102,8 +102,8 @@ var (
 		"roaks3": {
 			vacations: []Vacation{
 				{
-					startDate: newDate(2025, 7, 1),
-					endDate:   newDate(2025, 7, 14),
+					startDate: newDate(2025, 8, 1),
+					endDate:   newDate(2025, 8, 11),
 				},
 			},
 		},

docs/content/code-review/review-pr.md

@@ -21,6 +21,7 @@ The following types of PRs may require additional scrutiny and/or multiple revie
 1. Read the PR description to understand the context and ensure the PR either
    * is linked to a GitHub issue or an internal bug
       * if not, check the [issue tracker](https://github.com/hashicorp/terraform-provider-google/issues) to see whether the feature has already been requested and add the issues in the description, if any.
+      * "Fixes {github_issue_link}" is preferred if an external issue is available because it will [auto-close the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue) when the PR is merged. However, there's no need to create an external issue solely for this purpose.
    * establishes clear context itself via title or description.
 2. If the PR adds any new resource, ensure that the resource does not already exist in the [GA provider](https://github.com/hashicorp/terraform-provider-google) or [beta provider](https://github.com/hashicorp/terraform-provider-google-beta)
 1. Read through all the changes in the PR, generated code in the downstreams and the API documentation to ensure that:

docs/content/test/test.md

@@ -451,8 +451,11 @@ If [bootstrapping]({{< ref "#bootstrapping" >}}) doesn't work or isn't an option
 ```go
 import (
   "testing"
-	"github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
-	"github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar"
+
+
+  "github.com/hashicorp/terraform-plugin-testing/helper/resource"
+  "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
+  "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar"
 )
 func TestAccProductResourceName_update(t *testing.T) {
 	t.Parallel()
@@ -464,6 +467,10 @@ func TestAccProductResourceName_update(t *testing.T) {
 	}
   acctest.VcrTest(t, resource.TestCase{
     // ...
+    // Add ExternalProviders so you can use `time_sleep`
+    ExternalProviders: map[string]resource.ExternalProvider{
+      "time": {},
+    },
     Steps: []resource.TestStep{
       {
         testAccProductResourceName_update1(context),

mmv1/api/type.go

@@ -1274,3 +1274,13 @@ func (t Type) GetPropertySchemaPathList(propertyList []string) []string {
 	}
 	return list
 }
+
+func (t Type) IsJsonField() bool {
+	if t.CustomFlatten == "templates/terraform/custom_flatten/json_schema.tmpl" {
+		return true
+	}
+	if t.CustomExpand == "templates/terraform/custom_expand/json_schema.tmpl" || t.CustomExpand == "templates/terraform/custom_expand/json_value.tmpl" {
+		return true
+	}
+	return false
+}

mmv1/products/alloydb/Backup.yaml

@@ -40,6 +40,7 @@ async:
     resource_inside_response: false
 custom_code:
   encoder: 'templates/terraform/encoders/alloydb_backup.tmpl'
+include_in_tgc_next_DO_NOT_USE: true
 examples:
   - name: 'alloydb_backup_basic'
     primary_resource_id: 'default'

mmv1/products/backupdr/BackupPlan.yaml

@@ -45,6 +45,13 @@ examples:
       backup_plan_id: 'backup-plan-disk-test'
     test_env_vars:
       project: :PROJECT_NAME
+  - name: 'backup_dr_backup_plan_for_csql_resource'
+    primary_resource_id: 'my-csql-backup-plan-1'
+    vars:
+      backup_vault_id: 'backup-vault-csql-test'
+      backup_plan_id: 'backup-plan-csql-test'
+    test_env_vars:
+      project: :PROJECT_NAME
 parameters:
   - name: 'location'
     type: String
@@ -96,7 +103,7 @@ properties:
     type: String
     description: |
       The resource type to which the `BackupPlan` will be applied.
-      Examples include, "compute.googleapis.com/Instance", "compute.googleapis.com/Disk", and "storage.googleapis.com/Bucket".
+      Examples include, "compute.googleapis.com/Instance", "compute.googleapis.com/Disk", "sqladmin.googleapis.com/Instance" and "storage.googleapis.com/Bucket".
     required: true
   - name: 'createTime'
     type: String
@@ -236,3 +243,8 @@ properties:
                   description: |
                     The hour of the day (1-24) when the window ends, for example, if the value of end hour of the day is 10, that means the backup window end time is 10:00.
                     The end hour of the day should be greater than the start
+  - name: 'logRetentionDays'
+    type: Integer
+    immutable: true
+    description: |
+      This is only applicable for CloudSql resource. Days for which logs will be stored. This value should be greater than or equal to minimum enforced log retention duration of the backup vault.

mmv1/products/backupdr/BackupVault.yaml

@@ -179,3 +179,12 @@ properties:
       - 'WITHIN_ORGANIZATION'
       - 'UNRESTRICTED'
       - 'WITHIN_ORG_BUT_UNRESTRICTED_FOR_BA'
+  - name: 'backupRetentionInheritance'
+    type: Enum
+    ignore_read: true
+    description: |
+        How a backup's enforced retention end time is inherited. Default value is `INHERIT_VAULT_RETENTION` if not provided during creation.
+    enum_values:
+      - 'BACKUP_RETENTION_INHERITANCE_UNSPECIFIED'
+      - 'INHERIT_VAULT_RETENTION'
+      - 'MATCH_BACKUP_EXPIRE_TIME'

mmv1/products/bigquery/Table.yaml

@@ -638,3 +638,11 @@ virtual_fields:
       View sets the optional parameter "view": Specifies the view that determines which table information is
       returned. By default, basic table information and storage statistics (STORAGE_STATS) are returned.
       Possible values: TABLE_METADATA_VIEW_UNSPECIFIED, BASIC, STORAGE_STATS, FULL
+  - name: 'ignore_auto_generated_schema'
+    type: Boolean
+    description: |
+      If set to true, Terraform will prevent implicitly added columns in schema from showing diff.
+  - name: 'generated_schema_columns'
+    type: String
+    description: |
+      (Output-only) A list of autogenerated schema fields.