Merge branch 'main' into renew-close-ephemeral-service-account-key

Author: BBBmau

.ci/infra/terraform/README.md

@@ -74,3 +74,5 @@ Quotas that will need to be adjusted to support all tests:
 - compute.googleapis.com/n2_cpus (us-central1) to 36+
 - VMware Engine standard 72 vCPUs nodes per region - southamerica-east1 to 21
 - logging.googleapis.com/log_buckets_count to 200
+- "Reasoning engine write requests per minute" for us-central1 to 20+
+- aiplatform.googleapis.com/in_use_customer_managed_encryption_keys to 5+

.ci/infra/terraform/main.tf

@@ -235,6 +235,7 @@ module "project-services" {
     "binaryauthorization.googleapis.com",
     "blockchainnodeengine.googleapis.com",
     "certificatemanager.googleapis.com",
+    "ces.googleapis.com",
     "chronicle.googleapis.com",
     "cloudaicompanion.googleapis.com",
     "cloudapis.googleapis.com",

.ci/magician/cmd/collect_nightly_test_status.go

@@ -42,6 +42,7 @@ type TestInfo struct {
 	Name            string    `json:"name"`
 	Status          string    `json:"status"`
 	Service         string    `json:"service"`
+	Resource        string    `json:"resource"`
 	ErrorMessage    string    `json:"error_message"`
 	LogLink         string    `json:"log_link"`
 	ProviderVersion string    `json:"provider_version"`
@@ -187,6 +188,7 @@ func createTestReport(pVersion provider.Version, tc TeamcityClient, gcs Cloudsto
 				Name:            testResult.Name,
 				Status:          testResult.Status,
 				Service:         serviceName,
+				Resource:        convertTestNameToResource(testResult.Name),
 				ErrorMessage:    errorMessage,
 				LogLink:         logLink,
 				ProviderVersion: strings.ToUpper(pVersion.String()),

.ci/magician/cmd/create_test_failure_ticket.go

@@ -200,7 +200,7 @@ func lastNDaysTestFailureMap(pVersion provider.Version, n int, now time.Time, gc
 				if _, ok := testFailuresToday[testName]; !ok {
 					testFailuresToday[testName] = &testFailure{
 						TestName:          testName,
-						AffectedResource:  convertTestNameToResource(testName),
+						AffectedResource:  testInfo.Resource,
 						ErrorMessageLinks: map[provider.Version]string{provider.GA: "", provider.Beta: ""},
 						DebugLogLinks:     map[provider.Version]string{provider.GA: "", provider.Beta: ""},
 						FailureRates:      map[provider.Version]string{provider.GA: "N/A", provider.Beta: "N/A"},

.ci/magician/cmd/test_terraform_vcr.go

@@ -450,65 +450,16 @@ func modifiedPackages(changedFiles []string, version provider.Version) (map[stri
 	return services, runFullVCR
 }
 
-func allSubFolders(root string) (map[string]struct{}, error) {
-	subfolders := make(map[string]struct{})
-	entries, err := os.ReadDir(root)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read directory '%s': %w", root, err)
-	}
-
-	for _, entry := range entries {
-		if entry.IsDir() {
-			subfolders[entry.Name()] = struct{}{}
-		}
-	}
-	return subfolders, nil
-}
-
 func runReplaying(runFullVCR bool, version provider.Version, services map[string]struct{}, vt *vcr.Tester) (vcr.Result, []string, error) {
 	result := vcr.Result{}
 	var testDirs []string
 	var replayingErr error
 	if runFullVCR {
 		fmt.Println("runReplaying: full VCR tests")
-		// result, replayingErr = vt.Run(vcr.RunOptions{
-		// 	Mode:    vcr.Replaying,
-		// 	Version: version,
-		// })
-
-		// temporary workaround
-		serviceRoot := filepath.Join(vt.GetRepoPath(version), version.ProviderName(), "services")
-		allServies, err := allSubFolders(serviceRoot)
-		if err != nil {
-			return result, testDirs, err
-		}
-
-		var gkePath string
-		var otherPaths []string
-		for service := range allServies {
-			servicePath := "./" + filepath.Join(version.ProviderName(), "services", service)
-			if service == "container" {
-				gkePath = servicePath
-				continue
-			}
-			otherPaths = append(otherPaths, servicePath)
-		}
 		result, replayingErr = vt.Run(vcr.RunOptions{
-			Mode:     vcr.Replaying,
-			Version:  version,
-			TestDirs: otherPaths,
-		})
-		// run gke replaying tests separately
-		gkeResult, gkeReplayingErr := vt.Run(vcr.RunOptions{
-			Mode:     vcr.Replaying,
-			Version:  version,
-			TestDirs: []string{gkePath},
+			Mode:    vcr.Replaying,
+			Version: version,
 		})
-		replayingErr = errors.Join(replayingErr, gkeReplayingErr)
-		result.PassedTests = append(result.PassedTests, gkeResult.PassedTests...)
-		result.SkippedTests = append(result.SkippedTests, gkeResult.SkippedTests...)
-		result.FailedTests = append(result.FailedTests, gkeResult.FailedTests...)
-		result.Panics = append(result.Panics, gkeResult.Panics...)
 	} else if len(services) > 0 {
 		fmt.Printf("runReplaying: %d specific services: %v\n", len(services), services)
 		for service := range services {

.ci/magician/github/membership_data.go

@@ -109,6 +109,10 @@ var (
 					startDate: newDate(2025, 2, 25),
 					endDate:   newDate(2025, 3, 10),
 				},
+				{
+					startDate: newDate(2025, 11, 11),
+					endDate:   newDate(2025, 11, 24),
+				},
 			},
 		},
 		"roaks3": {

.ci/magician/vcr/tester.go

@@ -140,10 +140,6 @@ func (vt *Tester) SetRepoPath(version provider.Version, repoPath string) {
 	vt.repoPaths[version] = repoPath
 }
 
-func (vt *Tester) GetRepoPath(version provider.Version) string {
-	return vt.repoPaths[version]
-}
-
 // Fetch the cassettes for the current version if not already fetched.
 // Should be run from the base dir.
 func (vt *Tester) FetchCassettes(version provider.Version, baseBranch, head string) error {

docs/content/convert/add-new-resource-tgc.md

@@ -232,7 +232,7 @@ export WRITE_FILES=true
 To run the unit tests locally, run the following from the root of the `terraform-google-conversion` repository:
 
 ```
-make test
+make test-local
 ```
 
 #### Run integration tests

docs/content/develop/set-up-dev-environment.md

@@ -34,10 +34,6 @@ development environment.
    # Add Go binaries to PATH
    export PATH=$PATH:$(go env GOPATH)/bin
    ```
-1. Install goimports
-   ```bash
-   go install golang.org/x/tools/cmd/goimports@latest
-   ```
 1. [Install terraform](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli)
 1. Clone the `magic-modules` repository
    ```bash
@@ -57,8 +53,6 @@ development environment.
    ```
    Check for go in path...
       found!
-   Check for goimports in path...
-      found!
    Check for git in path...
       found!
    Check for terraform in path...

docs/content/reference/metadata.md

@@ -31,6 +31,10 @@ The version of the API used for this resource e.g., "v2".
 
 The API "resource type kind" used for this resource e.g., "Function".
 
+### `cai_asset_name_format`
+
+The custom CAI asset name format for this resource is typically specified (e.g., //cloudsql.googleapis.com/projects/{{project}}/instances/{{name}}). If this format is not provided, the Terraform resource ID format is used instead.
+
 ### `api_variant_patterns`
 
 The API URL patterns used by this resource that represent variants e.g., "folders/{folder}/feeds/{feed}". Each pattern must match the value defined in the API exactly. The use of `api_variant_patterns` is only meaningful when the resource type has multiple parent types available.