Merge branch 'master' into renovate/bazel_skylib-1.x

googleapis · Sep 29, 2021 · 071d7c8 · 071d7c8
2 parents f2b0f63 + 98b891f
commit 071d7c8
Show file tree

Hide file tree

Showing 357 changed files with 17,373 additions and 4,588 deletions.
diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml
@@ -0,0 +1,2 @@
+aggregateChecks: false
+alwaysCreateStatusCheck: false
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,7 +49,7 @@ jobs:
         run: bazel --batch test $(bazel query "//src/test/..." | grep "Test$") --noshow_progress --test_output=errors
 
       - name: Integration Tests
-        run: bazel --batch test //test/integration:asset //test/integration:credentials //test/integration:iam //test/integration:kms //test/integration:logging //test/integration:pubsub //test/integration:redis //test/integration:library --noshow_progress
+        run: bazel --batch test //test/integration/...
 
       - uses: actions/upload-artifact@v2
         if: ${{ failure() }}

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -8,14 +8,17 @@ load(
 package(default_visibility = ["//visibility:public"])
 
 JAVA_SRCS = [
+    "//src/main/java/com/google/api/generator/debug:debug_files",
     "//src/main/java/com/google/api/generator:generator_files",
     "//src/main/java/com/google/api/generator/engine:engine_files",
     "//src/main/java/com/google/api/generator/gapic:gapic_files",
+    "//src/main/java/com/google/api/generator/util:util_files",
 ]
 
 TEST_SRCS = [
     "//src/test/java/com/google/api/generator/engine:engine_files",
     "//src/test/java/com/google/api/generator/gapic:gapic_files",
+    "//src/test/java/com/google/api/generator/testutils:testutils_files",
     "//src/test/java/com/google/api/generator/util:util_files",
     "//src/test/java/com/google/api/generator/test/framework:framework_files",
 ]
@@ -45,6 +48,57 @@ java_binary(
     ],
 )
 
+# Request dumper binary, which dumps the CodeGeneratorRequest to a file on disk
+# which will be identical to the one passed to the protoc-gen-java_gapic during
+# normal execution. The dumped file then can be used to run this gapic-generator
+# directly (instead of relying on protoc to start the process), which would give
+# much greater flexibility in terms of debugging features, like attaching a
+# debugger, easier work with stdout and stderr etc.
+#
+# Usage example, via the rule in a corresponding BUILD.bazel file:
+#
+# load("@gapic_generator_java//rules_java_gapic:java_gapic.bzl", "java_generator_request_dump")
+# java_generator_request_dump(
+#     name = "compute_small_request_dump",
+#     srcs = [":compute_small_proto_with_info"],
+#     transport = "rest",
+# )
+#
+java_binary(
+    name = "protoc-gen-code_generator_request_dumper",
+    main_class = "com.google.api.generator.debug.CodeGeneratorRequestDumper",
+    runtime_deps = [
+        "//src/main/java/com/google/api/generator",
+        "//src/main/java/com/google/api/generator/debug",
+        "//src/main/java/com/google/api/generator/gapic",
+        "@com_google_googleapis//google/api:api_java_proto",
+        "@com_google_googleapis//google/longrunning:longrunning_java_proto",
+        "@com_google_guava_guava",
+        "@com_google_protobuf//:protobuf_java",
+    ],
+)
+
+# A binary similar to protoc-gen-java_gapic but reads the CodeGeneratorRequest
+# directly from a file instead of relying on protoc to pipe it in.
+#
+# Usage example:
+#
+# bazel run code_generator_request_file_to_gapic_main desc-dump.bin dump.jar
+#
+java_binary(
+    name = "code_generator_request_file_to_gapic_main",
+    main_class = "com.google.api.generator.debug.CodeGeneratorRequestFileToGapicMain",
+    runtime_deps = [
+        "//src/main/java/com/google/api/generator",
+        "//src/main/java/com/google/api/generator/debug",
+        "//src/main/java/com/google/api/generator/gapic",
+        "@com_google_googleapis//google/api:api_java_proto",
+        "@com_google_googleapis//google/longrunning:longrunning_java_proto",
+        "@com_google_guava_guava",
+        "@com_google_protobuf//:protobuf_java",
+    ],
+)
+
 # google-java-format
 java_binary(
     name = "google_java_format_binary",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,131 @@
 # Changelog
 
+## [2.1.0](https://www.github.com/googleapis/gapic-generator-java/compare/v2.0.1...v2.1.0) (2021-08-17)
+
+
+### Features
+
+* enable self signed jwt for gapic clients ([#794](https://www.github.com/googleapis/gapic-generator-java/issues/794)) ([1b7ee1e](https://www.github.com/googleapis/gapic-generator-java/commit/1b7ee1e3911e1c8ecab9a94d68d7a59b437d2449))
+
+### [2.0.1](https://www.github.com/googleapis/gapic-generator-java/compare/v2.0.0...v2.0.1) (2021-08-06)
+
+
+### Bug Fixes
+
+* bring back unused resnames for Ads ([#821](https://www.github.com/googleapis/gapic-generator-java/issues/821)) ([7fa135c](https://www.github.com/googleapis/gapic-generator-java/commit/7fa135c9aa60c9cb15880e098d36ea81b95ea488))
+* **resnames:** ensure deterministic resname order for samplegen ([#813](https://www.github.com/googleapis/gapic-generator-java/issues/813)) ([c4709df](https://www.github.com/googleapis/gapic-generator-java/commit/c4709df5d8ed9f0074f7e25df5db93e9d9b35749))
+
+## [2.0.0](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.17...v2.0.0) (2021-08-03)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove Exception, unused resname classes for Java major version bump (#814)
+
+### Features
+
+* Lambda-ize single-method anon classes (Java 8+) ([#815](https://www.github.com/googleapis/gapic-generator-java/issues/815)) ([19b661c](https://www.github.com/googleapis/gapic-generator-java/commit/19b661cc78757e37ce93bae96eb81cb4ac32658b))
+* remove Exception, unused resname classes for Java major version bump ([#814](https://www.github.com/googleapis/gapic-generator-java/issues/814)) ([8abece2](https://www.github.com/googleapis/gapic-generator-java/commit/8abece20dd20e9ac8134df04301ce5b6e2ab76ad))
+
+### [1.0.17](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.16...v1.0.17) (2021-08-02)
+
+
+### Features
+
+* **ast:** Add support for multi-catch blocks [ggj] ([#811](https://www.github.com/googleapis/gapic-generator-java/issues/811)) ([55ef1a6](https://www.github.com/googleapis/gapic-generator-java/commit/55ef1a63427683538e48050333eedb0666635568))
+* **ast:** Add support for Throwable causes [ggj] ([#801](https://www.github.com/googleapis/gapic-generator-java/issues/801)) ([7fdeece](https://www.github.com/googleapis/gapic-generator-java/commit/7fdeeced7642fefdfdc5c6e898661c72fe9d78a8))
+* **ast:** support throwing all kinds of expressions ([#810](https://www.github.com/googleapis/gapic-generator-java/issues/810)) ([0817650](https://www.github.com/googleapis/gapic-generator-java/commit/0817650b35487f32d7987ba718ce71fc7551e3a0))
+
+
+### Bug Fixes
+
+* (rest transport) Add `@BetaApi` to the generated `TransportServiceFactory` class and lro-specific method ([#787](https://www.github.com/googleapis/gapic-generator-java/issues/787)) ([ebe1aef](https://www.github.com/googleapis/gapic-generator-java/commit/ebe1aefbe860a41aabd8ced5268ccc6c7efdf791))
+* prevent hanging by call backgroundResources.close() on stub.close() [ggj] ([#804](https://www.github.com/googleapis/gapic-generator-java/issues/804)) ([428db97](https://www.github.com/googleapis/gapic-generator-java/commit/428db97c1534255a60530a8ed6137efc17ed56f4))
+* **resnames:** fallback to fully-qualified Object name upon proto typing conflicts [ggj] ([#803](https://www.github.com/googleapis/gapic-generator-java/issues/803)) ([e654bfb](https://www.github.com/googleapis/gapic-generator-java/commit/e654bfb936b571af2546f550c9a1589f8ad63d67))
+
+
+
+### [1.0.16](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.15...v1.0.16) (2021-06-30)
+
+
+### Bug Fixes
+
+* **bazel:** Eradicate monolith deps from Java µgen repo ([#778](https://www.github.com/googleapis/gapic-generator-java/issues/778)) ([86f2472](https://www.github.com/googleapis/gapic-generator-java/commit/86f2472963f020127ef6ff92be6241d12e2273af))
+* **build:** Update googleapis-discovery hash to fix compute integration test ([#782](https://www.github.com/googleapis/gapic-generator-java/issues/782)) ([46bb19a](https://www.github.com/googleapis/gapic-generator-java/commit/46bb19a7ee61da86b4be6d87a71f3cd210e753d2))
+* **protoc:** Mirror protoc's field name conflict resolution logic in client generation ([#781](https://www.github.com/googleapis/gapic-generator-java/issues/781)) ([9432979](https://www.github.com/googleapis/gapic-generator-java/commit/9432979bab59f48c8645fa47d752cdd470d4a682))
+
+### [1.0.15](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.14...v1.0.15) (2021-06-22)
+
+
+### Features
+
+* Implement field presence support for DIREGAPIC ([#774](https://www.github.com/googleapis/gapic-generator-java/issues/774)) ([c820361](https://www.github.com/googleapis/gapic-generator-java/commit/c82036105d299b0a1192cd0def5e68253e4f542c))
+
+
+### Bug Fixes
+
+* **service.yaml:** Remove allowlist restriction ([#776](https://www.github.com/googleapis/gapic-generator-java/issues/776)) ([8f42efd](https://www.github.com/googleapis/gapic-generator-java/commit/8f42efdb92d606a768a524517fe949c4f9112025))
+
+
+### Miscellaneous Chores
+
+* release 1.0.15 ([f752478](https://www.github.com/googleapis/gapic-generator-java/commit/f75247845344540a94c4efcd416f34f96ea0c2a3))
+
+### [1.0.14](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.13...v1.0.14) (2021-06-17)
+
+
+### Features
+
+* Add DIREGAPIC-specific pagination ([#767](https://www.github.com/googleapis/gapic-generator-java/issues/767)) ([1294c29](https://www.github.com/googleapis/gapic-generator-java/commit/1294c298f50cc4474ae562e6a07f37a5f94fe5b8))
+
+
+### Bug Fixes
+
+* **bazel:** Remove monolith rule deps from the Java µgen Bazel rules ([#764](https://www.github.com/googleapis/gapic-generator-java/issues/764)) ([bff3efc](https://www.github.com/googleapis/gapic-generator-java/commit/bff3efc25e43692ea5b6e769c20d25d5b9a1e3d2))
+
+
+
+### [1.0.13](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.12...v1.0.13) (2021-06-16)
+
+
+### Bug Fixes
+
+* **resnames:** Fix resname builder name conflicts in ctor with this assignment ([#769](https://www.github.com/googleapis/gapic-generator-java/issues/769)) ([edac844](https://www.github.com/googleapis/gapic-generator-java/commit/edac8447d74c43ab0db963a37f66e1029ab19f0c))
+
+### [1.0.12](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.11...v1.0.12) (2021-06-10)
+
+
+### Features
+
+* add mtls support ([#672](https://www.github.com/googleapis/gapic-generator-java/issues/672)) ([1e24893](https://www.github.com/googleapis/gapic-generator-java/commit/1e24893a65daf8ef067e331364c591ac973b5e02))
+
+
+### Bug Fixes
+
+* **mocks:** Use java.lang.Object if there are protos named 'Object' ([#760](https://www.github.com/googleapis/gapic-generator-java/issues/760)) ([2a7064b](https://www.github.com/googleapis/gapic-generator-java/commit/2a7064b88fe26586bd8aed43b7a7d28c7e974ec0))
+* **resnames:** Use anon resname classes when only wildcards are present ([#763](https://www.github.com/googleapis/gapic-generator-java/issues/763)) ([f0ecead](https://www.github.com/googleapis/gapic-generator-java/commit/f0ecead9f1cc645cdbb7f61cdfc820c7df95355d))
+
+
+### Miscellaneous Chores
+
+* release 1.0.12 ([02eab0e](https://www.github.com/googleapis/gapic-generator-java/commit/02eab0ec61260048a2684119cfd4fa2172f3a637))
+
+### [1.0.11](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.10...v1.0.11) (2021-06-07)
+
+
+### Features
+
+* DIREGAPIC initial implementation ([#746](https://www.github.com/googleapis/gapic-generator-java/issues/746)) ([81f6737](https://www.github.com/googleapis/gapic-generator-java/commit/81f6737359ac6ce5ee2b42ab4f755fbb05a3cf28))
+
+
+### Bug Fixes
+
+* **bazel:** ensure integration tests diff files recursively ([#745](https://www.github.com/googleapis/gapic-generator-java/issues/745)) ([ddc75f9](https://www.github.com/googleapis/gapic-generator-java/commit/ddc75f9f3b84d0ea50638a79a63d40cf551211e2))
+* **resnames:** filter out mixin services from resname pkg candidates ([#751](https://www.github.com/googleapis/gapic-generator-java/issues/751)) ([72fa76f](https://www.github.com/googleapis/gapic-generator-java/commit/72fa76f27379a74a143b1735f60ae3e00da4c1a6))
+* **tests:** Ensure deterministic field ordering in test classes ([#743](https://www.github.com/googleapis/gapic-generator-java/issues/743)) ([fdb705b](https://www.github.com/googleapis/gapic-generator-java/commit/fdb705b0a39443fb0b7679d879f27e0aa1c36b67))
+* **tests:** handle Java 11 set ordering differences for RPCs and fields in test/mock classes ([#750](https://www.github.com/googleapis/gapic-generator-java/issues/750)) ([eaf4592](https://www.github.com/googleapis/gapic-generator-java/commit/eaf4592e139fbc42810e7f60dc9967320195bf85))
+
+
 ### [1.0.10](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.9...v1.0.10) (2021-05-26)
 
 

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -15,24 +15,40 @@
 ## Running the Plugin
 
 1.  Clone [googleapis](https://github.com/googleapis/googleapis) and
-    [gapic-showcase](https://github.com/googleapis/gapic-showcase/) and install
-    protoc.
+    [gapic-showcase](https://github.com/googleapis/gapic-showcase/).
 
 2.  Copy the protos from Showcase into googleapis/google/showcase.
 
     ```sh
-    cp gapic-showcase/schema/google/showcase/v1beta1 googleapis/google/showcase/v1beta
+    mkdir googleapis/google/showcase
+    cp -r gapic-showcase/schema/google/showcase/v1beta1 googleapis/google/showcase/v1beta1
     ```
 
-3.  Add the new microgenerator rules to the protobuf directory's `BUILD.bazel`
-    file as follows:
+3.  Add the new microgenerator rules to
+    `googleapis/google/showcase/v1beta1/BUILD.bazel` file as follows:
 
     ```python
     load(
         "@com_google_googleapis_imports//:imports.bzl",
         # Existing rules here.
         "java_gapic_assembly_gradle_pkg",
         "java_gapic_library",
+        "java_proto_library",
+        "proto_library_with_info",
+    )
+
+    proto_library_with_info(
+        name = "showcase_proto_with_info",
+        deps = [
+            ":showcase_proto",
+        ],
+    )
+
+    java_proto_library(
+        name = "showcase_java_proto",
+        deps = [
+            "showcase_proto",
+        ],
     )
 
     # This should either replace the existing monolith target or have a unique name
@@ -97,13 +113,6 @@
     bazel run //src/test/java/com/google/api/generator/engine:JavaCodeGeneratorTest
     ```
 
--   Update goldens files based on code generation in unit test, for example
-    `JavaCodeGeneratorTest.java`
-
-    ```sh
-    bazel run //src/test/java/com/google/api/generator/engine:JavaCodeGeneratorTest_update
-    ```
-
 -   Run a single integration test for API like `Redis`, it generates Java source
     code using the Java microgenerator and compares them with the goldens files
     in `test/integration/goldens/redis`.
@@ -112,10 +121,20 @@
     bazel test //test/integration:redis
     ```
 
--   Update goldens files based on code generation in integration test, for
-    example `Redis`. It generates Java source code using the Java microgenerator
-    and overwrites the goldens files in `test/integration/goldens/redis` based
-    on code generation.
+-   Run all unit and integration tests.
+
+    ```sh
+    bazel test $(bazel query "src/test/..." | grep "Test$") //test/integration/...
+    ```
+
+-   Update unit test golden files, for example `JavaCodeGeneratorTest.java`:
+
+    ```sh
+    bazel run //src/test/java/com/google/api/generator/engine:JavaCodeGeneratorTest_update
+    ```
+
+-   Update integration test golden files, for example `Redis`. This clobbers all the
+    files in `test/integration/goldens/redis`.
 
     ```sh
     bazel run //test/integration:redis_update

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.