Skip to content

chore(engx): fix service.yaml internal flag name [ggj] #674

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
miraleung merged 1 commit into from
Mar 1, 2021
Merged

chore(engx): fix service.yaml internal flag name [ggj] #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion rules_java_gapic/java_gapic.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def java_gapic_library(
service_yaml_in_allowlist = True
break
if service_yaml_in_allowlist:
file_args_dict[service_yaml] = "gapic-service-config"
file_args_dict[service_yaml] = "api-service-config"
else:
fail("Service.yaml is no longer supported in the Java microgenerator")

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/api/generator/gapic/protoparser/PluginArgumentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class PluginArgumentParser {
// Synced to rules_java_gapic/java_gapic.bzl.
@VisibleForTesting static final String KEY_GRPC_SERVICE_CONFIG = "grpc-service-config";
@VisibleForTesting static final String KEY_GAPIC_CONFIG = "gapic-config";
@VisibleForTesting static final String KEY_SERVICE_YAML_CONFIG = "gapic-service-config";
@VisibleForTesting static final String KEY_SERVICE_YAML_CONFIG = "api-service-config";

private static final String JSON_FILE_ENDING = "grpc_service_config.json";
private static final String GAPIC_YAML_FILE_ENDING = "gapic.yaml";
Expand Down