Allow specifying dependencies for output invokes #693
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
julienp
force-pushed
the
julienp/depends-on
branch
from
a0e5006 to
caf1dd9
Compare
julienp
commented
Nov 22, 2024
julienp
force-pushed
the
julienp/depends-on
branch
from
caf1dd9 to
c07a146
Compare
julienp
changed the title
julienp
commented
Dec 4, 2024
lunaris
approved these changes
Dec 4, 2024
pkg/pulumiyaml/run.go
Outdated
| if err != nil { | ||
| return e.error(t, err.Error()) | ||
| } | ||
|
|
||
| if t.Return.GetValue() == "" { | ||
| output := pulumi.OutputWithDependencies(context.TODO(), pulumi.Any(result), deps...) |
There was a problem hiding this comment.
e.pulumiCtx has a .Context() which might be a good thing to hang this off, rather than TODO?
There was a problem hiding this comment.
Yep, there's another call to context.TODO just above in the call to ResolveFunction, I'll update that one too.
pkg/pulumiyaml/run.go
Outdated
| } | ||
|
|
||
| retv, ok := result[t.Return.Value] | ||
| if !ok { | ||
| e.error(t.Return, fmt.Sprintf("Unable to evaluate result[%v], result is: %+v", t.Return.Value, t.Return)) | ||
| return e.error(t.Return, fmt.Sprintf("fn::invoke of %s did not contain a property '%s' in the returned value", t.Token.Value, t.Return.Value)) | ||
| } | ||
|
|
||
| output := pulumi.OutputWithDependencies(context.TODO(), pulumi.Any(retv), deps...) |
There was a problem hiding this comment.
Same thoughts about context.TODO here.
| @@ -216,7 +216,7 @@ runtime: yaml | |||
| requireNoErrors(t, tmpl, diags) | |||
| } | |||
|
|
|||
| func TestInvokeReturningSecrets(t *testing.T) { | |||
| func TestInvokeReturningSecretsWithReturn(t *testing.T) { | |||
There was a problem hiding this comment.
Is this the best name change? I'm guessing one is testing plain, the other outputs? Or is it something different? It's not super clear to me.
There was a problem hiding this comment.
Yeah it's not super clear. This test has a return property on the invoke on like 229, so the test covers the if t.Return.GetValue() == "" { branch above, whereas the other test returns the whole response, covering the rest of the changes in that file.
julienp
force-pushed
the
julienp/depends-on
branch
2 times, most recently
from
64c7865 to
3c287a0
Compare
julienp
commented
Dec 10, 2024
julienp
force-pushed
the
julienp/depends-on
branch
2 times, most recently
from
f0ccee2 to
769eea4
Compare
julienp
force-pushed
the
julienp/depends-on
branch
from
4ff4373 to
8120bac
Compare
julienp
force-pushed
the
julienp/depends-on
branch
from
1079e69 to
737c489
Compare
Merged
julienp
added a commit
that referenced
this pull request
Dec 17, 2024
## v1.13.0 - 2024-12-17 ### Improvements - [runtime] Allow specifying dependencies for output invokes [#693](#693) - [runtime] Update to pulumi v3.143.0 [#700](#700) ### Bug Fixes - [runtime] Fix the language plugin to return a version [#682](#682) - [runtime] Fix a mixup between package names and plugin names when listing required plugins [#688](#688) - [runtime] Resource properties marked as secret in schema are now sent as secrets [#698](#698) - [convert] Emit invoke options to PCL when ejecting YAML templates [#697](#697)
|
This PR has been shipped in release v1.13.0. |
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.
Provider functions that take inputs as arguments, and return an output (aka output invokes), now allow specifying a
dependsOnoption. This allows programs to ensure that invokes are executed after things they depend on, similar to thedepdendsOnresource option.pulumi/pulumi#17710
Fixes pulumi/pulumi#17755