Skip to content

[ggj][engx] fix: remove service.yaml from Bazel and input interface #477

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

Closed
miraleung wants to merge 1 commit into from
Closed

[ggj][engx] fix: remove service.yaml from Bazel and input interface #477

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
5 changes: 0 additions & 5 deletions rules_java_gapic/java_gapic.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ def java_gapic_library(
name,
srcs,
package = None,
service_yaml = None,
grpc_service_config = None,
deps = [],
test_deps = [],
Expand All @@ -91,10 +90,6 @@ def java_gapic_library(
if grpc_service_config:
file_args_dict[grpc_service_config] = "grpc-service-config"

# Currently a no-op.
if service_yaml:
file_args_dict[service_yaml] = "gapic-service-config"

srcjar_name = name + "_srcjar"
raw_srcjar_name = srcjar_name + "_raw"
output_suffix = ".srcjar"
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ public static GapicContext parse(CodeGeneratorRequest request) {
Optional<String> serviceYamlConfigPathOpt =
PluginArgumentParser.parseServiceYamlConfigPath(request);
Optional<com.google.api.Service> serviceYamlProtoOpt =
ServiceYamlParser.parse(serviceYamlConfigPathOpt.get());
serviceYamlConfigPathOpt.isPresent()
? ServiceYamlParser.parse(serviceYamlConfigPathOpt.get())
: Optional.empty();

// Keep message and resource name parsing separate for cleaner logic.
// While this takes an extra pass through the protobufs, the extra time is relatively trivial
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