chore: migrate example/library retry configs, fix C#/PHP/Ruby GAPICs

Committer: @miraleung PiperOrigin-RevId: 359640308
googleapis · Feb 26, 2021 · 5428e91 · 5428e91
1 parent e41506d
commit 5428e91
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 390 deletions.
diff --git a/google/example/library/BUILD.bazel b/google/example/library/BUILD.bazel
@@ -1,3 +1 @@
 exports_files(glob(["*.yaml"]))
-
-
diff --git a/google/example/library/v1/BUILD.bazel b/google/example/library/v1/BUILD.bazel
@@ -1,5 +1,5 @@
 # This file was automatically generated by BuildFileGenerator
-# https://github.com/googleapis/gapic-generator/tree/master/rules_gapic/bazel
+# https://github.com/googleapis/rules_gapic/tree/master/bazel
 
 # Most of the manual changes to this file will be overwritten.
 # It's **only** allowed to change the following rule attribute values:
@@ -9,14 +9,42 @@
 #    * extra_protoc_file_parameters
 # The complete list of preserved parameters can be found in the source code.
 
-# This is an API workspace, having public visibility by default makes perfect sense.
-package(default_visibility = ["//visibility:public"])
-
 ##############################################################################
 # Common
 ##############################################################################
 load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "csharp_gapic_assembly_pkg",
+    "csharp_gapic_library",
+    "csharp_grpc_library",
+    "csharp_proto_library",
+    "go_gapic_assembly_pkg",
+    "go_gapic_library",
+    "go_proto_library",
+    "go_test",
+    "java_gapic_assembly_gradle_pkg",
+    "java_gapic_library",
+    "java_gapic_test",
+    "java_grpc_library",
+    "java_proto_library",
+    "nodejs_gapic_assembly_pkg",
+    "nodejs_gapic_library",
+    "php_gapic_assembly_pkg",
+    "php_gapic_library",
+    "php_grpc_library",
+    "php_proto_library",
+    "proto_library_with_info",
+    "py_gapic_assembly_pkg",
+    "py_gapic_library",
+    "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
+    "ruby_grpc_library",
+    "ruby_proto_library",
+)
+
+# This is an API workspace, having public visibility by default makes perfect sense.
+package(default_visibility = ["//visibility:public"])
 
 proto_library(
     name = "library_proto",
@@ -29,6 +57,7 @@ proto_library(
         "//google/api:field_behavior_proto",
         "//google/api:resource_proto",
         "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:field_mask_proto",
     ],
 )
 
@@ -40,18 +69,6 @@ proto_library_with_info(
     ],
 )
 
-##############################################################################
-# Java
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
-    "java_grpc_library",
-    "java_proto_library",
-)
-
 java_proto_library(
     name = "library_java_proto",
     deps = [":library_proto"],
@@ -67,6 +84,7 @@ java_gapic_library(
     name = "library_java_gapic",
     srcs = [":library_proto_with_info"],
     gapic_yaml = "library_example_gapic.yaml",
+    grpc_service_config = "library_grpc_service_config.json",
     test_deps = [
         ":library_java_grpc",
     ],
@@ -94,17 +112,6 @@ java_gapic_assembly_gradle_pkg(
     ],
 )
 
-##############################################################################
-# Go
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "go_gapic_assembly_pkg",
-    "go_gapic_library",
-    "go_proto_library",
-    "go_test",
-)
-
 go_proto_library(
     name = "library_go_proto",
     compilers = ["@io_bazel_rules_go//proto:go_grpc"],
@@ -118,8 +125,9 @@ go_proto_library(
 go_gapic_library(
     name = "library_go_gapic",
     srcs = [":library_proto_with_info"],
-    grpc_service_config = "",
-    importpath = "cloud.google.com/go/example/library/apiv1;library",
+    grpc_service_config = "library_grpc_service_config.json",
+    importpath = "google.golang.org/google/example/library/v1;library",
+    metadata = True,
     service_yaml = "//google/example/library:library_example_v1.yaml",
     deps = [
         ":library_go_proto",
@@ -130,32 +138,24 @@ go_test(
     name = "library_go_gapic_test",
     srcs = [":library_go_gapic_srcjar_test"],
     embed = [":library_go_gapic"],
-    importpath = "cloud.google.com/go/example/library/apiv1",
+    importpath = "google.golang.org/google/example/library/v1",
 )
 
 # Open Source Packages
 go_gapic_assembly_pkg(
     name = "gapi-cloud-example-library-v1-go",
     deps = [
         ":library_go_gapic",
+        ":library_go_gapic_srcjar-metadata.srcjar",
         ":library_go_gapic_srcjar-test.srcjar",
         ":library_go_proto",
     ],
 )
 
-##############################################################################
-# Python
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "py_gapic_assembly_pkg",
-    "py_gapic_library",
-)
-
 py_gapic_library(
     name = "library_py_gapic",
     srcs = [":library_proto"],
-    grpc_service_config = None,
+    grpc_service_config = "library_grpc_service_config.json",
 )
 
 # Open Source Packages
@@ -166,17 +166,6 @@ py_gapic_assembly_pkg(
     ],
 )
 
-##############################################################################
-# PHP
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "php_gapic_assembly_pkg",
-    "php_gapic_library",
-    "php_grpc_library",
-    "php_proto_library",
-)
-
 php_proto_library(
     name = "library_php_proto",
     deps = [":library_proto"],
@@ -192,6 +181,7 @@ php_gapic_library(
     name = "library_php_gapic",
     src = ":library_proto_with_info",
     gapic_yaml = "library_example_gapic.yaml",
+    grpc_service_config = "library_grpc_service_config.json",
     package = "google.example.library.v1",
     service_yaml = "//google/example/library:library_example_v1.yaml",
     deps = [
@@ -210,21 +200,13 @@ php_gapic_assembly_pkg(
     ],
 )
 
-##############################################################################
-# Node.js
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
-
 nodejs_gapic_library(
     name = "library_nodejs_gapic",
+    package_name = "@google-cloud/library",
     src = ":library_proto_with_info",
     extra_protoc_parameters = ["metadata"],
-    grpc_service_config = None,
-    package = "google.example.library.v1",
+    grpc_service_config = "library_grpc_service_config.json",
+    package = "google.cloud.example.library.v1",
     service_yaml = "//google/example/library:library_example_v1.yaml",
     deps = [],
 )
@@ -237,17 +219,6 @@ nodejs_gapic_assembly_pkg(
     ],
 )
 
-##############################################################################
-# Ruby
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
-    "ruby_gapic_library",
-    "ruby_grpc_library",
-    "ruby_proto_library",
-)
-
 ruby_proto_library(
     name = "library_ruby_proto",
     deps = [":library_proto"],
@@ -259,12 +230,20 @@ ruby_grpc_library(
     deps = [":library_ruby_proto"],
 )
 
-ruby_gapic_library(
+# Uncomment the following once the space issue has been fixed.
+ruby_cloud_gapic_library(
     name = "library_ruby_gapic",
-    src = ":library_proto_with_info",
-    gapic_yaml = "library_example_gapic.yaml",
-    package = "google.example.library.v1",
-    service_yaml = "//google/example/library:library_example_v1.yaml",
+    srcs = [":library_proto_with_info"],
+    extra_protoc_parameters = [
+        "ruby-cloud-gem-name=google-cloud-example_library-v1",
+        "ruby-cloud-env-prefix=LIBRARY",
+        "ruby-cloud-product-url=https://cloud.google.com",
+        "ruby-cloud-api-id=library-example.googleapis.com",
+        "ruby-cloud-api-shortname=library",
+    ],
+    grpc_service_config = "library_grpc_service_config.json",
+    ruby_cloud_title = "Example Library V1",
+    ruby_cloud_description = "This is a Google example service representing a simple digital library. It manages a collection of shelf resources, and each shelf owns a collection of book resources.",
     deps = [
         ":library_ruby_grpc",
         ":library_ruby_proto",
@@ -281,17 +260,6 @@ ruby_gapic_assembly_pkg(
     ],
 )
 
-##############################################################################
-# C#
-##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "csharp_gapic_assembly_pkg",
-    "csharp_gapic_library",
-    "csharp_grpc_library",
-    "csharp_proto_library",
-)
-
 csharp_proto_library(
     name = "library_csharp_proto",
     deps = [":library_proto"],
@@ -303,26 +271,26 @@ csharp_grpc_library(
     deps = [":library_csharp_proto"],
 )
 
-# Invalid resource-reference, cannot build.
-# csharp_gapic_library(
-#     name = "library_csharp_gapic",
-#     srcs = [":library_proto_with_info"],
-#     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
-#     deps = [
-#         ":library_csharp_grpc",
-#         ":library_csharp_proto",
-#     ],
-# )
+csharp_gapic_library(
+    name = "library_csharp_gapic",
+    srcs = [":library_proto_with_info"],
+    common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
+    grpc_service_config = "library_grpc_service_config.json",
+    deps = [
+        ":library_csharp_grpc",
+        ":library_csharp_proto",
+    ],
+)
 
-# # Open Source Packages
-# csharp_gapic_assembly_pkg(
-#     name = "google-cloud-example-library-v1-csharp",
-#     deps = [
-#         ":library_csharp_gapic",
-#         ":library_csharp_grpc",
-#         ":library_csharp_proto",
-#     ],
-# )
+# Open Source Packages
+csharp_gapic_assembly_pkg(
+    name = "google-cloud-example-library-v1-csharp",
+    deps = [
+        ":library_csharp_gapic",
+        ":library_csharp_grpc",
+        ":library_csharp_proto",
+    ],
+)
 
 ##############################################################################
 # C++