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

Mark external modules as forign #11437

Merged
merged 1 commit into from Nov 23, 2022

Conversation

iwahbe
Copy link
Member

@iwahbe iwahbe commented Nov 22, 2022

Fixes #8070

Progress on #11427

@iwahbe iwahbe self-assigned this Nov 22, 2022
@pulumi-bot
Copy link
Contributor

Changelog

[uncommitted] (2022-11-22)

@iwahbe iwahbe added the impact/no-changelog-required This issue doesn't require a CHANGELOG update label Nov 22, 2022
@iwahbe iwahbe requested review from aq17 and dixler November 22, 2022 20:48
Previously, the names of forign types in the top level were omitted,
since the top level module is always "".

Apply the same fix for enum types.
@iwahbe iwahbe force-pushed the iwahbe/go-external-top-level-pkg-modele-names branch from 593dc7a to 724fae5 Compare November 22, 2022 21:46
@iwahbe
Copy link
Member Author

iwahbe commented Nov 22, 2022

bors r+

1 similar comment
@iwahbe
Copy link
Member Author

iwahbe commented Nov 22, 2022

bors r+

@bors
Copy link
Contributor

bors bot commented Nov 22, 2022

Already running a review

bors bot added a commit that referenced this pull request Nov 22, 2022
11431: Bumps grpcio to version 1.50 r=kpitzen a=kpitzen

Currently, pinning to a version of grpcio <1.50 can cause build errors on newer versions of python+pip - the existing setup.py install method of building libararies is being deprecated and wheels are not being backported for older versions of grpcio.  Since this change is a no-op as far as our python proto clients are concerned, it feels safe to bump to a version that will be supported going forward

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #11276 

Though this change doesn't result in guaranteed Python 3.11 support, it should allow users of Python 3.11 to at least install Pulumi successfully without Deprecation warnings etc.  grpcio 1.4X does not ship 3.11-compatible wheels, so users are starting to see errors when installing Pulumi - bumping to this version also does not change our existing proto clients in Python, so feels like a relatively safe change.

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


11437: Mark external modules as forign r=iwahbe a=iwahbe

Fixes #8070

Progress on #11427

Co-authored-by: Kyle Pitzen <kyle.pitzen@gmail.com>
Co-authored-by: Ian Wahbe <ian@wahbe.com>
bors bot added a commit that referenced this pull request Nov 22, 2022
11431: Bumps grpcio to version 1.50 r=kpitzen a=kpitzen

Currently, pinning to a version of grpcio <1.50 can cause build errors on newer versions of python+pip - the existing setup.py install method of building libararies is being deprecated and wheels are not being backported for older versions of grpcio.  Since this change is a no-op as far as our python proto clients are concerned, it feels safe to bump to a version that will be supported going forward

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #11276 

Though this change doesn't result in guaranteed Python 3.11 support, it should allow users of Python 3.11 to at least install Pulumi successfully without Deprecation warnings etc.  grpcio 1.4X does not ship 3.11-compatible wheels, so users are starting to see errors when installing Pulumi - bumping to this version also does not change our existing proto clients in Python, so feels like a relatively safe change.

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


11437: Mark external modules as forign r=iwahbe a=iwahbe

Fixes #8070

Progress on #11427

Co-authored-by: Kyle Pitzen <kyle.pitzen@gmail.com>
Co-authored-by: Ian Wahbe <ian@wahbe.com>
@bors
Copy link
Contributor

bors bot commented Nov 22, 2022

This PR was included in a batch that was canceled, it will be automatically retried

@justinvp
Copy link
Member

bors cancel

@bors
Copy link
Contributor

bors bot commented Nov 22, 2022

Canceled.

@justinvp
Copy link
Member

Canceled temporarily to get #11436 merged for the release.

@justinvp
Copy link
Member

bors merge

bors bot added a commit that referenced this pull request Nov 23, 2022
11431: Bumps grpcio to version 1.50 r=kpitzen a=kpitzen

Currently, pinning to a version of grpcio <1.50 can cause build errors on newer versions of python+pip - the existing setup.py install method of building libararies is being deprecated and wheels are not being backported for older versions of grpcio.  Since this change is a no-op as far as our python proto clients are concerned, it feels safe to bump to a version that will be supported going forward

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #11276 

Though this change doesn't result in guaranteed Python 3.11 support, it should allow users of Python 3.11 to at least install Pulumi successfully without Deprecation warnings etc.  grpcio 1.4X does not ship 3.11-compatible wheels, so users are starting to see errors when installing Pulumi - bumping to this version also does not change our existing proto clients in Python, so feels like a relatively safe change.

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


11437: Mark external modules as forign r=justinvp a=iwahbe

Fixes #8070

Progress on #11427

11440: Cleanup import generation r=iwahbe a=iwahbe

Cleanup the `getPulumiImport` function.

In doing so, remove an edge causing extraneous `/index` in #11427. 


For reviewers, looking at the diff for this PR is painful. It's much easier to review the old and new code separately.

Part of #11427.

11441: Changelog and go.mod updates for v3.47.2 r=pulumi-bot a=pulumi-bot

bors merge

Co-authored-by: Kyle Pitzen <kyle.pitzen@gmail.com>
Co-authored-by: Ian Wahbe <ian@wahbe.com>
Co-authored-by: github-actions <github-actions@github.com>
@bors
Copy link
Contributor

bors bot commented Nov 23, 2022

This PR was included in a batch that timed out, it will be automatically retried

bors bot added a commit that referenced this pull request Nov 23, 2022
11431: Bumps grpcio to version 1.50 r=kpitzen a=kpitzen

Currently, pinning to a version of grpcio <1.50 can cause build errors on newer versions of python+pip - the existing setup.py install method of building libararies is being deprecated and wheels are not being backported for older versions of grpcio.  Since this change is a no-op as far as our python proto clients are concerned, it feels safe to bump to a version that will be supported going forward

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #11276 

Though this change doesn't result in guaranteed Python 3.11 support, it should allow users of Python 3.11 to at least install Pulumi successfully without Deprecation warnings etc.  grpcio 1.4X does not ship 3.11-compatible wheels, so users are starting to see errors when installing Pulumi - bumping to this version also does not change our existing proto clients in Python, so feels like a relatively safe change.

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


11437: Mark external modules as forign r=justinvp a=iwahbe

Fixes #8070

Progress on #11427

Co-authored-by: Kyle Pitzen <kyle.pitzen@gmail.com>
Co-authored-by: Ian Wahbe <ian@wahbe.com>
@bors
Copy link
Contributor

bors bot commented Nov 23, 2022

This PR was included in a batch that timed out, it will be automatically retried

@bors
Copy link
Contributor

bors bot commented Nov 23, 2022

Build succeeded:

@bors bors bot merged commit 8279e95 into master Nov 23, 2022
@bors bors bot deleted the iwahbe/go-external-top-level-pkg-modele-names branch November 23, 2022 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact/no-changelog-required This issue doesn't require a CHANGELOG update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Go program generation: fails to namespace some imports
4 participants