Sync main nov 10 feature branch resource identity (#15673)

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"},

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.

mmv1/api/async.go

@@ -18,6 +18,7 @@ import (
 	"strings"
 
 	"golang.org/x/exp/slices"
+	"gopkg.in/yaml.v3"
 )
 
 // Base class from which other Async classes can inherit.
@@ -109,12 +110,12 @@ type PollAsync struct {
 	TargetOccurrences int `yaml:"target_occurrences,omitempty"`
 }
 
-func (a *Async) UnmarshalYAML(unmarshal func(any) error) error {
+func (a *Async) UnmarshalYAML(value *yaml.Node) error {
 	a.Actions = []string{"create", "delete", "update"}
 	type asyncAlias Async
 	aliasObj := (*asyncAlias)(a)
 
-	err := unmarshal(aliasObj)
+	err := value.Decode(aliasObj)
 	if err != nil {
 		return err
 	}

mmv1/api/compiler.go

@@ -23,8 +23,9 @@ import (
 
 func Compile(yamlPath string, obj interface{}, overrideDir string) {
 	objYaml, err := os.ReadFile(yamlPath)
+
 	if err != nil {
-		log.Fatalf("Cannot open the file: %v", objYaml)
+		log.Fatalf("Cannot open the file: %s", yamlPath)
 	}
 
 	if overrideDir != "" {

mmv1/api/product.go

@@ -24,6 +24,7 @@ import (
 	"github.com/GoogleCloudPlatform/magic-modules/mmv1/api/product"
 	"github.com/GoogleCloudPlatform/magic-modules/mmv1/google"
 	"golang.org/x/exp/slices"
+	"gopkg.in/yaml.v3"
 )
 
 // Represents a product to be managed
@@ -34,6 +35,9 @@ type Product struct {
 	// Example inputs: "Compute", "AccessContextManager"
 	Name string
 
+	// This is the name of the package path relative to mmv1 root repo
+	PackagePath string
+
 	// original value of :name before the provider override happens
 	// same as :name if not overridden in provider
 	ApiName string `yaml:"api_name,omitempty"`
@@ -58,6 +62,9 @@ type Product struct {
 	// base URL. Specific to defining the resource as a CAI asset.
 	CaiBaseUrl string
 
+	// The service name from CAI asset name, e.g. bigtable.googleapis.com.
+	CaiAssetService string `yaml:"cai_asset_service,omitempty"`
+
 	// CaiResourceType of resources that already have an AssetType constant defined in the product.
 	ResourcesWithCaiAssetType map[string]struct{}
 
@@ -77,11 +84,11 @@ type Product struct {
 	Compiler string `yaml:"-"`
 }
 
-func (p *Product) UnmarshalYAML(unmarshal func(any) error) error {
+func (p *Product) UnmarshalYAML(value *yaml.Node) error {
 	type productAlias Product
 	aliasObj := (*productAlias)(p)
 
-	if err := unmarshal(aliasObj); err != nil {
+	if err := value.Decode(aliasObj); err != nil {
 		return err
 	}