Skip to content
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

Jump to bottom

[ggj][bazel] fix: append Bazel input deps without dupes #578

Merged
merged 2 commits into from
Dec 2, 2020
Merged

[ggj][bazel] fix: append Bazel input deps without dupes #578

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f763e2f
fix: append Bazel input deps without dupes
miraleung Dec 1, 2020
74570a1
Merge branch 'master' into dev/0
miraleung Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 25 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 @@ -99,6 +99,26 @@ _java_gapic_postprocess_srcjar = rule(
implementation = _java_gapic_postprocess_srcjar_impl,
)

def _extract_common_proto_dep(dep):
return dep[dep.index("/"):] if "//google" in dep else dep

def _append_dep_without_duplicates(dest_deps, new_deps):
"""
Appends new_deps into dest_deps only if elements in new_deps
are not already present in dest_deps.
A workaround for the lack of sets in skylark.
"""

# Naive dep checking, since the source (i.e. prefixed) repo can vary.
# Examine only "//google"-prefixed targets, since common proto deps
# are more likely to be duplicated.
processed_dest_deps = [_extract_common_proto_dep(dep) for dep in dest_deps]
processed_new_deps = [_extract_common_proto_dep(dep) for dep in new_deps]
for i in range(len(new_deps)):
if processed_new_deps[i] not in processed_dest_deps:
dest_deps.append(new_deps[i])
return dest_deps

def java_gapic_library(
name,
srcs,
Expand Down Expand Up @@ -169,7 +189,7 @@ def java_gapic_library(
)

# General additional deps.
actual_deps = deps + resource_name_deps + [
actual_deps = resource_name_deps + [
"@com_google_googleapis//google/rpc:rpc_java_proto",
"@com_google_googleapis//google/longrunning:longrunning_java_proto",
"@com_google_protobuf//:protobuf_java",
Expand All @@ -187,6 +207,7 @@ def java_gapic_library(
"@com_google_http_client_google_http_client//jar",
"@javax_annotation_javax_annotation_api//jar",
]
_append_dep_without_duplicates(actual_deps, deps)

native.java_library(
name = name,
Expand All @@ -196,7 +217,7 @@ def java_gapic_library(
)

# Test deps.
actual_test_deps = test_deps + actual_deps + [
actual_test_deps = [
"@com_google_googleapis//google/type:type_java_proto", # Commonly used.
"@com_google_api_gax_java//gax-grpc:gax_grpc_testlib",
"@com_google_api_gax_java//gax:gax_testlib",
Expand All @@ -207,6 +228,8 @@ def java_gapic_library(
"@io_opencensus_opencensus_contrib_grpc_metrics//jar",
"@junit_junit//jar",
]
_append_dep_without_duplicates(actual_test_deps, test_deps)
_append_dep_without_duplicates(actual_test_deps, actual_deps)

native.java_library(
name = "%s_test" % name,
Expand Down