[program-gen] Emit invoke options and invoke output options in generated programs #1586
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
Zaid-Ajaj
commented
Jan 11, 2025
pkg/codegen/testing/test/testdata/aws-fargate-pp/java/aws-fargate.java
Outdated
Show resolved
Hide resolved
lunaris
approved these changes
Jan 14, 2025
pkg/codegen/java/gen_program.go
Outdated
| // i.e. (new InvokeOutputOptions.Builder()).dependsOn(resource).build() | ||
| functionImports.Add("com.pulumi.deployment.InvokeOutputOptions") | ||
| } else if len(call.Args) == 3 { | ||
| functionImports.Add("com.pulumi.deployment.InvokeOptions") |
There was a problem hiding this comment.
Maybe tweak this to just check the length once?
if len(call.Args) == 3 {
// Comments as above etc.
if containsDependsOnInvokeOption(call.Args[2]) {
} else {
}
}
pkg/codegen/java/gen_program.go
Outdated
| func inspectFunctionCall(nodes []pcl.Node, inspect func(*model.FunctionCallExpression)) { | ||
| for _, node := range nodes { | ||
| diags := node.VisitExpressions(model.IdentityVisitor, func(x model.Expression) (model.Expression, hcl.Diagnostics) { | ||
| // Ignore the node if it is not a call to invoke. |
There was a problem hiding this comment.
I reckon just add a doc comment to the function explaining what it's doing, then you don't need this line (which I think applies to more than just invokes anyway -- any built-in would also trigger it, right?
There was a problem hiding this comment.
Added better docs ✅
| // in this case we rename the parameter to _data | ||
| // it becomes data.applyValue(_data -> _data.result()) | ||
| paramName := expr.Signature.Parameters[0].Name | ||
| modifiedParamName := "_" + paramName |
There was a problem hiding this comment.
I suspect this isn't safe in general (there might be another variable named _data in scope, for instance) but it's probably a good starting point for now. Probably should add another conformance test around shadowing etc. in future.
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.
Built on top of #1585 in order to generate
InvokeOptionsfor invoke calls.l2-resource-config/ plugin download URL code generation #1566l2-invoke-optionsapply(...)data.applyValue(data -> data.result())becomesdata.applyValue(_data -> _data.result())apply(...)calls for invokes when used in output variablesThis PR prepares program-gen and sdk to handle
l2-invoke-options-depends-onwhich currently generate correct programs but fails the actual conformance test where the invoke has no dependencies cc @julienp