File modified: @@ -24,6 +24,13 @@ namespace Pulumi.Command.Local /// </summary> public static Output<RunResult> Invoke(RunInvokeArgs args, InvokeOptions? options = null) => global::Pulumi.Deployment.Instance.Invoke<RunResult>("command:local:run", args ?? new RunInvokeArgs(), options.WithDefaults()); + + /// <summary> + /// A local command to be executed. + /// This command will always be run on any preview or deployment. Use `local.Command` to avoid duplicating executions. + /// </summary> + public static Output<RunResult> Invoke(RunInvokeArgs args, InvokeOutputOptions options) + => global::Pulumi.Deployment.Instance.Invoke<RunResult>("command:local:run", args ?? new RunInvokeArgs(), options.WithDefaults()); }

File modified: @@ -56,6 +56,13 @@ namespace Pulumi.Command return dst; } + public static global::Pulumi.InvokeOutputOptions WithDefaults(this global::Pulumi.InvokeOutputOptions? src) + { + var dst = src ?? new global::Pulumi.InvokeOutputOptions{}; + dst.Version = src?.Version ?? Version; + return dst; + } + private readonly static string version; public static string Version => version;

File modified: @@ -183,23 +183,12 @@ func (val *RunResult) Defaults() *RunResult { } return &tmp } - func RunOutput(ctx *pulumi.Context, args RunOutputArgs, opts ...pulumi.InvokeOption) RunResultOutput { - return pulumi.ToOutputWithContext(context.Background(), args). + return pulumi.ToOutputWithContext(ctx.Context(), args). ApplyT(func(v interface{}) (RunResultOutput, error) { args := v.(RunArgs) - opts = internal.PkgInvokeDefaultOpts(opts) - var rv RunResult - secret, err := ctx.InvokePackageRaw("command:local:run", args.Defaults(), &rv, "", opts...) - if err != nil { - return RunResultOutput{}, err - } - - output := pulumi.ToOutput(rv).(RunResultOutput) - if secret { - return pulumi.ToSecret(output).(RunResultOutput), nil - } - return output, nil + options := pulumi.InvokeOutputOptions{InvokeOptions: internal.PkgInvokeDefaultOpts(opts)} + return ctx.InvokeOutput("command:local:run", args.Defaults(), RunResultOutput{}, options).(RunResultOutput), nil }).(RunResultOutput) }

File modified: @@ -14,6 +14,7 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import com.pulumi.core.internal.Environment; import com.pulumi.deployment.InvokeOptions; +import com.pulumi.deployment.InvokeOutputOptions; public class Utilities { @@ -57,16 +58,28 @@ public class Utilities { return Optional.empty(); } - public static InvokeOptions withVersion(@nullable InvokeOptions options) { - if (options != null && options.getVersion().isPresent()) { - return options; - } - return new InvokeOptions( - options == null ? null : options.getParent().orElse(null), - options == null ? null : options.getProvider().orElse(null), - getVersion() - ); + public static InvokeOptions withVersion(@nullable InvokeOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion() + ); + } + + public static InvokeOutputOptions withVersion(@nullable InvokeOutputOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; } + return new InvokeOutputOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion(), + options == null ? null : options.getDependsOn() + ); + } private static final java.lang.String version; public static java.lang.String getVersion() {

File modified: @@ -11,6 +11,7 @@ import com.pulumi.core.Output; import com.pulumi.core.TypeShape; import com.pulumi.deployment.Deployment; import com.pulumi.deployment.InvokeOptions; +import com.pulumi.deployment.InvokeOutputOptions; import java.util.concurrent.CompletableFuture; public final class LocalFunctions { @@ -38,6 +39,14 @@ public final class LocalFunctions { public static Output<RunResult> run(RunArgs args, InvokeOptions options) { return Deployment.getInstance().invoke("command:local:run", TypeShape.of(RunResult.class), args, Utilities.withVersion(options)); } + /** + * A local command to be executed. + * This command will always be run on any preview or deployment. Use `local.Command` to avoid duplicating executions. + * + */ + public static Output<RunResult> run(RunArgs args, InvokeOutputOptions options) { + return Deployment.getInstance().invoke("command:local:run", TypeShape.of(RunResult.class), args, Utilities.withVersion(options)); + } /** * A local command to be executed. * This command will always be run on any preview or deployment. Use `local.Command` to avoid duplicating executions.