fix api-gateway import tests (#5104) (#9871)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 20, 2021 · c18cf34 · c18cf34
1 parent 7ed7e1d
commit c18cf34
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/.changelog/5104.txt b/.changelog/5104.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+apigateway: fixed import functionality for all `apigateway` resources
+```
diff --git a/website/docs/r/api_gateway_api.html.markdown b/website/docs/r/api_gateway_api.html.markdown
@@ -106,9 +106,9 @@ This resource provides the following
 Api can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_api_gateway_api.default projects/{{project}}/locations/global/apis/{{name}}
-$ terraform import google_api_gateway_api.default {{project}}/{{name}}
-$ terraform import google_api_gateway_api.default {{name}}
+$ terraform import google_api_gateway_api.default projects/{{project}}/locations/global/apis/{{api_id}}
+$ terraform import google_api_gateway_api.default {{project}}/{{api_id}}
+$ terraform import google_api_gateway_api.default {{api_id}}
 ```
 
 ## User Project Overrides

diff --git a/website/docs/r/api_gateway_api_config.html.markdown b/website/docs/r/api_gateway_api_config.html.markdown
@@ -167,9 +167,9 @@ This resource provides the following
 ApiConfig can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_api_gateway_api_config.default projects/{{project}}/locations/global/apis/{{api}}/configs/{{name}}
-$ terraform import google_api_gateway_api_config.default {{project}}/{{api}}/{{name}}
-$ terraform import google_api_gateway_api_config.default {{api}}/{{name}}
+$ terraform import google_api_gateway_api_config.default projects/{{project}}/locations/global/apis/{{api}}/configs/{{api_config_id}}
+$ terraform import google_api_gateway_api_config.default {{project}}/{{api}}/{{api_config_id}}
+$ terraform import google_api_gateway_api_config.default {{api}}/{{api_config_id}}
 ```
 
 ## User Project Overrides

diff --git a/website/docs/r/api_gateway_api_iam.html.markdown b/website/docs/r/api_gateway_api_iam.html.markdown
@@ -114,9 +114,9 @@ exported:
 
 For all import syntaxes, the "resource in question" can take any of the following forms:
 
-* projects/{{project}}/locations/global/apis/{{name}}
-* {{project}}/{{name}}
-* {{name}}
+* projects/{{project}}/locations/global/apis/{{api}}
+* {{project}}/{{api}}
+* {{api}}
 
 Any variables not passed in the import command will be taken from the provider configuration.
 

diff --git a/website/docs/r/api_gateway_gateway.html.markdown b/website/docs/r/api_gateway_gateway.html.markdown
@@ -132,10 +132,10 @@ This resource provides the following
 Gateway can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_api_gateway_gateway.default projects/{{project}}/locations/{{region}}/gateways/{{name}}
-$ terraform import google_api_gateway_gateway.default {{project}}/{{region}}/{{name}}
-$ terraform import google_api_gateway_gateway.default {{region}}/{{name}}
-$ terraform import google_api_gateway_gateway.default {{name}}
+$ terraform import google_api_gateway_gateway.default projects/{{project}}/locations/{{region}}/gateways/{{gateway_id}}
+$ terraform import google_api_gateway_gateway.default {{project}}/{{region}}/{{gateway_id}}
+$ terraform import google_api_gateway_gateway.default {{region}}/{{gateway_id}}
+$ terraform import google_api_gateway_gateway.default {{gateway_id}}
 ```
 
 ## User Project Overrides

diff --git a/website/docs/r/api_gateway_gateway_iam.html.markdown b/website/docs/r/api_gateway_gateway_iam.html.markdown
@@ -121,10 +121,10 @@ exported:
 
 For all import syntaxes, the "resource in question" can take any of the following forms:
 
-* projects/{{project}}/locations/{{region}}/gateways/{{name}}
-* {{project}}/{{region}}/{{name}}
-* {{region}}/{{name}}
-* {{name}}
+* projects/{{project}}/locations/{{region}}/gateways/{{gateway}}
+* {{project}}/{{region}}/{{gateway}}
+* {{region}}/{{gateway}}
+* {{gateway}}
 
 Any variables not passed in the import command will be taken from the provider configuration.