From d2977af9e9f1fc0c9dc8368352daa032471f3c63 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Thu, 14 Oct 2021 10:50:47 -0700
Subject: [PATCH] chore(ruby): Re-enable bigquery-storage-v1 generation, which
 also required updating protobuf from 3.15.3 to 3.18.1 for codegen

PiperOrigin-RevId: 403132955
---
 WORKSPACE                                    |  6 +-
 google/cloud/bigquery/storage/v1/BUILD.bazel | 97 ++++++++++----------
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 5277b155e86b6..9c16f4b380fa0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -47,9 +47,9 @@ http_archive(
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "b10bf4e2d1a7586f54e64a5d9e7837e5188fc75ae69e36f215eb01def4f9721b",
-    strip_prefix = "protobuf-3.15.3",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz"],
+    sha256 = "9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7",
+    strip_prefix = "protobuf-3.18.1",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.18.1.tar.gz"],
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
diff --git a/google/cloud/bigquery/storage/v1/BUILD.bazel b/google/cloud/bigquery/storage/v1/BUILD.bazel
index 15674bd20f635..2750eed09917e 100644
--- a/google/cloud/bigquery/storage/v1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1/BUILD.bazel
@@ -243,55 +243,54 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 # Ruby
 ##############################################################################
-# disabled due to https://github.com/protocolbuffers/protobuf/issues/7992
-#
-# load(
-#     "@com_google_googleapis_imports//:imports.bzl",
-#     "ruby_cloud_gapic_library",
-#     "ruby_gapic_assembly_pkg",
-#     "ruby_grpc_library",
-#     "ruby_proto_library",
-# )
-
-# ruby_proto_library(
-#     name = "storage_ruby_proto",
-#     deps = [":storage_proto"],
-# )
-
-# ruby_grpc_library(
-#     name = "storage_ruby_grpc",
-#     srcs = [":storage_proto"],
-#     deps = [":storage_ruby_proto"],
-# )
-
-# ruby_cloud_gapic_library(
-#     name = "storage_ruby_gapic",
-#     srcs = [":storage_proto_with_info"],
-#     extra_protoc_parameters = [
-#         "ruby-cloud-gem-name=google-cloud-bigquery-storage-v1",
-#         "ruby-cloud-env-prefix=BIGQUERY_STORAGE",
-#         "ruby-cloud-product-url=https://cloud.google.com/bigquery/docs/reference/storage",
-#         "ruby-cloud-api-id=bigquerystorage.googleapis.com",
-#         "ruby-cloud-api-shortname=bigquerystorage",
-#     ],
-#     grpc_service_config = "bigquerystorage_grpc_service_config.json",
-#     ruby_cloud_description = "The BigQuery Storage API provides fast access to BigQuery managed storage.",
-#     ruby_cloud_title = "BigQuery Storage V1",
-#     deps = [
-#         ":storage_ruby_grpc",
-#         ":storage_ruby_proto",
-#     ],
-# )
-
-# # Open Source Packages
-# ruby_gapic_assembly_pkg(
-#     name = "google-cloud-bigquery-storage-v1-ruby",
-#     deps = [
-#         ":storage_ruby_gapic",
-#         ":storage_ruby_grpc",
-#         ":storage_ruby_proto",
-#     ],
-# )
+
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
+    "ruby_grpc_library",
+    "ruby_proto_library",
+)
+
+ruby_proto_library(
+    name = "storage_ruby_proto",
+    deps = [":storage_proto"],
+)
+
+ruby_grpc_library(
+    name = "storage_ruby_grpc",
+    srcs = [":storage_proto"],
+    deps = [":storage_ruby_proto"],
+)
+
+ruby_cloud_gapic_library(
+    name = "storage_ruby_gapic",
+    srcs = [":storage_proto_with_info"],
+    extra_protoc_parameters = [
+        "ruby-cloud-gem-name=google-cloud-bigquery-storage-v1",
+        "ruby-cloud-env-prefix=BIGQUERY_STORAGE",
+        "ruby-cloud-product-url=https://cloud.google.com/bigquery/docs/reference/storage",
+        "ruby-cloud-api-id=bigquerystorage.googleapis.com",
+        "ruby-cloud-api-shortname=bigquerystorage",
+    ],
+    grpc_service_config = "bigquerystorage_grpc_service_config.json",
+    ruby_cloud_description = "The BigQuery Storage API provides fast access to BigQuery managed storage.",
+    ruby_cloud_title = "BigQuery Storage V1",
+    deps = [
+        ":storage_ruby_grpc",
+        ":storage_ruby_proto",
+    ],
+)
+
+# Open Source Packages
+ruby_gapic_assembly_pkg(
+    name = "google-cloud-bigquery-storage-v1-ruby",
+    deps = [
+        ":storage_ruby_gapic",
+        ":storage_ruby_grpc",
+        ":storage_ruby_proto",
+    ],
+)
 
 ##############################################################################
 # C#