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.

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

fix: fixes regionTag breakage #1068

Merged
merged 11 commits into from
Nov 1, 2022
Merged

fix: fixes regionTag breakage #1068

merged 11 commits into from
Nov 1, 2022

Conversation

alicejli
Copy link
Contributor

@alicejli alicejli commented Oct 25, 2022

#1047 broke sample generation for ads libraries because some of their protos include the word "Client." This refactors where the RegionTag is getting service name from so that all libraries can generate successfully.

Hopefully is the last PR needed to fix: #1051

@alicejli alicejli marked this pull request as ready for review October 26, 2022 14:01
@alicejli alicejli requested review from a team as code owners October 26, 2022 14:01
@alicejli alicejli requested a review from blakeli0 October 26, 2022 14:01
@snippet-bot
Copy link

snippet-bot bot commented Oct 26, 2022

Here is the summary of changes.

You are about to add 296 region tags.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

renovate-bot and others added 4 commits November 1, 2022 15:44
…lugin to v3.4.1 (#1072)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNC42LjEifQ==-->
…ce (#1075)

* Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. 

* Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated)

* This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process.
@alicejli alicejli closed this Nov 1, 2022
@alicejli alicejli reopened this Nov 1, 2022
@sonarqubecloud
Copy link

sonarqubecloud bot commented Nov 1, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@alicejli alicejli merged commit bed9f72 into googleapis:main Nov 1, 2022
emmileaf added a commit that referenced this pull request Nov 3, 2022
* fix: fixes regionTag breakage

* update credentials integration test

* removing getPureServiceName function

* linter

* refactor test

* chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNC42LjEifQ==-->

* refactor: expose parsed api short name and version as fields in Service (#1075)

* Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. 

* Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated)

* This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process.

* fix: fix REST transport client creation generated javadoc sample (#1077)

* fix: fixes regionTag breakage

* remove errant comment

Co-authored-by: WhiteSource Renovate <bot@renovateapp.com>
Co-authored-by: Emily Wang <emmwang@google.com>
Co-authored-by: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
emmileaf added a commit that referenced this pull request Nov 3, 2022
emmileaf added a commit that referenced this pull request Nov 3, 2022
emmileaf added a commit that referenced this pull request Nov 3, 2022
* Revert "test: update golden files after annotations import fix"

This reverts commit 0bbfc59.

* Revert "fix(ast): add import generation for annotations on VariableExpr (#1076)"

This reverts commit 9e4721f.

* Revert "chore(main): release 2.10.3 (#1079)"

This reverts commit 63b9bce.

* Revert "fix: fixes regionTag breakage (#1068)"

This reverts commit cd35be8.

* Revert "fix: fix REST transport client creation generated javadoc sample (#1077)"

This reverts commit 5346eef.

* Revert "refactor: expose parsed api short name and version as fields in Service (#1075)"

This reverts commit 2ebe948.

* Revert "chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072)"

This reverts commit 6774245.

* Revert "chore(main): release 2.10.2 (#1067)"

This reverts commit e8ee82f.

* Revert "fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 (#1063)"

This reverts commit aa1782d.

* Revert "fix: update regionTag to use service name (#1047)"

This reverts commit 38010fd.

* Revert "chore(main): release 2.10.1 (#1036)"

This reverts commit 3282e0f.

* Revert "deps: Upgrade protobuf to 3.21.7 (#1048)"

This reverts commit c768691.

* Revert "fix: update sample region tag to parse host instead of proto package (#1040)"

This reverts commit eb94f30.

* Revert "chore(deps): update dependency com.google.auto.value:auto-value to v1.10 (#1058)"

This reverts commit bd5599f.

* Revert "fix: Get numeric value for Enum fields if it is configured as query param or path param (#1042)"

This reverts commit 4b5eadb.

* Revert "fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 (#1050)"

This reverts commit e58bf9d.

* Revert "fix(deps): update dependency org.yaml:snakeyaml to v1.33 (#1043)"

This reverts commit d615305.

* Revert "chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 (#1038)"

This reverts commit ce93705.

* Revert "fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 (#1039)"

This reverts commit dba69f4.

* Revert "fix(deps): update dependency org.yaml:snakeyaml to v1.32 (#1037)"

This reverts commit e754a7c.
suztomo pushed a commit that referenced this pull request Dec 16, 2022
* fix: fixes regionTag breakage

* update credentials integration test

* removing getPureServiceName function

* linter

* refactor test

* chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNC42LjEifQ==-->

* refactor: expose parsed api short name and version as fields in Service (#1075)

* Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. 

* Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated)

* This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process.

* fix: fix REST transport client creation generated javadoc sample (#1077)

* fix: fixes regionTag breakage

* remove errant comment

Co-authored-by: WhiteSource Renovate <bot@renovateapp.com>
Co-authored-by: Emily Wang <emmwang@google.com>
Co-authored-by: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update autogenerated snippet regionTags to match other languages
5 participants