google-cloud-spanner 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2f6de02b2dc38f872be9ecf0b9a538353c23457d7d82277bab5e636420b2a4
-  data.tar.gz: 31e72548e11120e24de11bf932fc5c575478ba5732e21b4610ac42fa3af695ad
+  metadata.gz: a644a78d0458b414ee8e19707abfe33b7d34b730af57feb623053929120d9425
+  data.tar.gz: db692fd3ac651dea2aaa178e4d6a117bb790cb10fb4571a0f991d940a8d558db
 SHA512:
-  metadata.gz: ef87329e6ccc9269a894aafaa179016269ed61a9ebcf338a51faa9a43027fdda825d05b534bda2946a101f9896dc5d98b861e714fc24aa64e5585423c0489548
-  data.tar.gz: 5d7e360cf9678935eb7d295bca0f808c942a217310d5bfb81dbc0eb3357020f2f32e8d40ef2ffa838c8faf56b882592b5d373e4261bb6ec67ec5acdb867920d4
+  metadata.gz: bfbc02dc59071018e559f8062b43dfa3dbd2700ee9da873abce56cdb44ca7a987465e3a567a592f3944a5b16d7995516b34d92be3bf30f810258b5b5c8d6c911
+  data.tar.gz: eb58bcc4cf290b9419fa7ecd627898014f39eed6e18150236e7a62a1623fdbd16f4f8cf135cb483c6f278032f83b019a9ea6478814658a9aa8dd58b9a6fc0b78

data/lib/google/cloud/spanner/batch_client.rb

@@ -65,10 +65,11 @@ module Google
       class BatchClient
         ##
         # @private Creates a new Spanner BatchClient instance.
-        def initialize project, instance_id, database_id
+        def initialize project, instance_id, database_id, session_labels: nil
           @project = project
           @instance_id = instance_id
           @database_id = database_id
+          @session_labels = session_labels
         end
 
         # The unique identifier for the project.
@@ -406,7 +407,8 @@ module Google
           grpc = @project.service.create_session \
             Admin::Database::V1::DatabaseAdminClient.database_path(
               project_id, instance_id, database_id
-            )
+            ),
+            labels: @session_labels
           Session.from_grpc(grpc, @project.service)
         end
 

data/lib/google/cloud/spanner/client.rb

@@ -52,11 +52,13 @@ module Google
       class Client
         ##
         # @private Creates a new Spanner Client instance.
-        def initialize project, instance_id, database_id, opts = {}
+        def initialize project, instance_id, database_id, session_labels: nil,
+                       pool_opts: {}
           @project = project
           @instance_id = instance_id
           @database_id = database_id
-          @pool = Pool.new self, opts
+          @session_labels = session_labels
+          @pool = Pool.new self, pool_opts
         end
 
         # The unique identifier for the project.
@@ -1091,7 +1093,8 @@ module Google
           grpc = @project.service.create_session \
             Admin::Database::V1::DatabaseAdminClient.database_path(
               project_id, instance_id, database_id
-            )
+            ),
+            labels: @session_labels
           Session.from_grpc(grpc, @project.service)
         end
 

data/lib/google/cloud/spanner/project.rb

@@ -219,6 +219,8 @@ module Google
         def create_instance instance_id, name: nil, config: nil, nodes: nil,
                             labels: nil
           config = config.path if config.respond_to? :path
+          # Convert from possible Google::Protobuf::Map
+          labels = Hash[labels.map { |k, v| [String(k), String(v)] }] if labels
           grpc = service.create_instance \
             instance_id, name: name, config: config, nodes: nodes,
                          labels: labels
@@ -435,6 +437,21 @@ module Google
         #     becomes available. The default is `true`.
         #   * `:threads` (Integer) The number of threads in the thread pool. The
         #     default is twice the number of available CPUs.
+        # @param [Hash] labels The labels to be applied to all sessions
+        #   created by the client. Cloud Labels are a flexible and lightweight
+        #   mechanism for organizing cloud resources into groups that reflect a
+        #   customer's organizational needs and deployment strategies. Cloud
+        #   Labels can be used to filter collections of resources. They can be
+        #   used to control how resource metrics are aggregated. And they can be
+        #   used as arguments to policy management rules (e.g. route, firewall,
+        #   load balancing, etc.). Optional. The default is `nil`.
+        #
+        #   * Label keys must be between 1 and 63 characters long and must
+        #     conform to the following regular expression:
+        #     `[a-z]([-a-z0-9]*[a-z0-9])?`.
+        #   * Label values must be between 0 and 63 characters long and must
+        #     conform to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
+        #   * No more than 64 labels can be associated with a given resource.
         #
         # @return [Client] The newly created client.
         #
@@ -453,9 +470,12 @@ module Google
         #     end
         #   end
         #
-        def client instance_id, database_id, pool: {}
+        def client instance_id, database_id, pool: {}, labels: nil
+          # Convert from possible Google::Protobuf::Map
+          labels = Hash[labels.map { |k, v| [String(k), String(v)] }] if labels
           Client.new self, instance_id, database_id,
-                     valid_session_pool_options(pool)
+                     session_labels: labels,
+                     pool_opts: valid_session_pool_options(pool)
         end
 
         ##
@@ -466,6 +486,21 @@ module Google
         #   Required.
         # @param [String] database_id The unique identifier for the database.
         #   Required.
+        # @param [Hash] labels The labels to be applied to all sessions
+        #   created by the batch client. Labels are a flexible and lightweight
+        #   mechanism for organizing cloud resources into groups that reflect a
+        #   customer's organizational needs and deployment strategies. Cloud
+        #   Labels can be used to filter collections of resources. They can be
+        #   used to control how resource metrics are aggregated. And they can be
+        #   used as arguments to policy management rules (e.g. route, firewall,
+        #   load balancing, etc.). Optional. The default is `nil`.
+        #
+        #   * Label keys must be between 1 and 63 characters long and must
+        #     conform to the following regular expression:
+        #     `[a-z]([-a-z0-9]*[a-z0-9])?`.
+        #   * Label values must be between 0 and 63 characters long and must
+        #     conform to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
+        #   * No more than 64 labels can be associated with a given resource.
         #
         # @return [Client] The newly created client.
         #
@@ -494,8 +529,10 @@ module Google
         #   results = new_batch_snapshot.execute_partition \
         #     new_partition
         #
-        def batch_client instance_id, database_id
-          BatchClient.new self, instance_id, database_id
+        def batch_client instance_id, database_id, labels: nil
+          # Convert from possible Google::Protobuf::Map
+          labels = Hash[labels.map { |k, v| [String(k), String(v)] }] if labels
+          BatchClient.new self, instance_id, database_id, session_labels: labels
         end
 
         protected

data/lib/google/cloud/spanner/results.rb

@@ -206,6 +206,8 @@ module Google
             results.instance_variable_set :@enum,     enum
             results.instance_variable_set :@service,  service
           end
+        rescue GRPC::BadStatus => e
+          raise Google::Cloud::Error.from_error(e)
         end
 
         # @private

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

@@ -241,10 +241,12 @@ module Google
           end
         end
 
-        def create_session database_name
+        def create_session database_name, labels: nil
           opts = default_options_from_session database_name
+          session = Google::Spanner::V1::Session.new(labels: labels) if labels
           execute do
-            service.create_session database_name, options: opts
+            service.create_session database_name, session: session,
+                                                  options: opts
           end
         end
 

data/lib/google/cloud/spanner/session.rb

@@ -597,10 +597,12 @@ module Google
           @last_updated_at = Time.now
           return self
         rescue Google::Cloud::NotFoundError
+          labels = @grpc.labels.to_h unless @grpc.labels.to_h.empty?
           @grpc = service.create_session \
             Admin::Database::V1::DatabaseAdminClient.database_path(
               project_id, instance_id, database_id
-            )
+            ),
+            labels: labels
           @last_updated_at = Time.now
           return self
         end
@@ -613,10 +615,12 @@ module Google
           execute "SELECT 1"
           return true
         rescue Google::Cloud::NotFoundError
+          labels = @grpc.labels.to_h unless @grpc.labels.to_h.empty?
           @grpc = service.create_session \
             Admin::Database::V1::DatabaseAdminClient.database_path(
               project_id, instance_id, database_id
-            )
+            ),
+            labels: labels
           return false
         end
 

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Spanner
-      VERSION = "1.5.0".freeze
+      VERSION = "1.6.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-spanner
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core