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

fix(build_gen): use consistent names for open source package #59

Closed
wants to merge 2 commits into from
Closed

fix(build_gen): use consistent names for open source package #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c65996
fix(build_gen): use consistent names for open source package
jpoehnelt Jul 1, 2021
0ac3d78
fix: use additional assembly rule to maintain output name
jpoehnelt Jul 8, 2021
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
94 changes: 67 additions & 27 deletions bazel/src/main/java/com/google/api/codegen/bazel/BUILD.bazel.gapic_api.mustache
View file
Open in desktop
Expand Up @@ -81,14 +81,22 @@ java_gapic_test(
)

# Open Source Packages
java_gapic_assembly_gradle_pkg_deps = [
Copy link
Contributor

@vam-google vam-google Jul 9, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is too verbose and non-idiomatic (to keep dependencies in a separate variable; also in that chase the variable shoudd be named _LIKE_THIS).

":{{name}}_java_gapic",
":{{name}}_java_grpc",
":{{name}}_java_proto",
":{{name}}_proto",
]

java_gapic_assembly_gradle_pkg(
name = "{{assembly_name}}-{{version}}-java",
deps = java_gapic_assembly_gradle_pkg_deps,
)

java_gapic_assembly_gradle_pkg(
name = "google-cloud-{{assembly_name}}-{{version}}-java",
deps = [
":{{name}}_java_gapic",
":{{name}}_java_grpc",
":{{name}}_java_proto",
":{{name}}_proto",
],
deps = java_gapic_assembly_gradle_pkg_deps,
deprecated = "Please use :{{assembly_name}}-{{version}}-java."
)

##############################################################################
Expand Down Expand Up @@ -132,14 +140,22 @@ go_test(
)

# Open Source Packages
go_gapic_assembly_pkg_deps = [
":{{name}}_go_gapic",
":{{name}}_go_gapic_srcjar-test.srcjar",
":{{name}}_go_gapic_srcjar-metadata.srcjar",
":{{name}}_go_proto",
]

go_gapic_assembly_pkg(
name = "{{assembly_name}}-{{version}}-go",
deps = go_gapic_assembly_pkg_deps,
)

go_gapic_assembly_pkg(
name = "gapi-cloud-{{assembly_name}}-{{version}}-go",
deps = [
":{{name}}_go_gapic",
":{{name}}_go_gapic_srcjar-test.srcjar",
":{{name}}_go_gapic_srcjar-metadata.srcjar",
":{{name}}_go_proto",
],
deps = go_gapic_assembly_pkg_deps,
deprecated = "Please use :{{assembly_name}}-{{version}}-go."
)

##############################################################################
Expand Down Expand Up @@ -199,13 +215,21 @@ php_gapic_library(
)

# Open Source Packages
php_gapic_assembly_pkg_deps = [
":{{name}}_php_gapic",
":{{name}}_php_grpc",
":{{name}}_php_proto",
]

php_gapic_assembly_pkg(
name = "{{assembly_name}}-{{version}}-php",
deps = php_gapic_assembly_pkg_deps,
)

php_gapic_assembly_pkg(
name = "google-cloud-{{assembly_name}}-{{version}}-php",
deps = [
":{{name}}_php_gapic",
":{{name}}_php_grpc",
":{{name}}_php_proto",
],
deps = php_gapic_assembly_pkg_deps,
deprecated = "Please use :{{assembly_name}}-{{version}}-php."
)

##############################################################################
Expand Down Expand Up @@ -272,13 +296,21 @@ ruby_cloud_gapic_library(
)

# Open Source Packages
ruby_gapic_assembly_pkg_deps = [
":{{name}}_ruby_gapic",
":{{name}}_ruby_grpc",
":{{name}}_ruby_proto",
]

ruby_gapic_assembly_pkg(
name = "{{assembly_name}}-{{version}}-ruby",
deps = ruby_gapic_assembly_pkg_deps,
)

ruby_gapic_assembly_pkg(
name = "google-cloud-{{assembly_name}}-{{version}}-ruby",
deps = [
":{{name}}_ruby_gapic",
":{{name}}_ruby_grpc",
":{{name}}_ruby_proto",
],
deps = ruby_gapic_assembly_pkg_deps,
deprecated = "Please use :{{assembly_name}}-{{version}}-ruby."
)

##############################################################################
Expand Down Expand Up @@ -315,13 +347,21 @@ csharp_gapic_library(
)

# Open Source Packages
csharp_gapic_assembly_pkg_deps = [
":{{name}}_csharp_gapic",
":{{name}}_csharp_grpc",
":{{name}}_csharp_proto",
]

csharp_gapic_assembly_pkg(
name = "{{assembly_name}}-{{version}}-csharp",
deps = csharp_gapic_assembly_pkg_deps,
)

csharp_gapic_assembly_pkg(
name = "google-cloud-{{assembly_name}}-{{version}}-csharp",
deps = [
":{{name}}_csharp_gapic",
":{{name}}_csharp_grpc",
":{{name}}_csharp_proto",
],
deps = csharp_gapic_assembly_pkg_deps,
deprecated = "Please use :{{assembly_name}}-{{version}}-csharp."
)

##############################################################################
Expand Down
40 changes: 35 additions & 5 deletions bazel/src/test/data/googleapis/google/example/library/v1/BUILD.bazel.baseline
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@ java_gapic_test(

# Open Source Packages
java_gapic_assembly_gradle_pkg(
name = "google-cloud-example-library-v1-java",
name = "example-library-v1-java",
deps = [
":library_java_gapic",
":library_java_grpc",
Expand All @@ -97,6 +97,12 @@ java_gapic_assembly_gradle_pkg(
],
)

alias(
Copy link
Contributor

@vam-google vam-google Jul 9, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adds aliasing to solve the non-pretty name issue. This is too verbose and seems not worth it.

name = "google-cloud-example-library-v1-java",
actual = ":example-library-v1-go",
deprecated = "Please use :example-library-v1-java."
)

##############################################################################
# Go
##############################################################################
Expand Down Expand Up @@ -141,7 +147,7 @@ go_test(

# Open Source Packages
go_gapic_assembly_pkg(
name = "gapi-cloud-example-library-v1-go",
name = "example-library-v1-go",
deps = [
":library_go_gapic",
":library_go_gapic_srcjar-test.srcjar",
Expand All @@ -150,6 +156,12 @@ go_gapic_assembly_pkg(
],
)

alias(
name = "gapi-cloud-example-library-v1-go",
actual = ":example-library-v1-go",
deprecated = "Please use :example-library-v1-go."
)

##############################################################################
# Python
##############################################################################
Expand Down Expand Up @@ -208,14 +220,20 @@ php_gapic_library(

# Open Source Packages
php_gapic_assembly_pkg(
name = "google-cloud-example-library-v1-php",
name = "example-library-v1-php",
deps = [
":library_php_gapic",
":library_php_grpc",
":library_php_proto",
],
)

alias(
name = "google-cloud-example-library-v1-php",
actual = ":example-library-v1-php",
deprecated = "Please use :example-library-v1-php."
)

##############################################################################
# Node.js
##############################################################################
Expand Down Expand Up @@ -281,14 +299,20 @@ ruby_cloud_gapic_library(

# Open Source Packages
ruby_gapic_assembly_pkg(
name = "google-cloud-example-library-v1-ruby",
name = "example-library-v1-ruby",
deps = [
":library_ruby_gapic",
":library_ruby_grpc",
":library_ruby_proto",
],
)

alias(
name = "google-cloud-example-library-v1-ruby",
actual = ":example-library-v1-ruby",
deprecated = "Please use :example-library-v1-ruby."
)

##############################################################################
# C#
##############################################################################
Expand Down Expand Up @@ -324,14 +348,20 @@ csharp_gapic_library(

# Open Source Packages
csharp_gapic_assembly_pkg(
name = "google-cloud-example-library-v1-csharp",
name = "example-library-v1-csharp",
deps = [
":library_csharp_gapic",
":library_csharp_grpc",
":library_csharp_proto",
],
)

alias(
name = "google-cloud-example-library-v1-csharp",
actual = ":example-library-v1-csharp",
deprecated = "Please use :example-library-v1-csharp."
)

##############################################################################
# C++
##############################################################################
Expand Down
40 changes: 35 additions & 5 deletions bazel/src/test/data/googleapis/google/example/library/v1legacy/BUILD.bazel.baseline
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@ java_gapic_test(

# Open Source Packages
java_gapic_assembly_gradle_pkg(
name = "google-cloud-example-library-v1-java",
name = "example-library-v1-java",
deps = [
":library_java_gapic",
":library_java_grpc",
Expand All @@ -97,6 +97,12 @@ java_gapic_assembly_gradle_pkg(
],
)

alias(
name = "google-cloud-example-library-v1-java",
actual = ":example-library-v1-go",
deprecated = "Please use :example-library-v1-java."
)

##############################################################################
# Go
##############################################################################
Expand Down Expand Up @@ -141,7 +147,7 @@ go_test(

# Open Source Packages
go_gapic_assembly_pkg(
name = "gapi-cloud-example-library-v1-go",
name = "example-library-v1-go",
deps = [
":library_go_gapic",
":library_go_gapic_srcjar-test.srcjar",
Expand All @@ -150,6 +156,12 @@ go_gapic_assembly_pkg(
],
)

alias(
name = "gapi-cloud-example-library-v1-go",
actual = ":example-library-v1-go",
deprecated = "Please use :example-library-v1-go."
)

##############################################################################
# Python
##############################################################################
Expand Down Expand Up @@ -208,14 +220,20 @@ php_gapic_library(

# Open Source Packages
php_gapic_assembly_pkg(
name = "google-cloud-example-library-v1-php",
name = "example-library-v1-php",
deps = [
":library_php_gapic",
":library_php_grpc",
":library_php_proto",
],
)

alias(
name = "google-cloud-example-library-v1-php",
actual = ":example-library-v1-php",
deprecated = "Please use :example-library-v1-php."
)

##############################################################################
# Node.js
##############################################################################
Expand Down Expand Up @@ -281,14 +299,20 @@ ruby_cloud_gapic_library(

# Open Source Packages
ruby_gapic_assembly_pkg(
name = "google-cloud-example-library-v1-ruby",
name = "example-library-v1-ruby",
deps = [
":library_ruby_gapic",
":library_ruby_grpc",
":library_ruby_proto",
],
)

alias(
name = "google-cloud-example-library-v1-ruby",
actual = ":example-library-v1-ruby",
deprecated = "Please use :example-library-v1-ruby."
)

##############################################################################
# C#
##############################################################################
Expand Down Expand Up @@ -324,14 +348,20 @@ csharp_gapic_library(

# Open Source Packages
csharp_gapic_assembly_pkg(
name = "google-cloud-example-library-v1-csharp",
name = "example-library-v1-csharp",
deps = [
":library_csharp_gapic",
":library_csharp_grpc",
":library_csharp_proto",
],
)

alias(
name = "google-cloud-example-library-v1-csharp",
actual = ":example-library-v1-csharp",
deprecated = "Please use :example-library-v1-csharp."
)

##############################################################################
# C++
##############################################################################
Expand Down
4 changes: 2 additions & 2 deletions bazel/src/test/java/com/google/api/codegen/bazel/BuildFileGeneratorTest.java
View file
Open in desktop
Expand Up @@ -117,11 +117,11 @@ public void testRegeneration() throws IOException, InterruptedException {
gapicBuildFilePath, "library_nodejs_gapic", "extra_protoc_parameters", "param2");
buildozer.batchSetAttribute(
gapicBuildFilePath,
"google-cloud-example-library-v1-csharp",
"example-library-v1-csharp",
"name",
"renamed_csharp_rule");
buildozer.batchSetAttribute(
gapicBuildFilePath, "google-cloud-example-library-v1-java", "name", "renamed_java_rule");
gapicBuildFilePath, "example-library-v1-java", "name", "renamed_java_rule");
buildozer.batchSetAttribute(
gapicBuildFilePath, "library_ruby_gapic", "ruby_cloud_title", "Title with spaces");

Expand Down