Skip to content

[ggj][engx] feat: prevent non-allowlisted APIs from supplying service.yaml #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 13, 2020
Merged

[ggj][engx] feat: prevent non-allowlisted APIs from supplying service.yaml #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0725750
fix: swap assertEquals args in JavaWriterVisitorTest to match (expect…
miraleung Nov 7, 2020
67f3a15
fix: swap assertEquals args in ImportWriterVisitorTest to match (expe…
miraleung Nov 7, 2020
1e1a86b
fix: add node validator to refactor/centralize null element checks
miraleung Nov 7, 2020
0a6662c
test: update logging integration goldens with gapic.yaml
miraleung Nov 10, 2020
e9cdf58
feat!: remove gapic.yaml from Bazel and input interface
miraleung Nov 10, 2020
827049d
feat!: remove all per-RPC batching codegen logic
miraleung Nov 10, 2020
ea153c5
fix: update tests
miraleung Nov 10, 2020
7f15ea5
Merge branch 'gp/g1' of github.com:googleapis/gapic-generator-java in…
miraleung Nov 10, 2020
0722246
fix: handle wildcard-only resource_reference
miraleung Nov 11, 2020
8087ace
fix: make service.yaml optional
miraleung Nov 12, 2020
b9c5d42
fix: remove iam, longrunning from codegen for all non-iam,longrunning…
miraleung Nov 12, 2020
727c98e
feat: handle IAM RPCs in pubsub and KMS APIs
miraleung Nov 12, 2020
c100c93
feat: prevent non-allowlisted APIs from supplying service.yaml
miraleung Nov 12, 2020
f963f7e
fix: update goldens
miraleung Nov 12, 2020
622a4ac
Merge branch 'master' into gp/g7
miraleung Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions rules_java_gapic/java_gapic.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

load("@com_google_api_codegen//rules_gapic:gapic.bzl", "proto_custom_library", "unzipped_srcjar")

SERVICE_YAML_ALLOWLIST = ["googleads"]

def _java_gapic_postprocess_srcjar_impl(ctx):
gapic_srcjar = ctx.file.gapic_srcjar
output_srcjar_name = ctx.label.name
Expand Down Expand Up @@ -91,9 +93,17 @@ def java_gapic_library(
if grpc_service_config:
file_args_dict[grpc_service_config] = "grpc-service-config"

# Currently a no-op.
# Check the allow-list.
if service_yaml:
file_args_dict[service_yaml] = "gapic-service-config"
service_yaml_in_allowlist = False
for keyword in SERVICE_YAML_ALLOWLIST:
if keyword in service_yaml:
service_yaml_in_allowlist = True
break
if service_yaml_in_allowlist:
file_args_dict[service_yaml] = "gapic-service-config"
else:
fail("Service.yaml is no longer supported in the Java microgenerator")

srcjar_name = name + "_srcjar"
raw_srcjar_name = srcjar_name + "_raw"
Expand Down
3 changes: 0 additions & 3 deletions test/integration/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ java_gapic_library(
srcs = ["@com_google_googleapis//google/cloud/asset/v1:asset_proto_with_info"],
grpc_service_config = "@com_google_googleapis//google/cloud/asset/v1:cloudasset_grpc_service_config.json",
package = "google.cloud.asset.v1",
service_yaml = "@com_google_googleapis//google/cloud/asset/v1:cloudasset_v1.yaml",
test_deps = [
"@com_google_googleapis//google/cloud/asset/v1:asset_java_grpc",
"@com_google_googleapis//google/iam/v1:iam_java_grpc",
Expand Down Expand Up @@ -88,7 +87,6 @@ java_gapic_library(
srcs = ["redis_proto_with_info"],
grpc_service_config = "@com_google_googleapis//google/cloud/redis/v1:redis_grpc_service_config.json",
package = "google.cloud.redis.v1",
service_yaml = "@com_google_googleapis//google/cloud/redis/v1:redis_v1.yaml",
test_deps = [
"@com_google_googleapis//google/cloud/redis/v1:redis_java_grpc",
],
Expand All @@ -113,7 +111,6 @@ java_gapic_library(
srcs = ["@com_google_googleapis//google/logging/v2:logging_proto_with_info"],
grpc_service_config = "@com_google_googleapis//google/logging/v2:logging_grpc_service_config.json",
package = "google.logging.v2",
service_yaml = "@com_google_googleapis//google/logging/v2:logging.yaml",
test_deps = [
"@com_google_googleapis//google/logging/v2:logging_java_grpc",
],
Expand Down
4 changes: 1 addition & 3 deletions test/integration/goldens/asset/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
*/

/**
* A client to Cloud Asset API
*
* <p>The interfaces provided are listed below, along with usage samples.
* The interfaces provided are listed below, along with usage samples.
*
* <p>======================= AssetServiceClient =======================
*
Expand Down
4 changes: 1 addition & 3 deletions test/integration/goldens/logging/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
*/

/**
* A client to Cloud Logging API
*
* <p>The interfaces provided are listed below, along with usage samples.
* The interfaces provided are listed below, along with usage samples.
*
* <p>======================= LoggingServiceV2Client =======================
*
Expand Down
4 changes: 1 addition & 3 deletions test/integration/goldens/redis/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
*/

/**
* A client to Google Cloud Memorystore for Redis API
*
* <p>The interfaces provided are listed below, along with usage samples.
* The interfaces provided are listed below, along with usage samples.
*
* <p>======================= CloudRedisClient =======================
*
Expand Down