Add overlay support to codegen #402
Merged
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
pawelprazak
added
kind/missing
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
3 times, most recently
from
9ae47b8 to
cac9714
Compare
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
4 times, most recently
from
a602349 to
fd8162e
Compare
|
blocked by #407 |
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
from
fd8162e to
ce9d644
Compare
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
from
ce9d644 to
8a0f5e4
Compare
|
Depends on #409 |
pawelprazak
removed
the
blocked
pawelprazak
commented
Mar 7, 2024
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
2 times, most recently
from
a279479 to
f29a8ab
Compare
|
I've addressed the comments, ready for re-review |
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
2 times, most recently
from
3bff8ba to
ad0a44c
Compare
|
Note to self: split the refactoring and the changes, postpone the changes, merge the refactoring. |
- add support for overlays in codegen - refactor codegen to allow for the required changes to be made
pawelprazak
force-pushed
the
pprazak/add-kubernetes-overlays-1
branch
from
ad0a44c to
6aaa82b
Compare
|
I've reduced the scope of this PR to only include the mechanism for overlays and associated refactoring, without any specific overlay implemented. |
pawelprazak
commented
Apr 9, 2024
| @@ -2,6 +2,25 @@ package besom.codegen | |||
|
|
|||
| import besom.model.SemanticVersion | |||
|
|
|||
| case class Config( | |||
There was a problem hiding this comment.
One unified Config instead of separate CodegenConfig, ProviderConfig
pawelprazak
commented
Apr 9, 2024
| objectTypeTokens: Set[String], | ||
| resourceTypeTokens: Set[String], | ||
| enumValueToInstances: Map[PulumiToken, Map[ConstValue, EnumInstanceName]], | ||
| parsedTypes: Map[PulumiDefinitionCoordinates, (TypeDefinition, Boolean)], |
There was a problem hiding this comment.
we pre-process the schema and store parsed types, resources and functions
pawelprazak
commented
Apr 9, 2024
| parsedResources: Map[PulumiDefinitionCoordinates, (ResourceDefinition, Boolean)], | ||
| parsedFunctions: Map[PulumiDefinitionCoordinates, (FunctionDefinition, Boolean)] | ||
| )( | ||
| private[codegen] val pulumiPackage: PulumiPackage, |
There was a problem hiding this comment.
store a reference to the deserialized schema
pawelprazak
commented
Apr 9, 2024
| parsedFunctions: Map[PulumiDefinitionCoordinates, (FunctionDefinition, Boolean)] | ||
| )( | ||
| private[codegen] val pulumiPackage: PulumiPackage, | ||
| private[codegen] val providerConfig: Config.Provider |
There was a problem hiding this comment.
store provider related config (e.g. overlays) per schema
pawelprazak
commented
Apr 9, 2024
| def asPackageMetadata: PackageMetadata = PackageMetadata(name, Some(version)) | ||
|
|
||
| def parseMethods( |
There was a problem hiding this comment.
the parsing logic moved from other places (mostly SchemaProvider and PulumiPackageOps)
pawelprazak
commented
Apr 9, 2024
| def from( | ||
| pulumiPackage: PulumiPackage, | ||
| packageMetadata: PackageMetadata | ||
| )(using Logger, Config): PulumiPackageInfo = PreProcessed.from(pulumiPackage, packageMetadata).process |
There was a problem hiding this comment.
invoke the new 2-stage schema processing
lbialy
approved these changes
Apr 10, 2024
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.
implicit valchanged togiven/usingConfigwith added overlays dir setting (overlaysDir/DefaultOverlaysDir)PulumiPackageInfoPulumiPackageInfoPulumiPackageInfoSchemaProviderandPulumiPackageOpstoPulumiPackageInfoOverlay.scala)fixes #286 (was closed as done, but we were just ignoring the overlays, now we can add them)