[sdkgen/python] Fix referencing local types with a different package name #12669
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changelog[uncommitted] (2023-04-17)Bug Fixes
|
Frassle
reviewed
Apr 13, 2023
justinvp
force-pushed
the
justin/embeddedcrds
branch
from
15af5e7
to
29abd6a
Compare
justinvp
changed the title
The Python SDK generator wasn't correctly referencing types that have a different package name in their type token than the name of the schema's package (which is the case when embedding k8s CRD resources/types in a package). This change fixes the generator to emit these local references correctly.
justinvp
force-pushed
the
justin/embeddedcrds
branch
from
29abd6a
to
2db264a
Compare
justinvp
commented
Apr 17, 2023
| @@ -791,9 +790,6 @@ func (mod *modContext) importObjectType(t *schema.ObjectType, input bool) string | |||
| } | |||
|
|
|||
| importPath := mod.getRelImportFromRoot() | |||
| if mod.pkg.Name() != parts[0] { | |||
There was a problem hiding this comment.
Note that we handle external imports at the start of the method:
pulumi/pkg/codegen/python/gen.go
Lines 776 to 778 in 44f2064
What I'm removing seems to be leftover from a previous attempt to support this, which is causing the problems.
justinvp
commented
Apr 17, 2023
| import pulumi.runtime | ||
| from typing import Any, Mapping, Optional, Sequence, Union, overload | ||
| from . import _utilities | ||
| from . import crd_k8s_amazonaws_com as _crd_k8s_amazonaws_com |
There was a problem hiding this comment.
We now import here correctly.
abhinav
approved these changes
Apr 18, 2023
|
bors merge |
|
Build succeeded:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Python SDK generator wasn't correctly referencing types that have a different package name in their type token than the name of the schema's package (which is the case when embedding k8s CRD resources/types in a package). This change fixes the generator to emit these local references correctly.
Fixes #12624