google-cloud-spanner 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5771caa6b51214d9d055d81d3599be90a0fc4b8
-  data.tar.gz: 507675535d7b273319e1ba3a4eff12cae8f2476a
+SHA256:
+  metadata.gz: 1add7ab9a3b78c54ef296d7e366b29f5ddeeb0faf9eed896d8ab083c12328634
+  data.tar.gz: e46bb01d063d498e0675a7e27af8fe3fac6c014f84d70539a1ae6e8c3be0ed55
 SHA512:
-  metadata.gz: 7a46983593597d6e1f85b7af983ce1e3437b6bec8941576495bb1d09b5367b0dbc167c836d5e68ab2cbe51e5943236f3086c708321e79d6ef0fab1234ad59298
-  data.tar.gz: a6924f6230d60d4a70790ef25d8147baea396819ec82264f5f53035b69b291eb9b2b2dc72f8d26383483e932d3c77dce9e4e895e63f9e1ef8605f2fa3322b835
+  metadata.gz: fb362ee20082a2999811b513ba91fdf3991b73719c4d2cab8ccc2102de08aa3f26dc13636b36c139b8affac07b395d4d2c68a6b440221fb02c21d3e1e51e2cde
+  data.tar.gz: d0854595641328c2f90b741e174c01f2f3f2ca960c0a1b7a9f6e317e1ed326dd75fa75bba0657e12ebe4e112526a9d8b006296838c16791aed67467add975a20

data/lib/google-cloud-spanner.rb

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 ##
-# This file is here to be autorequired by bundler, so that the .spanner and
-# #spanner methods can be available, but the library and all dependencies won't
-# be loaded until required and used.
+# This file is here to be autorequired by bundler, so that the
+# Google::Cloud.spanner and Google::Cloud#spanner methods can be available, but
+# the library and all dependencies won't be loaded until required and used.
 
 
 gem "google-cloud-core"
@@ -71,10 +71,12 @@ module Google
     # For more information on connecting to Google Cloud see the [Authentication
     # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
     #
-    # @param [String] project Project identifier for the Spanner service you are
-    #   connecting to.
-    # @param [String, Hash] keyfile Keyfile downloaded from Google Cloud. If
-    #   file path the file must be readable.
+    # @param [String] project_id Project identifier for the Spanner service you
+    #   are connecting to. If not present, the default project for the
+    #   credentials is used.
+    # @param [String, Hash, Google::Auth::Credentials] credentials The path to
+    #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+    #   Google::Auth::Credentials object. (See {Spanner::Credentials})
     # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling the
     #   set of resources and operations that the connection can access. See
     #   [Using OAuth 2.0 to Access Google
@@ -95,10 +97,11 @@ module Google
     #
     #   spanner = Google::Cloud.spanner
     #
-    def self.spanner project = nil, keyfile = nil, scope: nil, timeout: nil,
-                     client_config: nil
+    def self.spanner project_id = nil, credentials = nil, scope: nil,
+                     timeout: nil, client_config: nil
       require "google/cloud/spanner"
-      Google::Cloud::Spanner.new project: project, keyfile: keyfile,
+      Google::Cloud::Spanner.new project_id: project_id,
+                                 credentials: credentials,
                                  scope: scope, timeout: timeout,
                                  client_config: client_config
     end

data/lib/google/cloud/spanner.rb

@@ -339,10 +339,12 @@ module Google
       # [Authentication
       # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
       #
-      # @param [String] project Project identifier for the Spanner service you
-      #   are connecting to.
-      # @param [String, Hash] keyfile Keyfile downloaded from Google Cloud. If
-      #   file path the file must be readable.
+      # @param [String] project_id Project identifier for the Spanner service
+      #   you are connecting to. If not present, the default project for the
+      #   credentials is used.
+      # @param [String, Hash, Google::Auth::Credentials] credentials The path to
+      #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+      #   Google::Auth::Credentials object. (See {Spanner::Credentials})
       # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling
       #   the set of resources and operations that the connection can access.
       #   See [Using OAuth 2.0 to Access Google
@@ -355,6 +357,9 @@ module Google
       # @param [Integer] timeout Default timeout to use in requests. Optional.
       # @param [Hash] client_config A hash of values to override the default
       #   behavior of the API client. Optional.
+      # @param [String] project Alias for the `project_id` argument. Deprecated.
+      # @param [String] keyfile Alias for the `credentials` argument.
+      #   Deprecated.
       #
       # @return [Google::Cloud::Spanner::Project]
       #
@@ -363,23 +368,21 @@ module Google
       #
       #   spanner = Google::Cloud::Spanner.new
       #
-      def self.new project: nil, keyfile: nil, scope: nil, timeout: nil,
-                   client_config: nil
-        project ||= Google::Cloud::Spanner::Project.default_project
-        project = project.to_s # Always cast to a string
-        fail ArgumentError, "project is missing" if project.empty?
+      def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
+                   client_config: nil, project: nil, keyfile: nil
+        project_id ||= (project || Spanner::Project.default_project_id)
+        project_id = project_id.to_s # Always cast to a string
+        fail ArgumentError, "project_id is missing" if project_id.empty?
 
-        if keyfile.nil?
-          credentials = Google::Cloud::Spanner::Credentials.default scope: scope
-        else
-          credentials = Google::Cloud::Spanner::Credentials.new(
-            keyfile, scope: scope)
+        credentials ||= (keyfile || Spanner::Credentials.default(scope: scope))
+        unless credentials.is_a? Google::Auth::Credentials
+          credentials = Spanner::Credentials.new credentials, scope: scope
         end
 
-        Google::Cloud::Spanner::Project.new(
-          Google::Cloud::Spanner::Service.new(
-            project, credentials, timeout: timeout,
-                                  client_config: client_config))
+        Spanner::Project.new(
+          Spanner::Service.new(
+            project_id, credentials, timeout: timeout,
+                                     client_config: client_config))
       end
     end
   end

data/lib/google/cloud/spanner/admin/database.rb

@@ -0,0 +1,111 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# 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
+#
+#     http://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 "google/gax"
+require "pathname"
+
+module Google
+  module Cloud
+    module Spanner
+      module Admin
+        # rubocop:disable LineLength
+
+        ##
+        # # Ruby Client for Cloud Spanner Database Admin API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
+        #
+        # [Cloud Spanner Database Admin API][Product Documentation]:
+        #
+        # - [Product Documentation][]
+        #
+        # ## Quick Start
+        # In order to use this library, you first need to go through the following
+        # steps:
+        #
+        # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
+        # 2. [Enable the Cloud Spanner Database Admin API.](https://console.cloud.google.com/apis/api/spanner-admin-database)
+        # 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
+        #
+        # ### Next Steps
+        # - Read the [Cloud Spanner Database Admin API Product documentation][Product Documentation]
+        #   to learn more about the product and see How-to Guides.
+        # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
+        #   to see the full list of Cloud APIs that we cover.
+        #
+        # [Product Documentation]: https://cloud.google.com/spanner-admin-database
+        #
+        #
+        module Database
+          # rubocop:enable LineLength
+
+          FILE_DIR = File.realdirpath(Pathname.new(__FILE__).join("..").join("database"))
+
+          AVAILABLE_VERSIONS = Dir["#{FILE_DIR}/*"]
+            .select { |file| File.directory?(file) }
+            .select { |dir| Google::Gax::VERSION_MATCHER.match(File.basename(dir)) }
+            .select { |dir| File.exist?(dir + ".rb") }
+            .map { |dir| File.basename(dir) }
+
+          ##
+          # Cloud Spanner Database Admin API
+          #
+          # The Cloud Spanner Database Admin API can be used to create, drop, and
+          # list databases. It also enables updating the schema of pre-existing
+          # databases.
+          #
+          # @param version [Symbol, String]
+          #   The major version of the service to be used. By default :v1
+          #   is used.
+          # @overload new(version:, credentials:, scopes:, client_config:, timeout:)
+          #   @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+          #     Provides the means for authenticating requests made by the client. This parameter can
+          #     be many types.
+          #     A `Google::Auth::Credentials` uses a the properties of its represented keyfile for
+          #     authenticating requests made by this client.
+          #     A `String` will be treated as the path to the keyfile to be used for the construction of
+          #     credentials for this client.
+          #     A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+          #     credentials for this client.
+          #     A `GRPC::Core::Channel` will be used to make calls through.
+          #     A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+          #     should already be composed with a `GRPC::Core::CallCredentials` object.
+          #     A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+          #     metadata for requests, generally, to give OAuth credentials.
+          #   @param scopes [Array<String>]
+          #     The OAuth scopes for this service. This parameter is ignored if
+          #     an updater_proc is supplied.
+          #   @param client_config [Hash]
+          #     A Hash for call options for each method. See
+          #     Google::Gax#construct_settings for the structure of
+          #     this data. Falls back to the default config if not specified
+          #     or the specified config is missing data points.
+          #   @param timeout [Numeric]
+          #     The default timeout, in seconds, for calls made through this client.
+          def self.new(*args, version: :v1, **kwargs)
+            unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
+              raise "The version: #{version} is not available. The available versions " \
+                "are: [#{AVAILABLE_VERSIONS.join(", ")}]"
+            end
+
+            require "#{FILE_DIR}/#{version.to_s.downcase}"
+            version_module = Google::Cloud::Spanner::Admin::Database
+              .constants
+              .select {|sym| sym.to_s.downcase == version.to_s.downcase}
+              .first
+            Google::Cloud::Spanner::Admin::Database.const_get(version_module).new(*args, **kwargs)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/spanner/admin/database/credentials.rb

@@ -0,0 +1,35 @@
+# Copyright 2017, Google Inc. All rights reserved.
+#
+# 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
+#
+#     http://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 Database
+          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_DATABASE_KEYFILE, GOOGLE_CLOUD_KEYFILE, GCLOUD_KEYFILE)
+            JSON_ENV_VARS = %w(SPANNER_ADMIN_DATABASE_KEYFILE_JSON, GOOGLE_CLOUD_KEYFILE_JSON, GCLOUD_KEYFILE_JSON)
+            DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/spanner/admin/database/v1.rb

@@ -1,5 +1,4 @@
-
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2017, Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +12,103 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 require "google/cloud/spanner/admin/database/v1/database_admin_client"
+
+module Google
+  module Cloud
+    module Spanner
+      module Admin
+        # rubocop:disable LineLength
+
+        ##
+        # # Ruby Client for Cloud Spanner Database Admin API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
+        #
+        # [Cloud Spanner Database Admin API][Product Documentation]:
+        #
+        # - [Product Documentation][]
+        #
+        # ## Quick Start
+        # In order to use this library, you first need to go through the following
+        # steps:
+        #
+        # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
+        # 2. [Enable the Cloud Spanner Database Admin API.](https://console.cloud.google.com/apis/api/spanner-admin-database)
+        # 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
+        #
+        # ### Next Steps
+        # - Read the [Cloud Spanner Database Admin API Product documentation][Product Documentation]
+        #   to learn more about the product and see How-to Guides.
+        # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
+        #   to see the full list of Cloud APIs that we cover.
+        #
+        # [Product Documentation]: https://cloud.google.com/spanner-admin-database
+        #
+        #
+        module Database
+          module V1
+            # rubocop:enable LineLength
+
+            ##
+            # Cloud Spanner Database Admin API
+            #
+            # The Cloud Spanner Database Admin API can be used to create, drop, and
+            # list databases. It also enables updating the schema of pre-existing
+            # databases.
+            #
+            # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+            #   Provides the means for authenticating requests made by the client. This parameter can
+            #   be many types.
+            #   A `Google::Auth::Credentials` uses a the properties of its represented keyfile for
+            #   authenticating requests made by this client.
+            #   A `String` will be treated as the path to the keyfile to be used for the construction of
+            #   credentials for this client.
+            #   A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+            #   credentials for this client.
+            #   A `GRPC::Core::Channel` will be used to make calls through.
+            #   A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+            #   should already be composed with a `GRPC::Core::CallCredentials` object.
+            #   A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+            #   metadata for requests, generally, to give OAuth credentials.
+            # @param scopes [Array<String>]
+            #   The OAuth scopes for this service. This parameter is ignored if
+            #   an updater_proc is supplied.
+            # @param client_config [Hash]
+            #   A Hash for call options for each method. See
+            #   Google::Gax#construct_settings for the structure of
+            #   this data. Falls back to the default config if not specified
+            #   or the specified config is missing data points.
+            # @param timeout [Numeric]
+            #   The default timeout, in seconds, for calls made through this client.
+            def self.new \
+                service_path: nil,
+                port: nil,
+                channel: nil,
+                chan_creds: nil,
+                updater_proc: nil,
+                credentials: nil,
+                scopes: nil,
+                client_config: nil,
+                timeout: nil,
+                lib_name: nil,
+                lib_version: nil
+              kwargs = {
+                service_path: service_path,
+                port: port,
+                channel: channel,
+                chan_creds: chan_creds,
+                updater_proc: updater_proc,
+                credentials: credentials,
+                scopes: scopes,
+                client_config: client_config,
+                timeout: timeout,
+                lib_name: lib_name,
+                lib_version: lib_version
+              }.select { |_, v| v != nil }
+              Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.new(**kwargs)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/spanner/admin/database/v1/database_admin_client.rb

@@ -30,6 +30,7 @@ require "google/gax/operation"
 require "google/longrunning/operations_client"
 
 require "google/spanner/admin/database/v1/spanner_database_admin_pb"
+require "google/cloud/spanner/admin/database/credentials"
 
 module Google
   module Cloud
@@ -108,50 +109,24 @@ module Google
                 )
               end
 
-              # Parses the project from a instance resource.
-              # @param instance_name [String]
-              # @return [String]
-              def self.match_project_from_instance_name instance_name
-                INSTANCE_PATH_TEMPLATE.match(instance_name)["project"]
-              end
-
-              # Parses the instance from a instance resource.
-              # @param instance_name [String]
-              # @return [String]
-              def self.match_instance_from_instance_name instance_name
-                INSTANCE_PATH_TEMPLATE.match(instance_name)["instance"]
-              end
-
-              # Parses the project from a database resource.
-              # @param database_name [String]
-              # @return [String]
-              def self.match_project_from_database_name database_name
-                DATABASE_PATH_TEMPLATE.match(database_name)["project"]
-              end
-
-              # Parses the instance from a database resource.
-              # @param database_name [String]
-              # @return [String]
-              def self.match_instance_from_database_name database_name
-                DATABASE_PATH_TEMPLATE.match(database_name)["instance"]
-              end
-
-              # Parses the database from a database resource.
-              # @param database_name [String]
-              # @return [String]
-              def self.match_database_from_database_name database_name
-                DATABASE_PATH_TEMPLATE.match(database_name)["database"]
-              end
-
-              # @param service_path [String]
-              #   The domain name of the API remote host.
-              # @param port [Integer]
-              #   The port on which to connect to the remote host.
-              # @param channel [Channel]
-              #   A Channel object through which to make calls.
-              # @param chan_creds [Grpc::ChannelCredentials]
-              #   A ChannelCredentials for the setting up the RPC client.
-              # @param client_config[Hash]
+              # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+              #   Provides the means for authenticating requests made by the client. This parameter can
+              #   be many types.
+              #   A `Google::Auth::Credentials` uses a the properties of its represented keyfile for
+              #   authenticating requests made by this client.
+              #   A `String` will be treated as the path to the keyfile to be used for the construction of
+              #   credentials for this client.
+              #   A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+              #   credentials for this client.
+              #   A `GRPC::Core::Channel` will be used to make calls through.
+              #   A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+              #   should already be composed with a `GRPC::Core::CallCredentials` object.
+              #   A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+              #   metadata for requests, generally, to give OAuth credentials.
+              # @param scopes [Array<String>]
+              #   The OAuth scopes for this service. This parameter is ignored if
+              #   an updater_proc is supplied.
+              # @param client_config [Hash]
               #   A Hash for call options for each method. See
               #   Google::Gax#construct_settings for the structure of
               #   this data. Falls back to the default config if not specified
@@ -163,11 +138,11 @@ module Google
                   port: DEFAULT_SERVICE_PORT,
                   channel: nil,
                   chan_creds: nil,
+                  updater_proc: nil,
+                  credentials: nil,
                   scopes: ALL_SCOPES,
                   client_config: {},
                   timeout: DEFAULT_TIMEOUT,
-                  app_name: nil,
-                  app_version: nil,
                   lib_name: nil,
                   lib_version: ""
                 # These require statements are intentionally placed here to initialize
@@ -176,27 +151,48 @@ module Google
                 require "google/gax/grpc"
                 require "google/spanner/admin/database/v1/spanner_database_admin_services_pb"
 
+                if channel || chan_creds || updater_proc
+                  warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
+                    "on 2017/09/08"
+                  credentials ||= channel
+                  credentials ||= chan_creds
+                  credentials ||= updater_proc
+                end
+                if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
+                  warn "`service_path` and `port` parameters are deprecated and will be removed"
+                end
+
+                credentials ||= Google::Cloud::Spanner::Admin::Database::Credentials.default
+
                 @operations_client = Google::Longrunning::OperationsClient.new(
                   service_path: service_path,
-                  port: port,
-                  channel: channel,
-                  chan_creds: chan_creds,
+                  credentials: credentials,
                   scopes: scopes,
                   client_config: client_config,
                   timeout: timeout,
-                  app_name: app_name,
-                  app_version: app_version,
                   lib_name: lib_name,
                   lib_version: lib_version,
                 )
 
-                if app_name || app_version
-                  warn "`app_name` and `app_version` are no longer being used in the request headers."
+                if credentials.is_a?(String) || credentials.is_a?(Hash)
+                  updater_proc = Google::Cloud::Spanner::Admin::Database::Credentials.new(credentials).updater_proc
+                end
+                if credentials.is_a?(GRPC::Core::Channel)
+                  channel = credentials
+                end
+                if credentials.is_a?(GRPC::Core::ChannelCredentials)
+                  chan_creds = credentials
+                end
+                if credentials.is_a?(Proc)
+                  updater_proc = credentials
+                end
+                if credentials.is_a?(Google::Auth::Credentials)
+                  updater_proc = credentials.updater_proc
                 end
 
                 google_api_client = "gl-ruby/#{RUBY_VERSION}"
                 google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-                google_api_client << " gapic/0.6.8 gax/#{Google::Gax::VERSION}"
+                google_api_client << " gapic/0.1.0 gax/#{Google::Gax::VERSION}"
                 google_api_client << " grpc/#{GRPC::VERSION}"
                 google_api_client.freeze
 
@@ -221,6 +217,7 @@ module Google
                   port,
                   chan_creds: chan_creds,
                   channel: channel,
+                  updater_proc: updater_proc,
                   scopes: scopes,
                   &Google::Spanner::Admin::Database::V1::DatabaseAdmin::Stub.method(:new)
                 )
@@ -286,12 +283,10 @@ module Google
               #   object.
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
-              #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_parent = DatabaseAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_parent = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
               #
               #   # Iterate over all results.
               #   database_admin_client.list_databases(formatted_parent).each do |element|
@@ -310,21 +305,22 @@ module Google
                   parent,
                   page_size: nil,
                   options: nil
-                req = Google::Spanner::Admin::Database::V1::ListDatabasesRequest.new({
+                req = {
                   parent: parent,
                   page_size: page_size
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Spanner::Admin::Database::V1::ListDatabasesRequest)
                 @list_databases.call(req, options)
               end
 
               # Creates a new Cloud Spanner database and starts to prepare it for serving.
-              # The returned Long-running operation will
+              # The returned {Google::Longrunning::Operation long-running operation} will
               # have a name of the format +<database_name>/operations/<operation_id>+ and
               # can be used to track preparation of the database. The
-              # Metadata field type is
-              # CreateDatabaseMetadata. The
-              # Response field type is
-              # Database, if successful.
+              # {Google::Longrunning::Operation#metadata metadata} field type is
+              # {Google::Spanner::Admin::Database::V1::CreateDatabaseMetadata CreateDatabaseMetadata}. The
+              # {Google::Longrunning::Operation#response response} field type is
+              # {Google::Spanner::Admin::Database::V1::Database Database}, if successful.
               #
               # @param parent [String]
               #   Required. The name of the instance that will serve the new database.
@@ -333,6 +329,8 @@ module Google
               #   Required. A +CREATE DATABASE+ statement, which specifies the ID of the
               #   new database.  The database ID must conform to the regular expression
               #   +[a-z][a-z0-9_\-]*[a-z0-9]+ and be between 2 and 30 characters in length.
+              #   If the database ID is a reserved word or if it contains a hyphen, the
+              #   database ID must be enclosed in backticks (+ + +).
               # @param extra_statements [Array<String>]
               #   An optional list of DDL statements to run inside the newly created
               #   database. Statements can create tables, indexes, etc. These
@@ -344,12 +342,10 @@ module Google
               # @return [Google::Gax::Operation]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
-              #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_parent = DatabaseAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_parent = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.instance_path("[PROJECT]", "[INSTANCE]")
               #   create_statement = ''
               #
               #   # Register a callback during the method call.
@@ -384,11 +380,12 @@ module Google
                   create_statement,
                   extra_statements: nil,
                   options: nil
-                req = Google::Spanner::Admin::Database::V1::CreateDatabaseRequest.new({
+                req = {
                   parent: parent,
                   create_statement: create_statement,
                   extra_statements: extra_statements
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Spanner::Admin::Database::V1::CreateDatabaseRequest)
                 operation = Google::Gax::Operation.new(
                   @create_database.call(req, options),
                   @operations_client,
@@ -411,30 +408,29 @@ module Google
               # @return [Google::Spanner::Admin::Database::V1::Database]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
-              #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_name = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_name = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
               #   response = database_admin_client.get_database(formatted_name)
 
               def get_database \
                   name,
                   options: nil
-                req = Google::Spanner::Admin::Database::V1::GetDatabaseRequest.new({
+                req = {
                   name: name
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Spanner::Admin::Database::V1::GetDatabaseRequest)
                 @get_database.call(req, options)
               end
 
               # Updates the schema of a Cloud Spanner database by
               # creating/altering/dropping tables, columns, indexes, etc. The returned
-              # Long-running operation will have a name of
+              # {Google::Longrunning::Operation long-running operation} will have a name of
               # the format +<database_name>/operations/<operation_id>+ and can be used to
               # track execution of the schema change(s). The
-              # Metadata field type is
-              # UpdateDatabaseDdlMetadata.  The operation has no response.
+              # {Google::Longrunning::Operation#metadata metadata} field type is
+              # {Google::Spanner::Admin::Database::V1::UpdateDatabaseDdlMetadata UpdateDatabaseDdlMetadata}.  The operation has no response.
               #
               # @param database [String]
               #   Required. The database to update.
@@ -444,21 +440,21 @@ module Google
               #   If empty, the new update request is assigned an
               #   automatically-generated operation ID. Otherwise, +operation_id+
               #   is used to construct the name of the resulting
-              #   Operation.
+              #   {Google::Longrunning::Operation Operation}.
               #
               #   Specifying an explicit operation ID simplifies determining
               #   whether the statements were executed in the event that the
-              #   UpdateDatabaseDdl call is replayed,
-              #   or the return value is otherwise lost: the Database and
+              #   {Google::Spanner::Admin::Database::V1::DatabaseAdmin::UpdateDatabaseDdl UpdateDatabaseDdl} call is replayed,
+              #   or the return value is otherwise lost: the {Google::Spanner::Admin::Database::V1::UpdateDatabaseDdlRequest#database database} and
               #   +operation_id+ fields can be combined to form the
-              #   Name of the resulting
-              #   Longrunning::Operation: +<database>/operations/<operation_id>+.
+              #   {Google::Longrunning::Operation#name name} of the resulting
+              #   {Google::Longrunning::Operation longrunning::Operation}: +<database>/operations/<operation_id>+.
               #
               #   +operation_id+ should be unique within the database, and must be
               #   a valid identifier: +[a-z][a-z0-9_]*+. Note that
               #   automatically-generated operation IDs always begin with an
               #   underscore. If the named operation already exists,
-              #   UpdateDatabaseDdl returns
+              #   {Google::Spanner::Admin::Database::V1::DatabaseAdmin::UpdateDatabaseDdl UpdateDatabaseDdl} returns
               #   +ALREADY_EXISTS+.
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
@@ -466,12 +462,10 @@ module Google
               # @return [Google::Gax::Operation]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
-              #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_database = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_database = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
               #   statements = []
               #
               #   # Register a callback during the method call.
@@ -506,11 +500,12 @@ module Google
                   statements,
                   operation_id: nil,
                   options: nil
-                req = Google::Spanner::Admin::Database::V1::UpdateDatabaseDdlRequest.new({
+                req = {
                   database: database,
                   statements: statements,
                   operation_id: operation_id
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Spanner::Admin::Database::V1::UpdateDatabaseDdlRequest)
                 operation = Google::Gax::Operation.new(
                   @update_database_ddl.call(req, options),
                   @operations_client,
@@ -531,27 +526,26 @@ module Google
               #   retries, etc.
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
-              #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_database = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_database = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
               #   database_admin_client.drop_database(formatted_database)
 
               def drop_database \
                   database,
                   options: nil
-                req = Google::Spanner::Admin::Database::V1::DropDatabaseRequest.new({
+                req = {
                   database: database
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Spanner::Admin::Database::V1::DropDatabaseRequest)
                 @drop_database.call(req, options)
                 nil
               end
 
               # Returns the schema of a Cloud Spanner database as a list of formatted
               # DDL statements. This method does not show pending schema updates, those may
-              # be queried using the Operations API.
+              # be queried using the {Google::Longrunning::Operations Operations} API.
               #
               # @param database [String]
               #   Required. The database whose schema we wish to get.
@@ -561,20 +555,19 @@ module Google
               # @return [Google::Spanner::Admin::Database::V1::GetDatabaseDdlResponse]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
-              #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_database = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_database = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
               #   response = database_admin_client.get_database_ddl(formatted_database)
 
               def get_database_ddl \
                   database,
                   options: nil
-                req = Google::Spanner::Admin::Database::V1::GetDatabaseDdlRequest.new({
+                req = {
                   database: database
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Spanner::Admin::Database::V1::GetDatabaseDdlRequest)
                 @get_database_ddl.call(req, options)
               end
 
@@ -582,41 +575,41 @@ module Google
               # existing policy.
               #
               # Authorization requires +spanner.databases.setIamPolicy+ permission on
-              # Resource.
+              # {Google::Iam::V1::SetIamPolicyRequest#resource resource}.
               #
               # @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}+.
-              # @param policy [Google::Iam::V1::Policy]
+              # @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
               #   valid policy but certain Cloud Platform services (such as Projects)
               #   might reject them.
+              #   A hash of the same form as `Google::Iam::V1::Policy`
+              #   can also be provided.
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
               # @return [Google::Iam::V1::Policy]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
-              #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
-              #   Policy = Google::Iam::V1::Policy
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_resource = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
-              #   policy = Policy.new
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_resource = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   policy = {}
               #   response = database_admin_client.set_iam_policy(formatted_resource, policy)
 
               def set_iam_policy \
                   resource,
                   policy,
                   options: nil
-                req = Google::Iam::V1::SetIamPolicyRequest.new({
+                req = {
                   resource: resource,
                   policy: policy
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Iam::V1::SetIamPolicyRequest)
                 @set_iam_policy.call(req, options)
               end
 
@@ -624,7 +617,7 @@ module Google
               # policy if a database exists but does not have a policy set.
               #
               # Authorization requires +spanner.databases.getIamPolicy+ permission on
-              # Resource.
+              # {Google::Iam::V1::GetIamPolicyRequest#resource resource}.
               #
               # @param resource [String]
               #   REQUIRED: The resource for which the policy is being requested.
@@ -636,20 +629,19 @@ module Google
               # @return [Google::Iam::V1::Policy]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
-              #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_resource = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_resource = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
               #   response = database_admin_client.get_iam_policy(formatted_resource)
 
               def get_iam_policy \
                   resource,
                   options: nil
-                req = Google::Iam::V1::GetIamPolicyRequest.new({
+                req = {
                   resource: resource
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Iam::V1::GetIamPolicyRequest)
                 @get_iam_policy.call(req, options)
               end
 
@@ -668,19 +660,17 @@ module Google
               #   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].
+              #   [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
               # @param options [Google::Gax::CallOptions]
               #   Overrides the default settings for this call, e.g, timeout,
               #   retries, etc.
               # @return [Google::Iam::V1::TestIamPermissionsResponse]
               # @raise [Google::Gax::GaxError] if the RPC is aborted.
               # @example
-              #   require "google/cloud/spanner/admin/database/v1/database_admin_client"
-              #
-              #   DatabaseAdminClient = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient
+              #   require "google/cloud/spanner/admin/database/v1"
               #
-              #   database_admin_client = DatabaseAdminClient.new
-              #   formatted_resource = DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
+              #   database_admin_client = Google::Cloud::Spanner::Admin::Database::V1.new
+              #   formatted_resource = Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdminClient.database_path("[PROJECT]", "[INSTANCE]", "[DATABASE]")
               #   permissions = []
               #   response = database_admin_client.test_iam_permissions(formatted_resource, permissions)
 
@@ -688,10 +678,11 @@ module Google
                   resource,
                   permissions,
                   options: nil
-                req = Google::Iam::V1::TestIamPermissionsRequest.new({
+                req = {
                   resource: resource,
                   permissions: permissions
-                }.delete_if { |_, v| v.nil? })
+                }.delete_if { |_, v| v.nil? }
+                req = Google::Gax::to_proto(req, Google::Iam::V1::TestIamPermissionsRequest)
                 @test_iam_permissions.call(req, options)
               end
             end