migration + formatting - no open PRs (#18035)

Author: shuyama1

mmv1/products/accessapproval/FolderSettings.yaml

@@ -31,28 +31,32 @@ import_format:
   - folders/{{folder_id}}/accessApprovalSettings
 include_in_tgc_next: true
 tgc_tests:
-  - name: 'TestAccAccessApprovalSettings/folder'
+  - name: TestAccAccessApprovalSettings/folder
 custom_code:
   constants: templates/terraform/constants/access_approval.go.tmpl
   pre_create: templates/terraform/update_mask.go.tmpl
   post_create: templates/terraform/post_create/sleep_5_min.go.tmpl
   post_update: templates/terraform/post_create/sleep_5_min.go.tmpl
   custom_delete: templates/terraform/custom_delete/clear_folder_access_approval_settings.go.tmpl
-examples:
+samples:
   - name: folder_access_approval_full
     primary_resource_id: folder_access_approval
     exclude_test: true
-    vars:
-      folder_name: folder-faaf
-    test_env_vars:
-      org_id: ORG_ID
+    steps:
+      - name: folder_access_approval_full
+        resource_id_vars:
+          folder_name: folder-faaf
+        test_env_vars:
+          org_id: ORG_ID
   - name: folder_access_approval_active_key_version
     primary_resource_id: folder_access_approval
     exclude_test: true
-    vars:
-      folder_name: folder-faak
-    test_env_vars:
-      org_id: ORG_ID
+    steps:
+      - name: folder_access_approval_active_key_version
+        resource_id_vars:
+          folder_name: folder-faak
+        test_env_vars:
+          org_id: ORG_ID
 parameters:
   - name: folder_id
     type: String

mmv1/products/accessapproval/OrganizationSettings.yaml

@@ -12,62 +12,66 @@
 # limitations under the License.
 
 ---
-name: 'OrganizationSettings'
+name: OrganizationSettings
 api_resource_type_kind: AccessApprovalSettings
 api_variant_patterns:
-  - 'organizations/{organization}/accessApprovalSettings'
+  - organizations/{organization}/accessApprovalSettings
 description: |
   Access Approval enables you to require your explicit approval whenever Google support and engineering need to access your customer content.
 references:
   guides:
-  api: 'https://cloud.google.com/access-approval/docs/reference/rest/v1/organizations'
+  api: https://cloud.google.com/access-approval/docs/reference/rest/v1/organizations
 docs:
-base_url: 'organizations/{{organization_id}}/accessApprovalSettings'
-self_link: 'organizations/{{organization_id}}/accessApprovalSettings'
+base_url: organizations/{{organization_id}}/accessApprovalSettings
+self_link: organizations/{{organization_id}}/accessApprovalSettings
 update_mask: true
-create_verb: 'PATCH'
-update_verb: 'PATCH'
-legacy_name: 'google_organization_access_approval_settings'
+create_verb: PATCH
+update_verb: PATCH
+legacy_name: google_organization_access_approval_settings
 import_format:
-  - 'organizations/{{organization_id}}/accessApprovalSettings'
+  - organizations/{{organization_id}}/accessApprovalSettings
 timeouts:
   insert_minutes: 20
   update_minutes: 20
   delete_minutes: 20
 include_in_tgc_next: true
 tgc_tests:
-  - name: 'TestAccAccessApprovalSettings/organization'
+  - name: TestAccAccessApprovalSettings/organization
 custom_code:
-  pre_create: 'templates/terraform/update_mask.go.tmpl'
-  custom_delete: 'templates/terraform/custom_delete/clear_organization_access_approval_settings.go.tmpl'
-  post_create: 'templates/terraform/post_create/sleep_5_min.go.tmpl'
-  post_update: 'templates/terraform/post_create/sleep_5_min.go.tmpl'
-examples:
-  - name: 'organization_access_approval_full'
-    primary_resource_id: 'organization_access_approval'
-    test_env_vars:
-      org_id: 'ORG_ID'
+  pre_create: templates/terraform/update_mask.go.tmpl
+  post_create: templates/terraform/post_create/sleep_5_min.go.tmpl
+  post_update: templates/terraform/post_create/sleep_5_min.go.tmpl
+  custom_delete: templates/terraform/custom_delete/clear_organization_access_approval_settings.go.tmpl
+samples:
+  - name: organization_access_approval_full
+    primary_resource_id: organization_access_approval
     exclude_test: true
-  - name: 'organization_access_approval_active_key_version'
-    primary_resource_id: 'organization_access_approval'
-    test_env_vars:
-      org_id: 'ORG_ID'
+    steps:
+      - name: organization_access_approval_full
+        test_env_vars:
+          org_id: ORG_ID
+  - name: organization_access_approval_active_key_version
+    primary_resource_id: organization_access_approval
     exclude_test: true
+    steps:
+      - name: organization_access_approval_active_key_version
+        test_env_vars:
+          org_id: ORG_ID
 parameters:
-  - name: 'organization_id'
+  - name: organization_id
     type: String
     description: |
       ID of the organization of the access approval settings.
     url_param_only: true
     required: true
     immutable: true
 properties:
-  - name: 'name'
+  - name: name
     type: String
     description: |
       The resource name of the settings. Format is "organizations/{organization_id}/accessApprovalSettings"
     output: true
-  - name: 'notificationEmails'
+  - name: notificationEmails
     type: Array
     description: |
       A list of email addresses to which notifications relating to approval requests should be sent.
@@ -78,7 +82,7 @@ properties:
     item_type:
       type: String
     max_size: 50
-  - name: 'enrolledServices'
+  - name: enrolledServices
     type: Array
     description: |
       A list of Google Cloud Services for which the given resource has Access Approval enrolled.
@@ -92,7 +96,7 @@ properties:
     item_type:
       type: NestedObject
       properties:
-        - name: 'cloudProduct'
+        - name: cloudProduct
           type: String
           description: |
             The product for which Access Approval will be enrolled. Allowed values are listed (case-sensitive):
@@ -107,29 +111,29 @@ properties:
               pubsub.googleapis.com
               storage.googleapis.com
           required: true
-        - name: 'enrollmentLevel'
+        - name: enrollmentLevel
           type: Enum
           description: |
             The enrollment level of the service.
-          default_value: "BLOCK_ALL"
+          default_value: BLOCK_ALL
           enum_values:
-            - 'BLOCK_ALL'
-  - name: 'enrolledAncestor'
+            - BLOCK_ALL
+  - name: enrolledAncestor
     type: Boolean
     description: |
       This field will always be unset for the organization since organizations do not have ancestors.
     output: true
-  - name: 'activeKeyVersion'
+  - name: activeKeyVersion
     type: String
     description: |
       The asymmetric crypto key version to use for signing approval requests.
       Empty active_key_version indicates that a Google-managed key should be used for signing.
-  - name: 'ancestorHasActiveKeyVersion'
+  - name: ancestorHasActiveKeyVersion
     type: Boolean
     description: |
       This field will always be unset for the organization since organizations do not have ancestors.
     output: true
-  - name: 'invalidKeyVersion'
+  - name: invalidKeyVersion
     type: Boolean
     description: |
       If the field is true, that indicates that there is some configuration issue with the active_key_version

mmv1/products/accessapproval/ProjectSettings.yaml

@@ -12,64 +12,68 @@
 # limitations under the License.
 
 ---
-name: 'ProjectSettings'
+name: ProjectSettings
 api_resource_type_kind: AccessApprovalSettings
 api_variant_patterns:
-  - 'projects/{project}/accessApprovalSettings'
-legacy_name: 'google_project_access_approval_settings'
+  - projects/{project}/accessApprovalSettings
 description: |
   Access Approval enables you to require your explicit approval whenever Google support and engineering need to access your customer content.
 references:
   guides:
-  api: 'https://cloud.google.com/access-approval/docs/reference/rest/v1/projects'
+  api: https://cloud.google.com/access-approval/docs/reference/rest/v1/projects
 docs:
-base_url: 'projects/{{project_id}}/accessApprovalSettings'
-self_link: 'projects/{{project_id}}/accessApprovalSettings'
-create_verb: 'PATCH'
-update_verb: 'PATCH'
+base_url: projects/{{project_id}}/accessApprovalSettings
+self_link: projects/{{project_id}}/accessApprovalSettings
 update_mask: true
+create_verb: PATCH
+update_verb: PATCH
+legacy_name: google_project_access_approval_settings
 import_format:
-  - 'projects/{{project_id}}/accessApprovalSettings'
+  - projects/{{project_id}}/accessApprovalSettings
 timeouts:
   insert_minutes: 20
   update_minutes: 20
   delete_minutes: 20
 include_in_tgc_next: true
 tgc_tests:
-  - name: 'TestAccAccessApprovalSettings/project'
+  - name: TestAccAccessApprovalSettings/project
 custom_code:
-  pre_create: 'templates/terraform/update_mask.go.tmpl'
-  custom_delete: 'templates/terraform/custom_delete/clear_project_access_approval_settings.go.tmpl'
-  post_create: 'templates/terraform/post_create/sleep_5_min.go.tmpl'
-  post_update: 'templates/terraform/post_create/sleep_5_min.go.tmpl'
-examples:
-  - name: 'project_access_approval_full'
-    primary_resource_id: 'project_access_approval'
-    test_env_vars:
-      project: 'PROJECT_NAME'
-      org_id: 'ORG_ID'
+  pre_create: templates/terraform/update_mask.go.tmpl
+  post_create: templates/terraform/post_create/sleep_5_min.go.tmpl
+  post_update: templates/terraform/post_create/sleep_5_min.go.tmpl
+  custom_delete: templates/terraform/custom_delete/clear_project_access_approval_settings.go.tmpl
+samples:
+  - name: project_access_approval_full
+    primary_resource_id: project_access_approval
     exclude_test: true
-  - name: 'project_access_approval_active_key_version'
-    primary_resource_id: 'project_access_approval'
-    test_env_vars:
-      project: 'PROJECT_NAME'
-      org_id: 'ORG_ID'
+    steps:
+      - name: project_access_approval_full
+        test_env_vars:
+          project: PROJECT_NAME
+          org_id: ORG_ID
+  - name: project_access_approval_active_key_version
+    primary_resource_id: project_access_approval
     exclude_test: true
+    steps:
+      - name: project_access_approval_active_key_version
+        test_env_vars:
+          project: PROJECT_NAME
+          org_id: ORG_ID
 parameters:
-  - name: 'project_id'
+  - name: project_id
     type: String
     description: |
       ID of the project of the access approval settings.
     url_param_only: true
     required: true
     immutable: true
 properties:
-  - name: 'name'
+  - name: name
     type: String
     description: |
       The resource name of the settings. Format is "projects/{project_id}/accessApprovalSettings"
     output: true
-  - name: 'notificationEmails'
+  - name: notificationEmails
     type: Array
     description: |
       A list of email addresses to which notifications relating to approval requests should be sent.
@@ -80,7 +84,7 @@ properties:
     item_type:
       type: String
     max_size: 50
-  - name: 'enrolledServices'
+  - name: enrolledServices
     type: Array
     description: |
       A list of Google Cloud Services for which the given resource has Access Approval enrolled.
@@ -94,7 +98,7 @@ properties:
     item_type:
       type: NestedObject
       properties:
-        - name: 'cloudProduct'
+        - name: cloudProduct
           type: String
           description: |
             The product for which Access Approval will be enrolled. Allowed values are listed (case-sensitive):
@@ -109,38 +113,38 @@ properties:
               pubsub.googleapis.com
               storage.googleapis.com
           required: true
-        - name: 'enrollmentLevel'
+        - name: enrollmentLevel
           type: Enum
           description: |
             The enrollment level of the service.
-          default_value: "BLOCK_ALL"
+          default_value: BLOCK_ALL
           enum_values:
-            - 'BLOCK_ALL'
-  - name: 'enrolledAncestor'
+            - BLOCK_ALL
+  - name: enrolledAncestor
     type: Boolean
     description: |
       If the field is true, that indicates that at least one service is enrolled for Access Approval in one or more ancestors of the Project.
     output: true
-  - name: 'activeKeyVersion'
+  - name: activeKeyVersion
     type: String
     description: |
       The asymmetric crypto key version to use for signing approval requests.
       Empty active_key_version indicates that a Google-managed key should be used for signing.
       This property will be ignored if set by an ancestor of the resource, and new non-empty values may not be set.
-  - name: 'ancestorHasActiveKeyVersion'
+  - name: ancestorHasActiveKeyVersion
     type: Boolean
     description: |
       If the field is true, that indicates that an ancestor of this Project has set active_key_version.
     output: true
-  - name: 'invalidKeyVersion'
+  - name: invalidKeyVersion
     type: Boolean
     description: |
       If the field is true, that indicates that there is some configuration issue with the active_key_version
       configured on this Project (e.g. it doesn't exist or the Access Approval service account doesn't have the
       correct permissions on it, etc.) This key version is not necessarily the effective key version at this level,
       as key versions are inherited top-down.
     output: true
-  - name: 'project'
+  - name: project
     type: String
     description: |
       Project id.

mmv1/products/accessapproval/product.yaml

@@ -12,10 +12,10 @@
 # limitations under the License.
 
 ---
-name: 'AccessApproval'
-display_name: 'Access Approval'
-versions:
-  - name: 'ga'
-    base_url: 'https://accessapproval.googleapis.com/v1/'
+name: AccessApproval
+display_name: Access Approval
 scopes:
-  - 'https://www.googleapis.com/auth/cloud-platform'
+  - https://www.googleapis.com/auth/cloud-platform
+versions:
+  - name: ga
+    base_url: https://accessapproval.googleapis.com/v1/