google-cloud-spanner 1.6.1 → 1.6.2

data/lib/google/cloud/spanner/admin/instance/v1/credentials.rb

@@ -0,0 +1,46 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require "googleauth"
+
+module Google
+  module Cloud
+    module Spanner
+      module Admin
+        module Instance
+          module V1
+            class Credentials < Google::Auth::Credentials
+              SCOPE = [
+                "https://www.googleapis.com/auth/cloud-platform",
+                "https://www.googleapis.com/auth/spanner.admin"
+              ].freeze
+              PATH_ENV_VARS = %w(SPANNER_ADMIN_INSTANCE_CREDENTIALS
+                                 SPANNER_ADMIN_INSTANCE_KEYFILE
+                                 GOOGLE_CLOUD_CREDENTIALS
+                                 GOOGLE_CLOUD_KEYFILE
+                                 GCLOUD_KEYFILE)
+              JSON_ENV_VARS = %w(SPANNER_ADMIN_INSTANCE_CREDENTIALS_JSON
+                                 SPANNER_ADMIN_INSTANCE_KEYFILE_JSON
+                                 GOOGLE_CLOUD_CREDENTIALS_JSON
+                                 GOOGLE_CLOUD_KEYFILE_JSON
+                                 GCLOUD_KEYFILE_JSON)
+              DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/iam/v1/iam_policy.rb

@@ -0,0 +1,63 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Google
+  module Iam
+    module V1
+      # Request message for +SetIamPolicy+ method.
+      # @!attribute [rw] resource
+      #   @return [String]
+      #     REQUIRED: The resource for which the policy is being specified.
+      #     +resource+ is usually specified as a path. For example, a Project
+      #     resource is specified as +projects/\\{project}+.
+      # @!attribute [rw] policy
+      #   @return [Google::Iam::V1::Policy]
+      #     REQUIRED: The complete policy to be applied to the +resource+. The size of
+      #     the policy is limited to a few 10s of KB. An empty policy is a
+      #     valid policy but certain Cloud Platform services (such as Projects)
+      #     might reject them.
+      class SetIamPolicyRequest; end
+
+      # Request message for +GetIamPolicy+ method.
+      # @!attribute [rw] resource
+      #   @return [String]
+      #     REQUIRED: The resource for which the policy is being requested.
+      #     +resource+ is usually specified as a path. For example, a Project
+      #     resource is specified as +projects/\\{project}+.
+      class GetIamPolicyRequest; end
+
+      # Request message for +TestIamPermissions+ method.
+      # @!attribute [rw] resource
+      #   @return [String]
+      #     REQUIRED: The resource for which the policy detail is being requested.
+      #     +resource+ is usually specified as a path. For example, a Project
+      #     resource is specified as +projects/\\{project}+.
+      # @!attribute [rw] permissions
+      #   @return [Array<String>]
+      #     The set of permissions to check for the +resource+. Permissions with
+      #     wildcards (such as '*' or 'storage.*') are not allowed. For more
+      #     information see
+      #     [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
+      class TestIamPermissionsRequest; end
+
+      # Response message for +TestIamPermissions+ method.
+      # @!attribute [rw] permissions
+      #   @return [Array<String>]
+      #     A subset of +TestPermissionsRequest.permissions+ that the caller is
+      #     allowed.
+      class TestIamPermissionsResponse; end
+    end
+  end
+end

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/iam/v1/policy.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 module Google
   module Iam
     module V1
@@ -85,17 +86,17 @@ module Google
       #     * +allAuthenticatedUsers+: A special identifier that represents anyone
       #       who is authenticated with a Google account or a service account.
       #
-      #     * +user:{emailid}+: An email address that represents a specific Google
+      #     * +user:\\{emailid}+: An email address that represents a specific Google
       #       account. For example, +alice@gmail.com+ or +joe@example.com+.
       #
       #
-      #     * +serviceAccount:{emailid}+: An email address that represents a service
+      #     * +serviceAccount:\\{emailid}+: An email address that represents a service
       #       account. For example, +my-other-app@appspot.gserviceaccount.com+.
       #
-      #     * +group:{emailid}+: An email address that represents a Google group.
+      #     * +group:\\{emailid}+: An email address that represents a Google group.
       #       For example, +admins@example.com+.
       #
-      #     * +domain:{domain}+: A Google Apps domain name that represents all the
+      #     * +domain:\\{domain}+: A Google Apps domain name that represents all the
       #       users of that domain. For example, +google.com+ or +example.com+.
       class Binding; end
 
@@ -121,19 +122,7 @@ module Google
       #     A single identity requesting access for a Cloud Platform resource.
       #     Follows the same format of Binding.members.
       #     Required
-      class BindingDelta
-        # The type of action performed on a Binding in a policy.
-        module Action
-          # Unspecified.
-          ACTION_UNSPECIFIED = 0
-
-          # Addition of a Binding.
-          ADD = 1
-
-          # Removal of a Binding.
-          REMOVE = 2
-        end
-      end
+      class BindingDelta; end
     end
   end
-end
+end

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/longrunning/operations.rb

@@ -0,0 +1,93 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Google
+  module Longrunning
+    # This resource represents a long-running operation that is the result of a
+    # network API call.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The server-assigned name, which is only unique within the same service that
+    #     originally returns it. If you use the default HTTP mapping, the
+    #     +name+ should have the format of +operations/some/unique/name+.
+    # @!attribute [rw] metadata
+    #   @return [Google::Protobuf::Any]
+    #     Service-specific metadata associated with the operation.  It typically
+    #     contains progress information and common metadata such as create time.
+    #     Some services might not provide such metadata.  Any method that returns a
+    #     long-running operation should document the metadata type, if any.
+    # @!attribute [rw] done
+    #   @return [true, false]
+    #     If the value is +false+, it means the operation is still in progress.
+    #     If true, the operation is completed, and either +error+ or +response+ is
+    #     available.
+    # @!attribute [rw] error
+    #   @return [Google::Rpc::Status]
+    #     The error result of the operation in case of failure or cancellation.
+    # @!attribute [rw] response
+    #   @return [Google::Protobuf::Any]
+    #     The normal response of the operation in case of success.  If the original
+    #     method returns no data on success, such as +Delete+, the response is
+    #     +google.protobuf.Empty+.  If the original method is standard
+    #     +Get+/+Create+/+Update+, the response should be the resource.  For other
+    #     methods, the response should have the type +XxxResponse+, where +Xxx+
+    #     is the original method name.  For example, if the original method name
+    #     is +TakeSnapshot()+, the inferred response type is
+    #     +TakeSnapshotResponse+.
+    class Operation; end
+
+    # The request message for {Google::Longrunning::Operations::GetOperation Operations::GetOperation}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation resource.
+    class GetOperationRequest; end
+
+    # The request message for {Google::Longrunning::Operations::ListOperations Operations::ListOperations}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation collection.
+    # @!attribute [rw] filter
+    #   @return [String]
+    #     The standard list filter.
+    # @!attribute [rw] page_size
+    #   @return [Integer]
+    #     The standard list page size.
+    # @!attribute [rw] page_token
+    #   @return [String]
+    #     The standard list page token.
+    class ListOperationsRequest; end
+
+    # The response message for {Google::Longrunning::Operations::ListOperations Operations::ListOperations}.
+    # @!attribute [rw] operations
+    #   @return [Array<Google::Longrunning::Operation>]
+    #     A list of operations that matches the specified filter in the request.
+    # @!attribute [rw] next_page_token
+    #   @return [String]
+    #     The standard List next-page token.
+    class ListOperationsResponse; end
+
+    # The request message for {Google::Longrunning::Operations::CancelOperation Operations::CancelOperation}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation resource to be cancelled.
+    class CancelOperationRequest; end
+
+    # The request message for {Google::Longrunning::Operations::DeleteOperation Operations::DeleteOperation}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation resource to be deleted.
+    class DeleteOperationRequest; end
+  end
+end

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/protobuf/any.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 module Google
   module Protobuf
     # +Any+ contains an arbitrary serialized protocol buffer message along with a
@@ -95,17 +96,18 @@ module Google
     #     }
     # @!attribute [rw] type_url
     #   @return [String]
-    #     A URL/resource name whose content describes the type of the
-    #     serialized protocol buffer message.
+    #     A URL/resource name that uniquely identifies the type of the serialized
+    #     protocol buffer message. The last segment of the URL's path must represent
+    #     the fully qualified name of the type (as in
+    #     +path/google.protobuf.Duration+). The name should be in a canonical form
+    #     (e.g., leading "." is not accepted).
     #
-    #     For URLs which use the scheme +http+, +https+, or no scheme, the
-    #     following restrictions and interpretations apply:
+    #     In practice, teams usually precompile into the binary all types that they
+    #     expect it to use in the context of Any. However, for URLs which use the
+    #     scheme +http+, +https+, or no scheme, one can optionally set up a type
+    #     server that maps type URLs to message definitions as follows:
     #
     #     * If no scheme is provided, +https+ is assumed.
-    #     * The last segment of the URL's path must represent the fully
-    #       qualified name of the type (as in +path/google.protobuf.Duration+).
-    #       The name should be in a canonical form (e.g., leading "." is
-    #       not accepted).
     #     * An HTTP GET on the URL must yield a {Google::Protobuf::Type}
     #       value in binary format, or produce an error.
     #     * Applications are allowed to cache lookup results based on the
@@ -114,6 +116,10 @@ module Google
     #       on changes to types. (Use versioned type names to manage
     #       breaking changes.)
     #
+    #     Note: this functionality is not currently available in the official
+    #     protobuf release, and it is not used for type URLs beginning with
+    #     type.googleapis.com.
+    #
     #     Schemes other than +http+, +https+ (or the empty scheme) might be
     #     used with implementation specific semantics.
     # @!attribute [rw] value

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/protobuf/empty.rb

@@ -0,0 +1,29 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Google
+  module Protobuf
+    # A generic empty message that you can re-use to avoid defining duplicated
+    # empty messages in your APIs. A typical example is to use it as the request
+    # or the response type of an API method. For instance:
+    #
+    #     service Foo {
+    #       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
+    #     }
+    #
+    # The JSON representation for +Empty+ is empty JSON object +{}+.
+    class Empty; end
+  end
+end

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/protobuf/field_mask.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 module Google
   module Protobuf
     # +FieldMask+ represents a set of symbolic field paths, for example:
@@ -215,6 +216,12 @@ module Google
     #
     # Note that oneof type names ("test_oneof" in this case) cannot be used in
     # paths.
+    #
+    # == Field Mask Verification
+    #
+    # The implementation of any API method which has a FieldMask type field in the
+    # request should verify the included field paths, and return an
+    # +INVALID_ARGUMENT+ error if any path is duplicated or unmappable.
     # @!attribute [rw] paths
     #   @return [Array<String>]
     #     The set of field mask paths.

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/rpc/status.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 module Google
   module Rpc
     # The +Status+ type defines a logical error model that is suitable for different

data/lib/google/cloud/spanner/admin/instance/v1/doc/google/spanner/admin/instance/v1/spanner_instance_admin.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,21 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 module Google
   module Spanner
     module Admin
       module Instance
-        ##
-        # # Cloud Spanner Instance Admin API Contents
-        #
-        # | Class | Description |
-        # | ----- | ----------- |
-        # | [InstanceAdminClient][] |  |
-        # | [Data Types][] | Data types for Google::Cloud::Spanner::Admin::Instance::V1 |
-        #
-        # [InstanceAdminClient]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-spanner-admin-instance/latest/google/spanner/admin/instance/v1/instanceadminclient
-        # [Data Types]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-spanner-admin-instance/latest/google/spanner/admin/instance/v1/datatypes
-        #
         module V1
           # A possible configuration for a Cloud Spanner instance. Configurations
           # define the geographic placement of nodes and their replication.

data/lib/google/cloud/spanner/admin/instance/v1/instance_admin_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,7 @@
 # and updates to that file get reflected here through a refresh process.
 # For the short term, the refresh process will only be runnable by Google
 # engineers.
-#
-# The only allowed edits are to method and file documentation. A 3-way
-# merge preserves those additions if the generated source changes.
+
 
 require "json"
 require "pathname"
@@ -30,7 +28,7 @@ require "google/gax/operation"
 require "google/longrunning/operations_client"
 
 require "google/spanner/admin/instance/v1/spanner_instance_admin_pb"
-require "google/cloud/spanner/admin/instance/credentials"
+require "google/cloud/spanner/admin/instance/v1/credentials"
 
 module Google
   module Cloud
@@ -63,6 +61,7 @@ module Google
             # @!attribute [r] instance_admin_stub
             #   @return [Google::Spanner::Admin::Instance::V1::InstanceAdmin::Stub]
             class InstanceAdminClient
+              # @private
               attr_reader :instance_admin_stub
 
               # The default address of the service.
@@ -71,6 +70,9 @@ module Google
               # The default port of the service.
               DEFAULT_SERVICE_PORT = 443
 
+              # The default set of gRPC interceptors.
+              GRPC_INTERCEPTORS = []
+
               DEFAULT_TIMEOUT = 30
 
               PAGE_DESCRIPTORS = {
@@ -95,7 +97,8 @@ module Google
 
               # @private
               class OperationsClient < Google::Longrunning::OperationsClient
-                SERVICE_ADDRESS = SERVICE_ADDRESS
+                self::SERVICE_ADDRESS = InstanceAdminClient::SERVICE_ADDRESS
+                self::GRPC_INTERCEPTORS = InstanceAdminClient::GRPC_INTERCEPTORS
               end
 
               PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
@@ -171,11 +174,18 @@ module Google
               #   or the specified config is missing data points.
               # @param timeout [Numeric]
               #   The default timeout, in seconds, for calls made through this client.
+              # @param metadata [Hash]
+              #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+              # @param exception_transformer [Proc]
+              #   An optional proc that intercepts any exceptions raised during an API call to inject
+              #   custom error handling.
               def initialize \
                   credentials: nil,
                   scopes: ALL_SCOPES,
                   client_config: {},
                   timeout: DEFAULT_TIMEOUT,
+                  metadata: nil,
+                  exception_transformer: nil,
                   lib_name: nil,
                   lib_version: ""
                 # These require statements are intentionally placed here to initialize
@@ -184,7 +194,7 @@ module Google
                 require "google/gax/grpc"
                 require "google/spanner/admin/instance/v1/spanner_instance_admin_services_pb"
 
-                credentials ||= Google::Cloud::Spanner::Admin::Instance::Credentials.default
+                credentials ||= Google::Cloud::Spanner::Admin::Instance::V1::Credentials.default
 
                 @operations_client = OperationsClient.new(
                   credentials: credentials,
@@ -196,7 +206,7 @@ module Google
                 )
 
                 if credentials.is_a?(String) || credentials.is_a?(Hash)
-                  updater_proc = Google::Cloud::Spanner::Admin::Instance::Credentials.new(credentials).updater_proc
+                  updater_proc = Google::Cloud::Spanner::Admin::Instance::V1::Credentials.new(credentials).updater_proc
                 end
                 if credentials.is_a?(GRPC::Core::Channel)
                   channel = credentials
@@ -220,6 +230,7 @@ module Google
                 google_api_client.freeze
 
                 headers = { :"x-goog-api-client" => google_api_client }
+                headers.merge!(metadata) unless metadata.nil?
                 client_config_file = Pathname.new(__dir__).join(
                   "instance_admin_client_config.json"
                 )
@@ -232,13 +243,14 @@ module Google
                     timeout,
                     page_descriptors: PAGE_DESCRIPTORS,
                     errors: Google::Gax::Grpc::API_ERRORS,
-                    kwargs: headers
+                    metadata: headers
                   )
                 end
 
                 # Allow overriding the service path/port in subclasses.
                 service_path = self.class::SERVICE_ADDRESS
                 port = self.class::DEFAULT_SERVICE_PORT
+                interceptors = self.class::GRPC_INTERCEPTORS
                 @instance_admin_stub = Google::Gax::Grpc.create_stub(
                   service_path,
                   port,
@@ -246,48 +258,59 @@ module Google
                   channel: channel,
                   updater_proc: updater_proc,
                   scopes: scopes,
+                  interceptors: interceptors,
                   &Google::Spanner::Admin::Instance::V1::InstanceAdmin::Stub.method(:new)
                 )
 
                 @list_instance_configs = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:list_instance_configs),
-                  defaults["list_instance_configs"]
+                  defaults["list_instance_configs"],
+                  exception_transformer: exception_transformer
                 )
                 @get_instance_config = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:get_instance_config),
-                  defaults["get_instance_config"]
+                  defaults["get_instance_config"],
+                  exception_transformer: exception_transformer
                 )
                 @list_instances = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:list_instances),
-                  defaults["list_instances"]
+                  defaults["list_instances"],
+                  exception_transformer: exception_transformer
                 )
                 @get_instance = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:get_instance),
-                  defaults["get_instance"]
+                  defaults["get_instance"],
+                  exception_transformer: exception_transformer
                 )
                 @create_instance = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:create_instance),
-                  defaults["create_instance"]
+                  defaults["create_instance"],
+                  exception_transformer: exception_transformer
                 )
                 @update_instance = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:update_instance),
-                  defaults["update_instance"]
+                  defaults["update_instance"],
+                  exception_transformer: exception_transformer
                 )
                 @delete_instance = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:delete_instance),
-                  defaults["delete_instance"]
+                  defaults["delete_instance"],
+                  exception_transformer: exception_transformer
                 )
                 @set_iam_policy = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:set_iam_policy),
-                  defaults["set_iam_policy"]
+                  defaults["set_iam_policy"],
+                  exception_transformer: exception_transformer
                 )
                 @get_iam_policy = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:get_iam_policy),
-                  defaults["get_iam_policy"]
+                  defaults["get_iam_policy"],
+                  exception_transformer: exception_transformer
                 )
                 @test_iam_permissions = Google::Gax.create_api_call(
                   @instance_admin_stub.method(:test_iam_permissions),
-                  defaults["test_iam_permissions"]
+                  defaults["test_iam_permissions"],
+                  exception_transformer: exception_transformer
                 )
               end
 
@@ -308,6 +331,9 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Gax::PagedEnumerable<Google::Spanner::Admin::Instance::V1::InstanceConfig>]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Gax::PagedEnumerable<Google::Spanner::Admin::Instance::V1::InstanceConfig>]
               #   An enumerable of Google::Spanner::Admin::Instance::V1::InstanceConfig instances.
               #   See Google::Gax::PagedEnumerable documentation for other
@@ -315,9 +341,9 @@ module Google
               #   object.
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_parent = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.project_path("[PROJECT]")
               #
               #   # Iterate over all results.
@@ -336,13 +362,14 @@ module Google
               def list_instance_configs \
                   parent,
                   page_size: nil,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   parent: parent,
                   page_size: page_size
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Spanner::Admin::Instance::V1::ListInstanceConfigsRequest)
-                @list_instance_configs.call(req, options)
+                @list_instance_configs.call(req, options, &block)
               end
 
               # Gets information about a particular instance configuration.
@@ -353,23 +380,27 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Spanner::Admin::Instance::V1::InstanceConfig]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Spanner::Admin::Instance::V1::InstanceConfig]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_name = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.instance_config_path("[PROJECT]", "[INSTANCE_CONFIG]")
               #   response = instance_admin_client.get_instance_config(formatted_name)
 
               def get_instance_config \
                   name,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   name: name
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Spanner::Admin::Instance::V1::GetInstanceConfigRequest)
-                @get_instance_config.call(req, options)
+                @get_instance_config.call(req, options, &block)
               end
 
               # Lists all instances in the given project.
@@ -406,6 +437,9 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Gax::PagedEnumerable<Google::Spanner::Admin::Instance::V1::Instance>]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Gax::PagedEnumerable<Google::Spanner::Admin::Instance::V1::Instance>]
               #   An enumerable of Google::Spanner::Admin::Instance::V1::Instance instances.
               #   See Google::Gax::PagedEnumerable documentation for other
@@ -413,9 +447,9 @@ module Google
               #   object.
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_parent = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.project_path("[PROJECT]")
               #
               #   # Iterate over all results.
@@ -435,14 +469,15 @@ module Google
                   parent,
                   page_size: nil,
                   filter: nil,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   parent: parent,
                   page_size: page_size,
                   filter: filter
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Spanner::Admin::Instance::V1::ListInstancesRequest)
-                @list_instances.call(req, options)
+                @list_instances.call(req, options, &block)
               end
 
               # Gets information about a particular instance.
@@ -453,23 +488,27 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Spanner::Admin::Instance::V1::Instance]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Spanner::Admin::Instance::V1::Instance]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_name = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
               #   response = instance_admin_client.get_instance(formatted_name)
 
               def get_instance \
                   name,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   name: name
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Spanner::Admin::Instance::V1::GetInstanceRequest)
-                @get_instance.call(req, options)
+                @get_instance.call(req, options, &block)
               end
 
               # Creates an instance and begins preparing it to begin serving. The
@@ -525,11 +564,15 @@ module Google
               # @return [Google::Gax::Operation]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_parent = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.project_path("[PROJECT]")
+              #
+              #   # TODO: Initialize +instance_id+:
               #   instance_id = ''
+              #
+              #   # TODO: Initialize +instance+:
               #   instance = {}
               #
               #   # Register a callback during the method call.
@@ -640,10 +683,14 @@ module Google
               # @return [Google::Gax::Operation]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
+              #
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   # TODO: Initialize +instance+:
               #   instance = {}
+              #
+              #   # TODO: Initialize +field_mask+:
               #   field_mask = {}
               #
               #   # Register a callback during the method call.
@@ -711,22 +758,26 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result []
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_name = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
               #   instance_admin_client.delete_instance(formatted_name)
 
               def delete_instance \
                   name,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   name: name
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Spanner::Admin::Instance::V1::DeleteInstanceRequest)
-                @delete_instance.call(req, options)
+                @delete_instance.call(req, options, &block)
                 nil
               end
 
@@ -739,7 +790,7 @@ module Google
               # @param resource [String]
               #   REQUIRED: The resource for which the policy is being specified.
               #   +resource+ is usually specified as a path. For example, a Project
-              #   resource is specified as +projects/{project}+.
+              #   resource is specified as +projects/\\{project}+.
               # @param policy [Google::Iam::V1::Policy | Hash]
               #   REQUIRED: The complete policy to be applied to the +resource+. The size of
               #   the policy is limited to a few 10s of KB. An empty policy is a
@@ -750,26 +801,32 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Iam::V1::Policy]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Iam::V1::Policy]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_resource = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
+              #
+              #   # TODO: Initialize +policy+:
               #   policy = {}
               #   response = instance_admin_client.set_iam_policy(formatted_resource, policy)
 
               def set_iam_policy \
                   resource,
                   policy,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   resource: resource,
                   policy: policy
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Iam::V1::SetIamPolicyRequest)
-                @set_iam_policy.call(req, options)
+                @set_iam_policy.call(req, options, &block)
               end
 
               # Gets the access control policy for an instance resource. Returns an empty
@@ -781,27 +838,31 @@ module Google
               # @param resource [String]
               #   REQUIRED: The resource for which the policy is being requested.
               #   +resource+ is usually specified as a path. For example, a Project
-              #   resource is specified as +projects/{project}+.
+              #   resource is specified as +projects/\\{project}+.
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Iam::V1::Policy]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Iam::V1::Policy]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_resource = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
               #   response = instance_admin_client.get_iam_policy(formatted_resource)
 
               def get_iam_policy \
                   resource,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   resource: resource
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Iam::V1::GetIamPolicyRequest)
-                @get_iam_policy.call(req, options)
+                @get_iam_policy.call(req, options, &block)
               end
 
               # Returns permissions that the caller has on the specified instance resource.
@@ -814,7 +875,7 @@ module Google
               # @param resource [String]
               #   REQUIRED: The resource for which the policy detail is being requested.
               #   +resource+ is usually specified as a path. For example, a Project
-              #   resource is specified as +projects/{project}+.
+              #   resource is specified as +projects/\\{project}+.
               # @param permissions [Array<String>]
               #   The set of permissions to check for the +resource+. Permissions with
               #   wildcards (such as '*' or 'storage.*') are not allowed. For more
@@ -823,26 +884,32 @@ module Google
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
+              # @yield [result, operation] Access the result along with the RPC operation
+              # @yieldparam result [Google::Iam::V1::TestIamPermissionsResponse]
+              # @yieldparam operation [GRPC::ActiveCall::Operation]
               # @return [Google::Iam::V1::TestIamPermissionsResponse]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/instance/v1"
+              #   require "google/cloud/spanner/admin/instance"
               #
-              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance::V1.new
+              #   instance_admin_client = Google::Cloud::Spanner::Admin::Instance.new(version: :v1)
               #   formatted_resource = Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
+              #
+              #   # TODO: Initialize +permissions+:
               #   permissions = []
               #   response = instance_admin_client.test_iam_permissions(formatted_resource, permissions)
 
               def test_iam_permissions \
                   resource,
                   permissions,
-                  options: nil
+                  options: nil,
+                  &block
                 req = {
                   resource: resource,
                   permissions: permissions
                 }.delete_if { |_, v| v.nil? }
                 req = Google::Gax::to_proto(req, Google::Iam::V1::TestIamPermissionsRequest)
-                @test_iam_permissions.call(req, options)
+                @test_iam_permissions.call(req, options, &block)
               end
             end
           end