fix: only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` #2731

JoeWang1127 · 2024-05-03T19:45:51Z

In this PR:

Only append .api.grpc suffix to group id if the corresponding artifact id starts with proto- or grpc-.

We need to support ad-manager, which is the first artifact id doesn't start with proto-, grpc- and google-.

blakeli0 · 2024-05-03T22:22:28Z

library_generation/test/owlbot/fix_poms_unit_tests.py

+        shutil.copyfile(golden, pom)
+
+    @classmethod
+    def __compare_pom_in_subdir(cls, base_dir: str, subdir: str):


Maybe this can be moved to compare_poms.py.

blakeli0 · 2024-05-03T22:24:35Z

library_generation/test/owlbot/fix_poms_unit_tests.py

+
+
+class FixPomsTest(unittest.TestCase):
+    def test_fix_poms_update_poms_for_ad_manager_correctly(self):


The test case is not specific to ad_manager, more like non-cloud, or group_id_does_not_start_with_google to be more specific.

sonarcloud · 2024-05-03T22:39:17Z

Quality Gate passed for 'gapic-generator-java-root'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

sonarcloud · 2024-05-03T22:42:26Z

Quality Gate passed for 'java_showcase_integration_tests'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

🤖 I have created a release *beep* *boop* --- <details><summary>2.40.1</summary> ## [2.40.1](v2.40.0...v2.40.1) (2024-05-15) ### Bug Fixes * [common-protos] An existing method `UpdateVehicleLocation` is ([7f96074](7f96074)) * [common-protos] An existing method `UpdateVehicleLocation` is removed from service `VehicleService` ([#2751](#2751)) ([7f96074](7f96074)) * [iam] An existing method `UpdateVehicleLocation` is removed from ([4a1ae7b](4a1ae7b)) * [iam] An existing method `UpdateVehicleLocation` is removed from service `VehicleService` ([#2752](#2752)) ([4a1ae7b](4a1ae7b)) * do not populate repo level change while removing library ([#2740](#2740)) ([43e62b9](43e62b9)) * only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` ([#2731](#2731)) ([8e87b2e](8e87b2e)) * opentelemetry-bom to be in third-party-dependencies BOM ([#2736](#2736)) ([4ecc89b](4ecc89b)) * prepare to generate grafeas ([#2761](#2761)) ([1114f18](1114f18)) * Replace deprecated protobuf methods. ([#2764](#2764)) ([986c090](986c090)) ### Dependencies * update dependency black to v24.4.2 ([#2660](#2660)) ([1cbb681](1cbb681)) * update dependency com.fasterxml.jackson:jackson-bom to v2.17.1 ([#2732](#2732)) ([891b01d](891b01d)) * update dependency com.google.cloud:grpc-gcp to v1.6.0 ([#2767](#2767)) ([a39aa07](a39aa07)) * update dependency com.google.errorprone:error_prone_annotations to v2.27.1 ([#2708](#2708)) ([4d7d246](4d7d246)) * update dependency com.google.errorprone:error_prone_annotations to v2.27.1 ([#2709](#2709)) ([4e31d7d](4e31d7d)) * update dependency com.google.oauth-client:google-oauth-client-bom to v1.36.0 ([#2768](#2768)) ([22b7398](22b7398)) * update dependency commons-codec:commons-codec to v1.17.0 ([#2710](#2710)) ([b87356c](b87356c)) * update dependency jinja2 to v3.1.4 [security] ([#2742](#2742)) ([d67eaf8](d67eaf8)) * update dependency lxml to v5.2.2 ([#2766](#2766)) ([df7e211](df7e211)) * update dependency markupsafe to v2.1.5 ([#2657](#2657)) ([805baf8](805baf8)) * update dependency net.bytebuddy:byte-buddy to v1.14.15 ([#2753](#2753)) ([a472620](a472620)) * update dependency platformdirs to v4.2.1 ([#2662](#2662)) ([dbdcc91](dbdcc91)) * update googleapis/java-cloud-bom digest to db4265f ([#2755](#2755)) ([908db6f](908db6f)) * update googleapis/java-cloud-bom digest to f3c611a ([#2700](#2700)) ([d254e9b](d254e9b)) * update opentelemetry-java monorepo to v1.38.0 ([#2769](#2769)) ([0a5c7c4](0a5c7c4)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>

…arts with `proto-` or `grpc-` (#2731) In this PR: - Only append `.api.grpc` suffix to group id if the corresponding artifact id starts with `proto-` or `grpc-`. We need to support `ad-manager`, which is the first artifact id doesn't start with `proto-`, `grpc-` and `google-`.

🤖 I have created a release *beep* *boop* --- <details><summary>2.40.1</summary> ## [2.40.1](v2.40.0...v2.40.1) (2024-05-15) ### Bug Fixes * [common-protos] An existing method `UpdateVehicleLocation` is ([7f96074](7f96074)) * [common-protos] An existing method `UpdateVehicleLocation` is removed from service `VehicleService` ([#2751](#2751)) ([7f96074](7f96074)) * [iam] An existing method `UpdateVehicleLocation` is removed from ([4a1ae7b](4a1ae7b)) * [iam] An existing method `UpdateVehicleLocation` is removed from service `VehicleService` ([#2752](#2752)) ([4a1ae7b](4a1ae7b)) * do not populate repo level change while removing library ([#2740](#2740)) ([43e62b9](43e62b9)) * only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` ([#2731](#2731)) ([8e87b2e](8e87b2e)) * opentelemetry-bom to be in third-party-dependencies BOM ([#2736](#2736)) ([4ecc89b](4ecc89b)) * prepare to generate grafeas ([#2761](#2761)) ([1114f18](1114f18)) * Replace deprecated protobuf methods. ([#2764](#2764)) ([986c090](986c090)) ### Dependencies * update dependency black to v24.4.2 ([#2660](#2660)) ([1cbb681](1cbb681)) * update dependency com.fasterxml.jackson:jackson-bom to v2.17.1 ([#2732](#2732)) ([891b01d](891b01d)) * update dependency com.google.cloud:grpc-gcp to v1.6.0 ([#2767](#2767)) ([a39aa07](a39aa07)) * update dependency com.google.errorprone:error_prone_annotations to v2.27.1 ([#2708](#2708)) ([4d7d246](4d7d246)) * update dependency com.google.errorprone:error_prone_annotations to v2.27.1 ([#2709](#2709)) ([4e31d7d](4e31d7d)) * update dependency com.google.oauth-client:google-oauth-client-bom to v1.36.0 ([#2768](#2768)) ([22b7398](22b7398)) * update dependency commons-codec:commons-codec to v1.17.0 ([#2710](#2710)) ([b87356c](b87356c)) * update dependency jinja2 to v3.1.4 [security] ([#2742](#2742)) ([d67eaf8](d67eaf8)) * update dependency lxml to v5.2.2 ([#2766](#2766)) ([df7e211](df7e211)) * update dependency markupsafe to v2.1.5 ([#2657](#2657)) ([805baf8](805baf8)) * update dependency net.bytebuddy:byte-buddy to v1.14.15 ([#2753](#2753)) ([a472620](a472620)) * update dependency platformdirs to v4.2.1 ([#2662](#2662)) ([dbdcc91](dbdcc91)) * update googleapis/java-cloud-bom digest to db4265f ([#2755](#2755)) ([908db6f](908db6f)) * update googleapis/java-cloud-bom digest to f3c611a ([#2700](#2700)) ([d254e9b](d254e9b)) * update opentelemetry-java monorepo to v1.38.0 ([#2769](#2769)) ([0a5c7c4](0a5c7c4)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>

JoeWang1127 added 3 commits May 3, 2024 15:36

fix: do not change group id if the artifact id starts with ad-

49a7641

add comment

5bbf73c

add comment

fe6e77a

product-auto-label bot added the size: s Pull request size is small. label May 3, 2024

Merge branch 'main' into fix/fix-artifact-id

cf92835

JoeWang1127 marked this pull request as ready for review May 3, 2024 19:55

JoeWang1127 requested a review from a team as a code owner May 3, 2024 19:55

JoeWang1127 requested a review from blakeli0 May 3, 2024 19:55

JoeWang1127 changed the title ~~fix: fix artifact~~ fix: only append .api.grpc suffix to group id if the artifact id starts with proto- or grpc- May 3, 2024

add unit test

6a463d8

product-auto-label bot added size: l Pull request size is large. and removed size: s Pull request size is small. labels May 3, 2024

blakeli0 reviewed May 3, 2024

View reviewed changes

code refactor

6faf2db

blakeli0 approved these changes May 3, 2024

View reviewed changes

JoeWang1127 merged commit 8e87b2e into main May 4, 2024
30 checks passed

JoeWang1127 deleted the fix/fix-artifact-id branch May 4, 2024 00:59

release-please bot mentioned this pull request May 3, 2024

chore(main): release 2.40.1 #2729

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` #2731

fix: only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` #2731

JoeWang1127 commented May 3, 2024 •

edited

Loading

blakeli0 May 3, 2024

JoeWang1127 May 3, 2024

blakeli0 May 3, 2024

JoeWang1127 May 3, 2024

sonarcloud bot commented May 3, 2024

sonarcloud bot commented May 3, 2024



		class FixPomsTest(unittest.TestCase):
		def test_fix_poms_update_poms_for_ad_manager_correctly(self):

fix: only append .api.grpc suffix to group id if the artifact id starts with proto- or grpc- #2731

fix: only append .api.grpc suffix to group id if the artifact id starts with proto- or grpc- #2731

Conversation

JoeWang1127 commented May 3, 2024 • edited Loading

blakeli0 May 3, 2024

Choose a reason for hiding this comment

JoeWang1127 May 3, 2024

Choose a reason for hiding this comment

blakeli0 May 3, 2024

Choose a reason for hiding this comment

JoeWang1127 May 3, 2024

Choose a reason for hiding this comment

sonarcloud bot commented May 3, 2024

Quality Gate passed for 'gapic-generator-java-root'

sonarcloud bot commented May 3, 2024

Quality Gate passed for 'java_showcase_integration_tests'

fix: only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` #2731

fix: only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` #2731

JoeWang1127 commented May 3, 2024 •

edited

Loading