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

chore: add generation config #2792

Merged
merged 10 commits into from
May 23, 2024
Merged

chore: add generation config #2792

merged 10 commits into from
May 23, 2024

Conversation

JoeWang1127
Copy link
Collaborator

@JoeWang1127 JoeWang1127 commented May 21, 2024

In this PR:

  • Add a generation configuration containing common-protos and iam
  • Rename .OwlBot.yaml to .OwlBot-hermetic.yaml and refactor deep copy source dir.
  • Generate libraries using latest image.

@product-auto-label product-auto-label bot added the size: m Pull request size is medium. label May 21, 2024
@JoeWang1127 JoeWang1127 marked this pull request as ready for review May 21, 2024 20:02
@JoeWang1127 JoeWang1127 requested a review from a team as a code owner May 21, 2024 20:02
@JoeWang1127
Copy link
Collaborator Author

Changes in generated proto files should be copyright update.

@@ -0,0 +1,58 @@
gapic_generator_version: 2.40.2-SNAPSHOT
protoc_version: '25.3'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove it after this PR is merged.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done.

gapic_generator_version: 2.40.2-SNAPSHOT
protoc_version: '25.3'
googleapis_commitish: 3d50414a7ff3f0b8ffe8ad7858257396e4f18131
template_excludes:
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we can remove template_excludes now after this PR is merged? Because it is only used for creating new libraries.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This parameter is still required.

I can change it to optional in a follow-up PR, WDYT?

Copy link
Collaborator

Choose a reason for hiding this comment

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

SGTM.

"excluded_dependencies": "proto-google-common-protos,grpc-google-common-protos,proto-google-common-protos-parent",
"excluded_poms": "proto-google-common-protos-bom,proto-google-common-protos"
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we know what is the difference here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ah, there's an additional blank line in the main branch. Since it was not generated before, I think this line is added by hand.

@@ -15,7 +15,7 @@
# build from the root of this repo:
FROM gcr.io/cloud-devrel-public-resources/python

ARG SYNTHTOOL_COMMITTISH=a2c9b4a5da2d7f583c8a1869fd2843c206145834
ARG SYNTHTOOL_COMMITTISH=e36d2f164ca698f0264fb6f79ddc4b0fa024a940
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Change synthtool commit to latest.

See #2772 (comment)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you please elaborate why cloud build was failing?

Copy link
Collaborator Author

@JoeWang1127 JoeWang1127 May 22, 2024

Choose a reason for hiding this comment

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

a2c9b4a5da2d7f583c8a1869fd2843c206145834 is not a merged commit in the main branch of synthtool, it's a commit in the feature branch (libraries-bom-env-var). The feature branch is deleted when merging so I think this commit is delete as well.

@JoeWang1127 JoeWang1127 requested a review from blakeli0 May 22, 2024 13:00
Copy link

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

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

Copy link

Quality Gate Passed 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

@@ -0,0 +1,57 @@
gapic_generator_version: 2.40.2-SNAPSHOT
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let's see if we can remove this version in a separate PR.

@JoeWang1127 JoeWang1127 merged commit 9677bc8 into main May 23, 2024
46 of 47 checks passed
@JoeWang1127 JoeWang1127 deleted the chore/add-generation-config branch May 23, 2024 18:32
lqiu96 pushed a commit that referenced this pull request May 23, 2024
In this PR:
- Add a generation configuration containing `common-protos` and `iam`
- Rename `.OwlBot.yaml` to `.OwlBot-hermetic.yaml` and refactor deep
copy source dir.
- Generate libraries using latest image.
JoeWang1127 added a commit that referenced this pull request May 27, 2024
In this PR:
- Remove `template_excludes` in the generation config
- Update `README.md`

Follow up of #2792.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size: m Pull request size is medium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants