Merge branch 'GoogleCloudPlatform:main' into main

Author: anthonyrtong

.ci/gcb-contributor-membership-checker.yml

@@ -42,6 +42,33 @@ jobs:
           if [[ -n "$tmpls" ]]; then
             go run main.go version-guard --file-list $tmpls
           fi
+  unused-template-check:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2
+        with:
+          path: repo
+          fetch-depth: 0
+      - name: Merge base branch
+        if: github.event_name == 'pull_request'
+        id: pull_request
+        run: |
+          cd repo
+          git config user.name "modular-magician"
+          git config user.email "magic-modules@google.com"
+          git fetch origin ${{ github.base_ref }} # Fetch the base branch
+          git merge --no-ff origin/${{ github.base_ref }} # Merge with the base branch
+      - name: Check new product templates are linked
+        id: new_templates
+        run: |
+          cd repo/tools/template-check
+          newtmplfiles=$(git diff --name-only --diff-filter=A origin/${{ github.base_ref }} HEAD -- ../../mmv1 | grep .tmpl | sed 's=^=../../=g')
+          if [ ! -z "$newtmplfiles" ]; then
+            newtmplfiles=${newtmplfiles//$'\n'/,}
+            echo $newtmplfiles
+            go run main.go unused-tmpl --file-list $newtmplfiles
+          fi
   lint-yaml:
     runs-on: ubuntu-22.04
     steps:

.ci/magician/cmd/membership_checker.go

@@ -851,7 +851,7 @@ func (t Type) GetFWType() string {
 	case "ResourceRef":
 		return "String"
 	case "NestedObject":
-		return "Nested"
+		return "Object"
 	case "Array":
 		return "List"
 	case "KeyValuePairs":

.ci/magician/cmd/membership_checker_test.go

@@ -130,6 +130,7 @@ properties:
   - name: configTemplate
     type: NestedObject
     description: ConfigTemplate represents the configuration template for a plugin.
+    default_from_api: true
     properties:
       - name: authConfigTemplate
         type: NestedObject

.github/workflows/unit-test-mmv1.yml

@@ -66,28 +66,33 @@ examples:
       dns_auth_name2: 'dns-auth2'
       dns_auth_subdomain2: 'subdomain2'
       cert_name: 'dns-cert'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_google_managed_certificate_issuance_config'
     primary_resource_id: 'default'
     vars:
       cert_name: 'issuance-config-cert'
       ca_name: 'ca-authority'
       pool_name: 'ca-pool'
       issuance_config_name: 'issuance-config'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_self_managed_certificate'
     primary_resource_id: 'default'
     vars:
       cert_name: 'self-managed-cert'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_self_managed_certificate_regional'
     primary_resource_id: 'default'
     vars:
       cert_name: 'self-managed-cert'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_google_managed_certificate_issuance_config_all_regions'
     primary_resource_id: 'default'
     vars:
       cert_name: 'issuance-config-cert'
       ca_name: 'ca-authority'
       pool_name: 'ca-pool'
       issuance_config_name: 'issuance-config'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_google_managed_certificate_dns_all_regions'
     primary_resource_id: 'default'
     vars:
@@ -96,16 +101,19 @@ examples:
       dns_auth_name2: 'dns-auth2'
       dns_auth_subdomain2: 'subdomain2'
       cert_name: 'dns-cert'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_google_managed_regional_certificate_dns_auth'
     primary_resource_id: 'default'
     vars:
       dns_auth_name: 'dns-auth'
       dns_auth_subdomain: 'subdomain'
       cert_name: 'dns-cert'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
   - name: 'certificate_manager_client_auth_certificate'
     primary_resource_id: 'default'
     vars:
       cert_name: 'client-auth-cert'
+    tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
 parameters:
   - name: 'name'
     type: String