chore(bigtable): fix conformance tests

googleapis · Jul 22, 2024 · 6bffe0b · 6bffe0b
1 parent 12ef2ad
commit 6bffe0b
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 56 deletions.
diff --git a/google-cloud-bigtable/.rubocop.yml b/google-cloud-bigtable/.rubocop.yml
@@ -20,6 +20,7 @@ Metrics/BlockLength:
     - "google-cloud-bigtable.gemspec"
     - "Rakefile"
     - "lib/google-cloud-bigtable.rb"
+    - ".toys.rb"
 Metrics/ClassLength:
   Max: 400
 Metrics/PerceivedComplexity:

diff --git a/google-cloud-bigtable/.toys.rb b/google-cloud-bigtable/.toys.rb
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-toys_version! ">= 0.15.3"
+toys_version! ">= 0.15.6"
 
 if ENV["RUBY_COMMON_TOOLS"]
   common_tools_dir = File.expand_path ENV["RUBY_COMMON_TOOLS"]
@@ -24,3 +24,50 @@
            path: "toys/gapic",
            update: true
 end
+
+tool "conformance" do
+  tool "gen-protos" do
+    include :exec, e: true
+    include :gems
+    include :git_cache
+
+    def run
+      setup
+      generate_conformance
+      generate_test_proxy
+    end
+
+    def setup
+      gem "grpc-tools", "~> 1.65"
+      @googleapis_dir = git_cache.get "https://github.com/googleapis/googleapis.git", update: true
+      Dir.chdir context_directory
+    end
+
+    def generate_conformance
+      Dir.chdir "conformance/v2/proto" do
+        cmd = [
+          "grpc_tools_ruby_protoc",
+          "--ruby_out", ".",
+          "-I", ".",
+          "-I", @googleapis_dir,
+          "google/cloud/conformance/bigtable/v2/tests.proto"
+        ]
+        exec cmd
+      end
+    end
+
+    def generate_test_proxy
+      Dir.chdir "test/test_proxy/proto" do
+        cmd = [
+          "grpc_tools_ruby_protoc",
+          "--ruby_out", ".",
+          "--grpc_out", ".",
+          "-I", ".",
+          "-I", @googleapis_dir,
+          "google/bigtable/testproxy/test_proxy.proto"
+        ]
+        exec cmd
+      end
+    end
+  end
+end
diff --git a/google-cloud-bigtable/conformance/v2/proto/google/cloud/conformance/bigtable/v2/tests_pb.rb b/google-cloud-bigtable/conformance/v2/proto/google/cloud/conformance/bigtable/v2/tests_pb.rb
diff --git a/google-cloud-bigtable/test/test_proxy/Gemfile b/google-cloud-bigtable/test/test_proxy/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "google-cloud-bigtable", path: "../../"
-gem "grpc", "~> 1.62"
-gem "grpc-tools", "~> 1.62"
-gem "googleapis-common-protos", "~> 1.5"
-gem "googleapis-common-protos-types", "~> 1.14"
+gem "grpc", "~> 1.65"
+gem "grpc-tools", "~> 1.65"
+gem "googleapis-common-protos", "~> 1.6"
+gem "googleapis-common-protos-types", "~> 1.15"
diff --git a/...le/test/test_proxy/proto/test_proxy.proto → ...oogle/bigtable/testproxy/test_proxy.proto b/...le/test/test_proxy/proto/test_proxy.proto → ...oogle/bigtable/testproxy/test_proxy.proto
diff --git a/...oogle/bigtable/testproxy/test_proxy_pb.rb → ...oogle/bigtable/testproxy/test_proxy_pb.rb b/...oogle/bigtable/testproxy/test_proxy_pb.rb → ...oogle/bigtable/testproxy/test_proxy_pb.rb
diff --git a/...table/testproxy/test_proxy_services_pb.rb → ...table/testproxy/test_proxy_services_pb.rb b/...table/testproxy/test_proxy_services_pb.rb → ...table/testproxy/test_proxy_services_pb.rb
diff --git a/google-cloud-bigtable/test/test_proxy/test_proxy.rb b/google-cloud-bigtable/test/test_proxy/test_proxy.rb
@@ -1,5 +1,5 @@
 # Generated protos live here
-$LOAD_PATH << File.join(__dir__, "lib")
+$LOAD_PATH << File.join(__dir__, "proto")
 
 require "grpc"
 require "google/cloud/bigtable"
@@ -88,8 +88,10 @@ def table name
     attr_accessor :instance_id
     attr_accessor :app_profile_id
 
-    def initialize client_id:, data_target:, project_id:, instance_id:, app_profile_id:, per_operation_timeout:,
-                   optional_feature_config:
+    def initialize client_id:, data_target:, project_id:, instance_id:,
+                   app_profile_id: nil,
+                   per_operation_timeout: nil,
+                   optional_feature_config: :OPTIONAL_FEATURE_CONFIG_DEFAULT
 
       LOGGER.debug "Building client #{client_id}"