catching changes after rebase

GoogleCloudPlatform · Nov 27, 2019 · 18b3cbd · 18b3cbd
1 parent 44c29e4
commit 18b3cbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/products/cloudrun/terraform.yaml b/products/cloudrun/terraform.yaml
@@ -53,8 +53,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       - !ruby/object:Provider::Terraform::Examples
         name: "cloud_run_service_basic"
         primary_resource_id: "default"
-        # skipping test until custom import ids are supported
-        skip_test: true
         vars:
           cloud_run_service_name: "tftest-cloudrun"
         test_env_vars:

diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -9354,8 +9354,8 @@ objects:
       guides:
         'Google Cloud Router': 'https://cloud.google.com/router/docs/'
       api: 'https://cloud.google.com/compute/docs/reference/rest/v1/routers'
-    async: !ruby/object:Api::Async
-      operation: !ruby/object:Api::Async::Operation
+    async: !ruby/object:Api::OpAsync
+      operation: !ruby/object:Api::OpAsync::Operation
         kind: 'compute#operation'
         path: 'name'
         base_url: 'projects/{{project}}/regions/{{regions}}/operations/{{op_id}}'
@@ -9364,16 +9364,16 @@ objects:
           insert_minutes: 10
           update_minutes: 10
           delete_minutes: 10
-      result: !ruby/object:Api::Async::Result
+      result: !ruby/object:Api::OpAsync::Result
         path: 'targetLink'
-      status: !ruby/object:Api::Async::Status
+      status: !ruby/object:Api::OpAsync::Status
         path: 'status'
         complete: 'DONE'
         allowed:
           - 'PENDING'
           - 'RUNNING'
           - 'DONE'
-      error: !ruby/object:Api::Async::Error
+      error: !ruby/object:Api::OpAsync::Error
         path: 'error/errors'
         message: 'message'
     parameters: