fix import documentation for string separated values (GoogleCloudPlat…

…form#12144)
akshat-jindal-nit · Nov 18, 2024 · 5e65019 · 5e65019
1 parent 55001d4
commit 5e65019
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 1 deletion.
diff --git a/mmv1/products/activedirectory/Domain.yaml b/mmv1/products/activedirectory/Domain.yaml
@@ -29,6 +29,7 @@ update_mask: true
  # equivalent to {{name}}, but makes sweepers work
 delete_url: 'projects/{{project}}/locations/global/domains/{{domain_name}}'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 60

diff --git a/mmv1/products/bigquerydatatransfer/Config.yaml b/mmv1/products/bigquerydatatransfer/Config.yaml
@@ -28,6 +28,7 @@ self_link: '{{name}}'
 update_url: '{{name}}?serviceAccountName={{service_account_name}}'
 update_verb: 'PATCH'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/integrations/AuthConfig.yaml b/mmv1/products/integrations/AuthConfig.yaml
@@ -27,6 +27,7 @@ self_link: '{{name}}'
 update_verb: 'PATCH'
 mutex: '{{name}}'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/monitoring/AlertPolicy.yaml b/mmv1/products/monitoring/AlertPolicy.yaml
@@ -29,6 +29,7 @@ update_verb: 'PATCH'
 update_mask: true
 mutex: 'alertPolicy/{{project}}'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/monitoring/Group.yaml b/mmv1/products/monitoring/Group.yaml
@@ -28,6 +28,7 @@ base_url: 'v3/projects/{{project}}/groups'
 self_link: 'v3/{{name}}'
 mutex: 'stackdriver/groups/{{project}}'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/monitoring/MetricDescriptor.yaml b/mmv1/products/monitoring/MetricDescriptor.yaml
@@ -28,6 +28,7 @@ self_link: 'v3/{{name}}'
 update_url: 'v3/projects/{{project}}/metricDescriptors'
 update_verb: 'POST'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/monitoring/Service.yaml b/mmv1/products/monitoring/Service.yaml
@@ -33,6 +33,7 @@ create_url: 'v3/projects/{{project}}/services?serviceId={{service_id}}'
 update_verb: 'PATCH'
 update_mask: true
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/monitoring/Slo.yaml b/mmv1/products/monitoring/Slo.yaml
@@ -37,6 +37,7 @@ update_verb: 'PATCH'
 update_mask: true
 mutex: 'monitoring/project/{{project}}/service/{{service}}'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/monitoring/UptimeCheckConfig.yaml b/mmv1/products/monitoring/UptimeCheckConfig.yaml
@@ -28,6 +28,7 @@ update_verb: 'PATCH'
 update_mask: true
 mutex: 'stackdriver/groups/{{project}}'
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/products/osconfig/PatchDeployment.yaml b/mmv1/products/osconfig/PatchDeployment.yaml
@@ -24,6 +24,9 @@ docs:
 id_format: '{{name}}'
 base_url: 'projects/{{project}}/patchDeployments'
 self_link: '{{name}}'
+import_format:
+  - '{{project}} {{name}}'
+  - '{{name}}'
 create_url: 'projects/{{project}}/patchDeployments?patchDeploymentId={{patch_deployment_id}}'
 immutable: true
 timeouts:

diff --git a/mmv1/products/securitycenter/NotificationConfig.yaml b/mmv1/products/securitycenter/NotificationConfig.yaml
@@ -31,6 +31,8 @@ self_link: '{{name}}'
 create_url: 'organizations/{{organization}}/notificationConfigs?configId={{config_id}}'
 update_verb: 'PATCH'
 update_mask: true
+import_format:
+  - '{{name}}'
 timeouts:
   insert_minutes: 20
   update_minutes: 20

diff --git a/mmv1/products/securitycenter/ProjectNotificationConfig.yaml b/mmv1/products/securitycenter/ProjectNotificationConfig.yaml
@@ -32,6 +32,8 @@ self_link: '{{name}}'
 create_url: 'projects/{{project}}/notificationConfigs?configId={{config_id}}'
 update_verb: 'PATCH'
 update_mask: true
+import_format:
+  - '{{name}}'
 timeouts:
   insert_minutes: 20
   update_minutes: 20

diff --git a/mmv1/products/securitycenterv2/OrganizationNotificationConfig.yaml b/mmv1/products/securitycenterv2/OrganizationNotificationConfig.yaml
@@ -32,6 +32,8 @@ self_link: '{{name}}'
 create_url: 'organizations/{{organization}}/locations/{{location}}/notificationConfigs?configId={{config_id}}'
 update_verb: 'PATCH'
 update_mask: true
+import_format:
+  - '{{name}}'
 timeouts:
   insert_minutes: 20
   update_minutes: 20

diff --git a/mmv1/products/securityscanner/ScanConfig.yaml b/mmv1/products/securityscanner/ScanConfig.yaml
@@ -25,6 +25,9 @@ base_url: 'projects/{{project}}/scanConfigs'
 self_link: '{{name}}'
 update_verb: 'PATCH'
 update_mask: true
+import_format:
+  - '{{project}} {{name}}'
+  - '{{name}}'
 timeouts:
   insert_minutes: 20
   update_minutes: 20

diff --git a/mmv1/products/transcoder/Job.yaml b/mmv1/products/transcoder/Job.yaml
@@ -24,6 +24,7 @@ self_link: '{{name}}'
 create_url: 'projects/{{project}}/locations/{{location}}/jobs'
 immutable: true
 import_format:
+  - '{{project}} {{name}}'
   - '{{name}}'
 timeouts:
   insert_minutes: 20

diff --git a/mmv1/templates/terraform/resource.html.markdown.tmpl b/mmv1/templates/terraform/resource.html.markdown.tmpl
@@ -190,7 +190,11 @@ When using the [`terraform import` command](https://developer.hashicorp.com/terr
 
 ```
 	{{- range $idFormat := $.ImportIdFormatsFromResource }}
-$ terraform import {{$.TerraformName}}.default {{replaceAll $idFormat "%" "" }}
+		{{- $importId := replaceAll $idFormat "%" "" }}
+		{{- if contains $importId " " }}
+			{{- $importId = printf "\"%s\"" $importId }}
+		{{- end }}
+$ terraform import {{$.TerraformName}}.default {{$importId}}
 	{{- end }}
 ```
 {{ end }}