Skip to content

Commit

Permalink
fix(service.yaml): Remove allowlist restriction (#776)
Browse files Browse the repository at this point in the history
  • Loading branch information
miraleung committed Jun 22, 2021
1 parent c820361 commit 8f42efd
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions rules_java_gapic/java_gapic.bzl
Expand Up @@ -14,7 +14,6 @@

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

SERVICE_YAML_ALLOWLIST = ["clouddms", "cloudkms", "datastream", "pubsub"]
NO_GRPC_CONFIG_ALLOWLIST = ["library"]

def _java_gapic_postprocess_srcjar_impl(ctx):
Expand Down Expand Up @@ -144,19 +143,8 @@ def _java_gapic_srcjar(
if gapic_yaml:
file_args_dict[gapic_yaml] = "gapic-config"

# Check the allow-list.
# TODO: Open this up after mixins are published, and gate on
# the allowlisted "mixed-in" APIs present in Java.
if service_yaml:
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] = "api-service-config"
else:
fail("Service.yaml is no longer supported in the Java microgenerator")
file_args_dict[service_yaml] = "api-service-config"

output_suffix = ".srcjar"
opt_args = []
Expand Down

0 comments on commit 8f42efd

Please sign in to comment.