google-cloud-bigtable 2.6.0 → 2.10.1

data/lib/google/cloud/bigtable/column_family_map.rb

@@ -41,15 +41,15 @@ module Google
       #
       #   bigtable = Google::Cloud::Bigtable.new
       #
-      #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
-      #     cfm.add('cf1', gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5))
-      #     cfm.add('cf2', gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600))
+      #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
+      #     cfm.add "cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5)
+      #     cfm.add "cf2", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
       #
       #     gc_rule = Google::Cloud::Bigtable::GcRule.union(
       #       Google::Cloud::Bigtable::GcRule.max_age(1800),
       #       Google::Cloud::Bigtable::GcRule.max_versions(3)
       #     )
-      #     cfm.add('cf3', gc_rule: gc_rule)
+      #     cfm.add "cf3", gc_rule: gc_rule
       #   end
       #
       #   puts table.column_families
@@ -59,15 +59,15 @@ module Google
       #
       #   bigtable = Google::Cloud::Bigtable.new
       #
-      #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+      #   table = bigtable.table "my-instance", "my-table", perform_lookup: true
       #
       #   table.column_families do |cfm|
       #     cfm.add "cf4", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
       #     cfm.add "cf5", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5)
       #
-      #     rule_1 = Google::Cloud::Bigtable::GcRule.max_versions(3)
-      #     rule_2 = Google::Cloud::Bigtable::GcRule.max_age(600)
-      #     rule_union = Google::Cloud::Bigtable::GcRule.union(rule_1, rule_2)
+      #     rule_1 = Google::Cloud::Bigtable::GcRule.max_versions 3
+      #     rule_2 = Google::Cloud::Bigtable::GcRule.max_age 600
+      #     rule_union = Google::Cloud::Bigtable::GcRule.union rule_1, rule_2
       #     cfm.update "cf2", gc_rule: rule_union
       #
       #     cfm.delete "cf3"
@@ -196,7 +196,7 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+        #   table = bigtable.table "my-instance", "my-table", perform_lookup: true
         #
         #   table.column_families do |column_families|
         #     column_families.add "cf4", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
@@ -237,12 +237,12 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+        #   table = bigtable.table "my-instance", "my-table", perform_lookup: true
         #
         #   table.column_families do |column_families|
-        #     rule_1 = Google::Cloud::Bigtable::GcRule.max_versions(3)
-        #     rule_2 = Google::Cloud::Bigtable::GcRule.max_age(600)
-        #     rule_union = Google::Cloud::Bigtable::GcRule.union(rule_1, rule_2)
+        #     rule_1 = Google::Cloud::Bigtable::GcRule.max_versions 3
+        #     rule_2 = Google::Cloud::Bigtable::GcRule.max_age 600
+        #     rule_union = Google::Cloud::Bigtable::GcRule.union rule_1, rule_2
         #
         #     column_families.update "cf2", gc_rule: rule_union
         #   end
@@ -270,7 +270,7 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+        #   table = bigtable.table "my-instance", "my-table", perform_lookup: true
         #
         #   table.column_families do |column_families|
         #     column_families.delete "cf3"
@@ -331,7 +331,7 @@ module Google
         # @return [Hash]
         #
         def to_grpc_hash
-          Hash[to_grpc.to_a]
+          to_grpc.to_a.to_h
         end
 
         ##
@@ -370,8 +370,7 @@ module Google
           added_keys = @column_families.keys - comparison_map.keys
 
           added_keys.map do |name|
-            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest:: \
-            Modification.new(
+            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification.new(
               id:     name,
               create: @column_families[name]
             )
@@ -394,8 +393,7 @@ module Google
           end
 
           updated_keys.map do |name|
-            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest:: \
-            Modification.new(
+            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification.new(
               id:     name,
               update: @column_families[name]
             )
@@ -415,8 +413,7 @@ module Google
           dropped_keys = comparison_map.keys - @column_families.keys
 
           dropped_keys.map do |name|
-            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest:: \
-            Modification.new(
+            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification.new(
               id:   name,
               drop: true
             )

data/lib/google/cloud/bigtable/column_range.rb

@@ -32,7 +32,7 @@ module Google
       #   require "google/cloud/bigtable"
       #
       #   bigtable = Google::Cloud::Bigtable.new
-      #   table = bigtable.table("my-instance", "my-table")
+      #   table = bigtable.table "my-instance", "my-table"
       #
       #   # Range that includes all qualifiers including "user-001" up until "user-010"
       #   table.new_column_range("cf").from("user-001").to("user-010")
@@ -89,7 +89,7 @@ module Google
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table "my-instance", "my-table"
         #
         #   table.new_column_range("cf").from("qualifier-1")
         #
@@ -97,7 +97,7 @@ module Google
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table "my-instance", "my-table"
         #
         #   table.new_column_range("cf").from("qualifier-1", inclusive: false)
         #
@@ -122,7 +122,7 @@ module Google
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table "my-instance", "my-table"
         #
         #   table.new_column_range("cf").to("qualifier-10", inclusive: true)
         #
@@ -130,7 +130,7 @@ module Google
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table "my-instance", "my-table"
         #
         #   table.new_column_range("cf").to("qualifier-10")
         #
@@ -154,7 +154,7 @@ module Google
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table "my-instance", "my-table"
         #
         #   table.new_column_range("cf").between("qualifier-1", "qualifier-10")
         #
@@ -173,7 +173,7 @@ module Google
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table "my-instance", "my-table"
         #
         #   table.new_column_range("cf").of("qualifier-1", "qualifier-10")
         #

data/lib/google/cloud/bigtable/convert.rb

@@ -17,6 +17,13 @@
 
 require "time"
 require "date"
+require "gapic/protobuf"
+require "gapic/call_options"
+require "gapic/headers"
+require "google/cloud/bigtable/version"
+require "google/cloud/bigtable/v2/version"
+require "google/bigtable/v2/bigtable_pb"
+require "google/cloud/bigtable/admin/v2"
 
 module Google
   module Cloud
@@ -89,6 +96,33 @@ module Google
           return [value].pack "q>" if value.is_a? Integer
           value
         end
+
+        def ping_and_warm_request table_path, app_profile_id, timeout
+          request = {
+            name: table_path.split("/").slice(0, 4).join("/"),
+            app_profile_id: app_profile_id
+          }
+          request = ::Gapic::Protobuf.coerce request, to: ::Google::Cloud::Bigtable::V2::PingAndWarmRequest
+
+          header_params = {}
+          if request.name && %r{^projects/[^/]+/instances/[^/]+/?$}.match?(request.name)
+            header_params["name"] = request.name
+          end
+          if request.app_profile_id && !request.app_profile_id.empty?
+            header_params["app_profile_id"] = request.app_profile_id
+          end
+          request_params_header = URI.encode_www_form header_params
+          metadata = {
+            "x-goog-request-params": request_params_header,
+            "x-goog-api-client":
+              ::Gapic::Headers.x_goog_api_client(lib_name: "gccl",
+                                                 lib_version: ::Google::Cloud::Bigtable::VERSION,
+                                                 gapic_version: ::Google::Cloud::Bigtable::V2::VERSION),
+            "google-cloud-resource-prefix": "projects/#{table_path.split('/')[1]}"
+          }
+          options = ::Gapic::CallOptions.new timeout: timeout, metadata: metadata
+          [request, options]
+        end
       end
     end
   end

data/lib/google/cloud/bigtable/encryption_info.rb

@@ -31,10 +31,10 @@ module Google
       #   require "google/cloud/bigtable"
       #
       #   bigtable = Google::Cloud::Bigtable.new
-      #   instance = bigtable.instance("my-instance")
-      #   cluster = instance.cluster("my-cluster")
+      #   instance = bigtable.instance "my-instance"
+      #   cluster = instance.cluster "my-cluster"
       #
-      #   backup = cluster.backup("my-backup")
+      #   backup = cluster.backup "my-backup"
       #
       #   encryption_info = backup.encryption_info
       #   encryption_info.encryption_type #=> :GOOGLE_DEFAULT_ENCRYPTION
@@ -44,7 +44,7 @@ module Google
       #
       #   bigtable = Google::Cloud::Bigtable.new
       #
-      #   table = bigtable.table("my-instance", "my-table", view: :ENCRYPTION_VIEW, perform_lookup: true)
+      #   table = bigtable.table "my-instance", "my-table", view: :ENCRYPTION_VIEW, perform_lookup: true
       #
       #   table.cluster_states.each do |cs|
       #     puts cs.cluster_name

data/lib/google/cloud/bigtable/gc_rule.rb

@@ -49,15 +49,15 @@ module Google
       #
       #   bigtable = Google::Cloud::Bigtable.new
       #
-      #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
-      #     cfm.add("cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5))
-      #     cfm.add("cf2", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600))
+      #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
+      #     cfm.add "cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5)
+      #     cfm.add "cf2", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
       #
       #     gc_rule = Google::Cloud::Bigtable::GcRule.union(
       #       Google::Cloud::Bigtable::GcRule.max_age(1800),
       #       Google::Cloud::Bigtable::GcRule.max_versions(3)
       #     )
-      #     cfm.add("cf3", gc_rule: gc_rule)
+      #     cfm.add "cf3", gc_rule: gc_rule
       #   end
       #
       #   puts table.column_families["cf1"].gc_rule.max_versions
@@ -95,8 +95,8 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
-        #     cfm.add("cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5))
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
+        #     cfm.add "cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5)
         #   end
         #
         #   puts table.column_families["cf1"].gc_rule.max_versions
@@ -131,8 +131,8 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
-        #     cfm.add("cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600))
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
+        #     cfm.add "cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
         #   end
         #
         #   puts table.column_families["cf1"].gc_rule.max_age
@@ -162,12 +162,12 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
         #     gc_rule = Google::Cloud::Bigtable::GcRule.intersection(
         #       Google::Cloud::Bigtable::GcRule.max_age(1800),
         #       Google::Cloud::Bigtable::GcRule.max_versions(3)
         #     )
-        #     cfm.add("cf1", gc_rule: gc_rule)
+        #     cfm.add "cf1", gc_rule: gc_rule
         #   end
         #
         #   puts table.column_families["cf1"].gc_rule.intersection
@@ -203,12 +203,12 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
         #     gc_rule = Google::Cloud::Bigtable::GcRule.union(
         #       Google::Cloud::Bigtable::GcRule.max_age(1800),
         #       Google::Cloud::Bigtable::GcRule.max_versions(3)
         #     )
-        #     cfm.add("cf1", gc_rule: gc_rule)
+        #     cfm.add "cf1", gc_rule: gc_rule
         #   end
         #
         #   puts table.column_families["cf1"].gc_rule.union
@@ -231,8 +231,8 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
-        #     cfm.add("cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5))
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
+        #     cfm.add "cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5)
         #   end
         #
         def self.max_versions versions
@@ -252,8 +252,8 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
-        #     cfm.add("cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600))
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
+        #     cfm.add "cf1", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
         #   end
         #
         def self.max_age age
@@ -274,12 +274,12 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
         #     gc_rule = Google::Cloud::Bigtable::GcRule.union(
         #       Google::Cloud::Bigtable::GcRule.max_age(1800),
         #       Google::Cloud::Bigtable::GcRule.max_versions(3)
         #     )
-        #     cfm.add("cf1", gc_rule: gc_rule)
+        #     cfm.add "cf1", gc_rule: gc_rule
         #   end
         #
         def self.union *rules
@@ -300,12 +300,12 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.create_table("my-instance", "my-table") do |cfm|
+        #   table = bigtable.create_table "my-instance", "my-table" do |cfm|
         #     gc_rule = Google::Cloud::Bigtable::GcRule.intersection(
         #       Google::Cloud::Bigtable::GcRule.max_age(1800),
         #       Google::Cloud::Bigtable::GcRule.max_versions(3)
         #     )
-        #     cfm.add("cf1", gc_rule: gc_rule)
+        #     cfm.add "cf1", gc_rule: gc_rule
         #   end
         #
         def self.intersection *rules

data/lib/google/cloud/bigtable/instance/cluster_map.rb

@@ -30,8 +30,8 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   job = bigtable.create_instance("my-instance") do |clusters|
-        #     clusters.add("test-cluster", "us-east1-b", nodes: 3, storage_type: :SSD)
+        #   job = bigtable.create_instance "my-instance" do |clusters|
+        #     clusters.add "test-cluster", "us-east1-b", nodes: 3, storage_type: :SSD
         #   end
         #
         #   job.wait_until_done!
@@ -74,8 +74,8 @@ module Google
           #
           #   bigtable = Google::Cloud::Bigtable.new
           #
-          #   job = bigtable.create_instance("my-instance") do |clusters|
-          #     clusters.add("test-cluster", "us-east1-b", nodes: 3, storage_type: :SSD)
+          #   job = bigtable.create_instance "my-instance" do |clusters|
+          #     clusters.add "test-cluster", "us-east1-b", nodes: 3, storage_type: :SSD
           #   end
           #
           #   job.wait_until_done!
@@ -86,8 +86,8 @@ module Google
           #   bigtable = Google::Cloud::Bigtable.new
           #
           #   kms_key_name = "projects/a/locations/b/keyRings/c/cryptoKeys/d"
-          #   job = bigtable.create_instance("my-instance") do |clusters|
-          #     clusters.add("test-cluster", "us-east1-b", kms_key: kms_key_name)
+          #   job = bigtable.create_instance "my-instance" do |clusters|
+          #     clusters.add "test-cluster", "us-east1-b", kms_key: kms_key_name
           #   end
           #
           #   job.wait_until_done!
@@ -103,7 +103,7 @@ module Google
               location:             location,
               default_storage_type: storage_type,
               encryption_config:    encryption_config
-            }.delete_if { |_, v| v.nil? }
+            }.compact
 
             self[name] = Google::Cloud::Bigtable::Admin::V2::Cluster.new attrs
           end

data/lib/google/cloud/bigtable/instance/job.rb

@@ -38,9 +38,9 @@ module Google
         #     "my-instance",
         #     display_name: "Instance for user data",
         #     type: :DEVELOPMENT,
-        #     labels: { "env" => "dev"}
+        #     labels: { "env" => "dev" }
         #   ) do |clusters|
-        #     clusters.add("test-cluster", "us-east1-b") # nodes not allowed
+        #     clusters.add "test-cluster", "us-east1-b" # nodes not allowed
         #   end
         #
         #   # Check and reload.
@@ -74,9 +74,9 @@ module Google
           #     "my-instance",
           #     display_name: "Instance for user data",
           #     type: :DEVELOPMENT,
-          #     labels: { "env" => "dev"}
+          #     labels: { "env" => "dev" }
           #   ) do |clusters|
-          #     clusters.add("test-cluster", "us-east1-b") # nodes not allowed
+          #     clusters.add "test-cluster", "us-east1-b" # nodes not allowed
           #   end
           #
           #   job.done? #=> false