Merge branch 'master' into fix/gcs_resnames

googleapis · Jun 10, 2021 · 1041962 · 1041962
2 parents a9d9d95 + 02eab0e
commit 1041962
Show file tree

Hide file tree

Showing 28 changed files with 3,514 additions and 214 deletions.
diff --git a/dependencies.properties b/dependencies.properties
@@ -7,7 +7,7 @@
 # Target workspace name: com_google_api_codegen
 
 # Versions only, for dependencies which actual artifacts differ between Bazel and Gradle
-version.com_google_protobuf=3.15.2
+version.com_google_protobuf=3.15.8
 # Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8.
 version.google_java_format=1.7
 version.com_google_api_common_java=1.9.3

diff --git a/repositories.bzl b/repositories.bzl
@@ -59,9 +59,18 @@ def gapic_generator_java_repositories():
     _maybe(
         http_archive,
         name = "com_google_googleapis",
-        strip_prefix = "googleapis-2bea43cdc7a4443876380732980d83cd8d560582",
+        strip_prefix = "googleapis-f5ce261910c373fdd96bdaa47173f5604562876f",
         urls = [
-            "https://github.com/googleapis/googleapis/archive/2bea43cdc7a4443876380732980d83cd8d560582.zip",
+            "https://github.com/googleapis/googleapis/archive/f5ce261910c373fdd96bdaa47173f5604562876f.zip",
+        ],
+    )
+
+    _maybe(
+        http_archive,
+        name = "com_google_googleapis_discovery",
+        strip_prefix = "googleapis-discovery-4f5d0604132e93e63330e65e2e6648c75012780c",
+        urls = [
+            "https://github.com/googleapis/googleapis-discovery/archive/4f5d0604132e93e63330e65e2e6648c75012780c.zip",
         ],
     )
 

diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
@@ -29,6 +29,7 @@ INTEGRATION_TEST_LIBRARIES = [
     "logging",  # Java package remapping in gapic.yaml.
     "redis",  # Has a gapic.yaml.
     "library",  # No gRPC service config.
+    "compute", # REGAPIC test.
 ]
 
 # Keys must match the values in INTEGRATION_TEST_LIBRARIES above.
@@ -41,6 +42,7 @@ API_GAPIC_TARGETS = {
     "logging": "@com_google_googleapis//google/logging/v2:logging_java_gapic",
     "redis": "@com_google_googleapis//google/cloud/redis/v1beta1:redis_java_gapic",
     "library": "@com_google_googleapis//google/example/library/v1:library_java_gapic",
+    "compute": "@com_google_googleapis_discovery//google/cloud/compute/v1:compute_small_java_gapic",
 }
 
 [integration_test(

diff --git a/test/integration/goldens/compute/BUILD.bazel b/test/integration/goldens/compute/BUILD.bazel
@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "goldens_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
+)