google-cloud-datastore 1.7.2 → 2.0.0

data/lib/google/cloud/datastore/service.rb

@@ -17,7 +17,6 @@ require "google/cloud/errors"
 require "google/cloud/datastore/credentials"
 require "google/cloud/datastore/version"
 require "google/cloud/datastore/v1"
-require "google/gax/errors"
 
 module Google
   module Cloud
@@ -26,59 +25,35 @@ module Google
       # @private Represents the GAX Datastore service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :host, :timeout, :client_config
+        attr_accessor :project, :credentials, :host, :timeout
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, timeout: nil,
-                       client_config: nil
+        def initialize project, credentials, host: nil, timeout: nil
           @project = project
           @credentials = credentials
-          @host = host || V1::DatastoreClient::SERVICE_ADDRESS
+          @host = host
           @timeout = timeout
-          @client_config = client_config || {}
-        end
-
-        def channel
-          require "grpc"
-          GRPC::Core::Channel.new host, chan_args, chan_creds
-        end
-
-        def chan_args
-          { "grpc.service_config_disable_resolution" => 1 }
-        end
-
-        def chan_creds
-          return credentials if insecure?
-          require "grpc"
-          GRPC::Core::ChannelCredentials.new.compose \
-            GRPC::Core::CallCredentials.new credentials.client.updater_proc
         end
 
         def service
           return mocked_service if mocked_service
-          @service ||= V1::DatastoreClient.new(
-            credentials: channel,
-            timeout: timeout,
-            client_config: client_config,
-            lib_name: "gccl",
-            lib_version: Google::Cloud::Datastore::VERSION
-          )
+          @service ||= V1::Datastore::Client.new do |config|
+            config.credentials = credentials if credentials
+            config.timeout = timeout if timeout
+            config.endpoint = host if host
+            config.lib_name = "gccl"
+            config.lib_version = Google::Cloud::Datastore::VERSION
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+          end
         end
         attr_accessor :mocked_service
 
-        def insecure?
-          credentials == :this_channel_is_insecure
-        end
-
         ##
         # Allocate IDs for incomplete keys.
         # (This is useful for referencing an entity before it is inserted.)
         def allocate_ids *incomplete_keys
-          execute do
-            service.allocate_ids project, incomplete_keys,
-                                 options: default_options
-          end
+          service.allocate_ids project_id: project, keys: incomplete_keys
         end
 
         ##
@@ -86,76 +61,61 @@ module Google
         def lookup *keys, consistency: nil, transaction: nil
           read_options = generate_read_options consistency, transaction
 
-          execute do
-            service.lookup project, keys,
-                           read_options: read_options, options: default_options
-          end
+          service.lookup project_id: project, keys: keys, read_options: read_options
         end
 
         # Query for entities.
         def run_query query, namespace = nil, consistency: nil, transaction: nil
           gql_query = nil
-          if query.is_a? Google::Datastore::V1::GqlQuery
+          if query.is_a? Google::Cloud::Datastore::V1::GqlQuery
             gql_query = query
             query = nil
           end
           read_options = generate_read_options consistency, transaction
           if namespace
-            partition_id = Google::Datastore::V1::PartitionId.new(
+            partition_id = Google::Cloud::Datastore::V1::PartitionId.new(
               namespace_id: namespace
             )
           end
 
-          execute do
-            service.run_query project, partition_id: partition_id,
-                                       read_options: read_options,
-                                       query: query,
-                                       gql_query: gql_query,
-                                       options: default_options
-          end
+          service.run_query project_id: project,
+                            partition_id: partition_id,
+                            read_options: read_options,
+                            query: query,
+                            gql_query: gql_query
         end
 
         ##
         # Begin a new transaction.
         def begin_transaction read_only: nil, previous_transaction: nil
           if read_only
-            transaction_options = Google::Datastore::V1::TransactionOptions.new
+            transaction_options = Google::Cloud::Datastore::V1::TransactionOptions.new
             transaction_options.read_only = \
-              Google::Datastore::V1::TransactionOptions::ReadOnly.new
+              Google::Cloud::Datastore::V1::TransactionOptions::ReadOnly.new
           end
           if previous_transaction
             transaction_options ||= \
-              Google::Datastore::V1::TransactionOptions.new
-            rw = Google::Datastore::V1::TransactionOptions::ReadWrite.new(
+              Google::Cloud::Datastore::V1::TransactionOptions.new
+            rw = Google::Cloud::Datastore::V1::TransactionOptions::ReadWrite.new(
               previous_transaction: previous_transaction.encode("ASCII-8BIT")
             )
             transaction_options.read_write = rw
           end
-          execute do
-            service.begin_transaction project,
-                                      transaction_options: transaction_options
-          end
+          service.begin_transaction project_id: project, transaction_options: transaction_options
         end
 
         ##
         # Commit a transaction, optionally creating, deleting or modifying
         # some entities.
         def commit mutations, transaction: nil
-          mode =  transaction.nil? ? :NON_TRANSACTIONAL : :TRANSACTIONAL
-          execute do
-            service.commit project, mode: mode,
-                                    mutations: mutations,
-                                    transaction: transaction,
-                                    options: default_options
-          end
+          mode = transaction.nil? ? :NON_TRANSACTIONAL : :TRANSACTIONAL
+          service.commit project_id: project, mode: mode, mutations: mutations, transaction: transaction
         end
 
         ##
         # Roll back a transaction.
         def rollback transaction
-          execute do
-            service.rollback project, transaction, options: default_options
-          end
+          service.rollback project_id: project, transaction: transaction
         end
 
         def inspect
@@ -166,35 +126,20 @@ module Google
 
         def generate_read_options consistency, transaction
           if consistency == :eventual
-            return Google::Datastore::V1::ReadOptions.new(
+            return Google::Cloud::Datastore::V1::ReadOptions.new(
               read_consistency: :EVENTUAL
             )
           elsif consistency == :strong
-            return Google::Datastore::V1::ReadOptions.new(
+            return Google::Cloud::Datastore::V1::ReadOptions.new(
               read_consistency: :STRONG
             )
           elsif transaction
-            return Google::Datastore::V1::ReadOptions.new(
+            return Google::Cloud::Datastore::V1::ReadOptions.new(
               transaction: transaction
             )
           end
           nil
         end
-
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
-        end
-
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        end
-
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
-        end
       end
     end
   end

data/lib/google/cloud/datastore/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Datastore
-      VERSION = "1.7.2".freeze
+      VERSION = "2.0.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-datastore
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,68 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: google-gax
+  name: google-cloud-datastore-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -255,22 +215,7 @@ files:
 - lib/google/cloud/datastore/read_only_transaction.rb
 - lib/google/cloud/datastore/service.rb
 - lib/google/cloud/datastore/transaction.rb
-- lib/google/cloud/datastore/v1.rb
-- lib/google/cloud/datastore/v1/credentials.rb
-- lib/google/cloud/datastore/v1/datastore_client.rb
-- lib/google/cloud/datastore/v1/datastore_client_config.json
-- lib/google/cloud/datastore/v1/doc/google/datastore/v1/datastore.rb
-- lib/google/cloud/datastore/v1/doc/google/datastore/v1/entity.rb
-- lib/google/cloud/datastore/v1/doc/google/datastore/v1/query.rb
-- lib/google/cloud/datastore/v1/doc/google/protobuf/struct.rb
-- lib/google/cloud/datastore/v1/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/datastore/v1/doc/google/protobuf/wrappers.rb
-- lib/google/cloud/datastore/v1/doc/google/type/latlng.rb
 - lib/google/cloud/datastore/version.rb
-- lib/google/datastore/v1/datastore_pb.rb
-- lib/google/datastore/v1/datastore_services_pb.rb
-- lib/google/datastore/v1/entity_pb.rb
-- lib/google/datastore/v1/query_pb.rb
 homepage: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-datastore
 licenses:
 - Apache-2.0
@@ -290,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Datastore

data/lib/google/cloud/datastore/v1.rb

@@ -1,16 +0,0 @@
-# Copyright 2016 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 "google/cloud/datastore/v1/datastore_client"

data/lib/google/cloud/datastore/v1/credentials.rb

@@ -1,39 +0,0 @@
-# Copyright 2019 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 Datastore
-      module V1
-        class Credentials < Google::Auth::Credentials
-          SCOPE = ["https://www.googleapis.com/auth/datastore"].freeze
-          PATH_ENV_VARS = %w(DATASTORE_CREDENTIALS
-                             DATASTORE_KEYFILE
-                             GOOGLE_CLOUD_CREDENTIALS
-                             GOOGLE_CLOUD_KEYFILE
-                             GCLOUD_KEYFILE)
-          JSON_ENV_VARS = %w(DATASTORE_CREDENTIALS_JSON
-                             DATASTORE_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

data/lib/google/cloud/datastore/v1/datastore_client.rb

@@ -1,574 +0,0 @@
-# Copyright 2019 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.
-#
-# EDITING INSTRUCTIONS
-# This file was generated from the file
-# https://github.com/googleapis/googleapis/blob/master/google/datastore/v1/datastore.proto,
-# 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.
-
-
-require "json"
-require "pathname"
-
-require "google/gax"
-
-require "google/datastore/v1/datastore_pb"
-require "google/cloud/datastore/v1/credentials"
-require "google/cloud/datastore/version"
-
-module Google
-  module Cloud
-    module Datastore
-      module V1
-        # Each RPC normalizes the partition IDs of the keys in its input entities,
-        # and always returns entities with keys with normalized partition IDs.
-        # This applies to all keys and entities, including those in values, except keys
-        # with both an empty path and an empty or unset partition ID. Normalization of
-        # input keys sets the project ID (if not already set) to the project ID from
-        # the request.
-        #
-        # @!attribute [r] datastore_stub
-        #   @return [Google::Datastore::V1::Datastore::Stub]
-        class DatastoreClient
-          # @private
-          attr_reader :datastore_stub
-
-          # The default address of the service.
-          SERVICE_ADDRESS = "datastore.googleapis.com".freeze
-
-          # The default port of the service.
-          DEFAULT_SERVICE_PORT = 443
-
-          # The default set of gRPC interceptors.
-          GRPC_INTERCEPTORS = []
-
-          DEFAULT_TIMEOUT = 30
-
-          # The scopes needed to make gRPC calls to all of the methods defined in
-          # this service.
-          ALL_SCOPES = [
-            "https://www.googleapis.com/auth/cloud-platform",
-            "https://www.googleapis.com/auth/datastore"
-          ].freeze
-
-
-          # @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.
-          # @param metadata [Hash]
-          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
-          # @param service_address [String]
-          #   Override for the service hostname, or `nil` to leave as the default.
-          # @param service_port [Integer]
-          #   Override for the service port, or `nil` to leave as the default.
-          # @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,
-              service_address: nil,
-              service_port: nil,
-              exception_transformer: nil,
-              lib_name: nil,
-              lib_version: ""
-            # These require statements are intentionally placed here to initialize
-            # the gRPC module only when it's required.
-            # See https://github.com/googleapis/toolkit/issues/446
-            require "google/gax/grpc"
-            require "google/datastore/v1/datastore_services_pb"
-
-            credentials ||= Google::Cloud::Datastore::V1::Credentials.default
-
-            if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Datastore::V1::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
-
-            package_version = Google::Cloud::Datastore::VERSION
-
-            google_api_client = "gl-ruby/#{RUBY_VERSION}"
-            google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/#{package_version} gax/#{Google::Gax::VERSION}"
-            google_api_client << " grpc/#{GRPC::VERSION}"
-            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(
-              "datastore_client_config.json"
-            )
-            defaults = client_config_file.open do |f|
-              Google::Gax.construct_settings(
-                "google.datastore.v1.Datastore",
-                JSON.parse(f.read),
-                client_config,
-                Google::Gax::Grpc::STATUS_CODE_NAMES,
-                timeout,
-                errors: Google::Gax::Grpc::API_ERRORS,
-                metadata: headers
-              )
-            end
-
-            # Allow overriding the service path/port in subclasses.
-            service_path = service_address || self.class::SERVICE_ADDRESS
-            port = service_port || self.class::DEFAULT_SERVICE_PORT
-            interceptors = self.class::GRPC_INTERCEPTORS
-            @datastore_stub = Google::Gax::Grpc.create_stub(
-              service_path,
-              port,
-              chan_creds: chan_creds,
-              channel: channel,
-              updater_proc: updater_proc,
-              scopes: scopes,
-              interceptors: interceptors,
-              &Google::Datastore::V1::Datastore::Stub.method(:new)
-            )
-
-            @lookup = Google::Gax.create_api_call(
-              @datastore_stub.method(:lookup),
-              defaults["lookup"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-            @run_query = Google::Gax.create_api_call(
-              @datastore_stub.method(:run_query),
-              defaults["run_query"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-            @begin_transaction = Google::Gax.create_api_call(
-              @datastore_stub.method(:begin_transaction),
-              defaults["begin_transaction"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-            @commit = Google::Gax.create_api_call(
-              @datastore_stub.method(:commit),
-              defaults["commit"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-            @rollback = Google::Gax.create_api_call(
-              @datastore_stub.method(:rollback),
-              defaults["rollback"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-            @allocate_ids = Google::Gax.create_api_call(
-              @datastore_stub.method(:allocate_ids),
-              defaults["allocate_ids"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-            @reserve_ids = Google::Gax.create_api_call(
-              @datastore_stub.method(:reserve_ids),
-              defaults["reserve_ids"],
-              exception_transformer: exception_transformer,
-              params_extractor: proc do |request|
-                {'project_id' => request.project_id}
-              end
-            )
-          end
-
-          # Service calls
-
-          # Looks up entities by key.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param keys [Array<Google::Datastore::V1::Key | Hash>]
-          #   Required. Keys of entities to look up.
-          #   A hash of the same form as `Google::Datastore::V1::Key`
-          #   can also be provided.
-          # @param read_options [Google::Datastore::V1::ReadOptions | Hash]
-          #   The options for this lookup request.
-          #   A hash of the same form as `Google::Datastore::V1::ReadOptions`
-          #   can also be provided.
-          # @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::Datastore::V1::LookupResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::LookupResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #
-          #   # TODO: Initialize `keys`:
-          #   keys = []
-          #   response = datastore_client.lookup(project_id, keys)
-
-          def lookup \
-              project_id,
-              keys,
-              read_options: nil,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              keys: keys,
-              read_options: read_options
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::LookupRequest)
-            @lookup.call(req, options, &block)
-          end
-
-          # Queries for entities.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param partition_id [Google::Datastore::V1::PartitionId | Hash]
-          #   Entities are partitioned into subsets, identified by a partition ID.
-          #   Queries are scoped to a single partition.
-          #   This partition ID is normalized with the standard default context
-          #   partition ID.
-          #   A hash of the same form as `Google::Datastore::V1::PartitionId`
-          #   can also be provided.
-          # @param read_options [Google::Datastore::V1::ReadOptions | Hash]
-          #   The options for this query.
-          #   A hash of the same form as `Google::Datastore::V1::ReadOptions`
-          #   can also be provided.
-          # @param query [Google::Datastore::V1::Query | Hash]
-          #   The query to run.
-          #   A hash of the same form as `Google::Datastore::V1::Query`
-          #   can also be provided.
-          # @param gql_query [Google::Datastore::V1::GqlQuery | Hash]
-          #   The GQL query to run.
-          #   A hash of the same form as `Google::Datastore::V1::GqlQuery`
-          #   can also be provided.
-          # @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::Datastore::V1::RunQueryResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::RunQueryResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #   response = datastore_client.run_query(project_id)
-
-          def run_query \
-              project_id,
-              partition_id: nil,
-              read_options: nil,
-              query: nil,
-              gql_query: nil,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              partition_id: partition_id,
-              read_options: read_options,
-              query: query,
-              gql_query: gql_query
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::RunQueryRequest)
-            @run_query.call(req, options, &block)
-          end
-
-          # Begins a new transaction.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param transaction_options [Google::Datastore::V1::TransactionOptions | Hash]
-          #   Options for a new transaction.
-          #   A hash of the same form as `Google::Datastore::V1::TransactionOptions`
-          #   can also be provided.
-          # @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::Datastore::V1::BeginTransactionResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::BeginTransactionResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #   response = datastore_client.begin_transaction(project_id)
-
-          def begin_transaction \
-              project_id,
-              transaction_options: nil,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              transaction_options: transaction_options
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::BeginTransactionRequest)
-            @begin_transaction.call(req, options, &block)
-          end
-
-          # Commits a transaction, optionally creating, deleting or modifying some
-          # entities.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param mode [Google::Datastore::V1::CommitRequest::Mode]
-          #   The type of commit to perform. Defaults to `TRANSACTIONAL`.
-          # @param transaction [String]
-          #   The identifier of the transaction associated with the commit. A
-          #   transaction identifier is returned by a call to
-          #   {Google::Datastore::V1::Datastore::BeginTransaction Datastore::BeginTransaction}.
-          # @param mutations [Array<Google::Datastore::V1::Mutation | Hash>]
-          #   The mutations to perform.
-          #
-          #   When mode is `TRANSACTIONAL`, mutations affecting a single entity are
-          #   applied in order. The following sequences of mutations affecting a single
-          #   entity are not permitted in a single `Commit` request:
-          #
-          #   * `insert` followed by `insert`
-          #   * `update` followed by `insert`
-          #   * `upsert` followed by `insert`
-          #   * `delete` followed by `update`
-          #
-          #   When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
-          #   entity.
-          #   A hash of the same form as `Google::Datastore::V1::Mutation`
-          #   can also be provided.
-          # @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::Datastore::V1::CommitResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::CommitResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #   response = datastore_client.commit(project_id)
-
-          def commit \
-              project_id,
-              mode: nil,
-              transaction: nil,
-              mutations: nil,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              mode: mode,
-              transaction: transaction,
-              mutations: mutations
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::CommitRequest)
-            @commit.call(req, options, &block)
-          end
-
-          # Rolls back a transaction.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param transaction [String]
-          #   Required. The transaction identifier, returned by a call to
-          #   {Google::Datastore::V1::Datastore::BeginTransaction Datastore::BeginTransaction}.
-          # @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::Datastore::V1::RollbackResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::RollbackResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #
-          #   # TODO: Initialize `transaction`:
-          #   transaction = ''
-          #   response = datastore_client.rollback(project_id, transaction)
-
-          def rollback \
-              project_id,
-              transaction,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              transaction: transaction
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::RollbackRequest)
-            @rollback.call(req, options, &block)
-          end
-
-          # Allocates IDs for the given keys, which is useful for referencing an entity
-          # before it is inserted.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param keys [Array<Google::Datastore::V1::Key | Hash>]
-          #   Required. A list of keys with incomplete key paths for which to allocate IDs.
-          #   No key may be reserved/read-only.
-          #   A hash of the same form as `Google::Datastore::V1::Key`
-          #   can also be provided.
-          # @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::Datastore::V1::AllocateIdsResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::AllocateIdsResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #
-          #   # TODO: Initialize `keys`:
-          #   keys = []
-          #   response = datastore_client.allocate_ids(project_id, keys)
-
-          def allocate_ids \
-              project_id,
-              keys,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              keys: keys
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::AllocateIdsRequest)
-            @allocate_ids.call(req, options, &block)
-          end
-
-          # Prevents the supplied keys' IDs from being auto-allocated by Cloud
-          # Datastore.
-          #
-          # @param project_id [String]
-          #   Required. The ID of the project against which to make the request.
-          # @param keys [Array<Google::Datastore::V1::Key | Hash>]
-          #   Required. A list of keys with complete key paths whose numeric IDs should not be
-          #   auto-allocated.
-          #   A hash of the same form as `Google::Datastore::V1::Key`
-          #   can also be provided.
-          # @param database_id [String]
-          #   If not empty, the ID of the database against which to make the request.
-          # @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::Datastore::V1::ReserveIdsResponse]
-          # @yieldparam operation [GRPC::ActiveCall::Operation]
-          # @return [Google::Datastore::V1::ReserveIdsResponse]
-          # @raise [Google::Gax::GaxError] if the RPC is aborted.
-          # @example
-          #   require "google/cloud/datastore"
-          #
-          #   datastore_client = Google::Cloud::Datastore.new(version: :v1)
-          #
-          #   # TODO: Initialize `project_id`:
-          #   project_id = ''
-          #
-          #   # TODO: Initialize `keys`:
-          #   keys = []
-          #   response = datastore_client.reserve_ids(project_id, keys)
-
-          def reserve_ids \
-              project_id,
-              keys,
-              database_id: nil,
-              options: nil,
-              &block
-            req = {
-              project_id: project_id,
-              keys: keys,
-              database_id: database_id
-            }.delete_if { |_, v| v.nil? }
-            req = Google::Gax::to_proto(req, Google::Datastore::V1::ReserveIdsRequest)
-            @reserve_ids.call(req, options, &block)
-          end
-        end
-      end
-    end
-  end
-end