Remove java dependencies

pulumi · Dec 28, 2024 · c2e078f · c2e078f
1 parent 8be3784
commit c2e078f
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 44 deletions.
diff --git a/.pulumi.version b/.pulumi.version
@@ -1 +1 @@
-3.142.0
+3.143.0
diff --git a/provider/cmd/pulumi-resource-command/schema.json b/provider/cmd/pulumi-resource-command/schema.json
@@ -30,11 +30,6 @@
     },
     "java": {
       "buildFiles": "gradle",
-      "dependencies": {
-        "com.google.code.findbugs:jsr305": "3.0.2",
-        "com.google.code.gson:gson": "2.8.9",
-        "com.pulumi:pulumi": "0.10.0"
-      },
       "gradleNexusPublishPluginVersion": "2.0.0"
     },
     "nodejs": {

diff --git a/provider/go.mod b/provider/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/pkg/sftp v1.13.6
 	github.com/pulumi/providertest v0.1.3
 	github.com/pulumi/pulumi-go-provider v0.24.0
-	github.com/pulumi/pulumi/sdk/v3 v3.142.0
+	github.com/pulumi/pulumi/sdk/v3 v3.143.0
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.31.0
 )
@@ -140,7 +140,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
 	github.com/pulumi/esc v0.10.0 // indirect
-	github.com/pulumi/pulumi/pkg/v3 v3.142.0 // indirect
+	github.com/pulumi/pulumi/pkg/v3 v3.143.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect

diff --git a/provider/go.sum b/provider/go.sum
@@ -363,10 +363,10 @@ github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5A
 github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
 github.com/pulumi/pulumi-go-provider v0.24.0 h1:aMvl7RvNBsrZMaE/RXmw8h8o6AzO6YOB69HRpJAlgtk=
 github.com/pulumi/pulumi-go-provider v0.24.0/go.mod h1:ckAHu+Kp0vTdnaVB0s0zJC/b6axoakyPMQXgyQ+ZMFM=
-github.com/pulumi/pulumi/pkg/v3 v3.142.0 h1:UE8TFyXrlxvPrATpd3Kl3En34KrFIFWOxxNAodywPNU=
-github.com/pulumi/pulumi/pkg/v3 v3.142.0/go.mod h1:3k6WwRIT7veiDnk3Yo2NtqEYX+4dgLCrMIFvEOnjQqI=
-github.com/pulumi/pulumi/sdk/v3 v3.142.0 h1:SmcVddGuvwAh3g3XUVQQ5gVRQUKH1yZ6iETpDNHIHlw=
-github.com/pulumi/pulumi/sdk/v3 v3.142.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
+github.com/pulumi/pulumi/pkg/v3 v3.143.0 h1:diAlaNVZSRc59ePqbMuvuf/AwecpZyjhh1pGvmLEUwg=
+github.com/pulumi/pulumi/pkg/v3 v3.143.0/go.mod h1:XzjN1uQI2HWXYolT2L4RIXzvLEnWTSOzFgFFIUfFEa8=
+github.com/pulumi/pulumi/sdk/v3 v3.143.0 h1:z1m8Fc6l723eU2J/bP7UHE5t6WbBu4iIDAl1WaalQk4=
+github.com/pulumi/pulumi/sdk/v3 v3.143.0/go.mod h1:OFpZabILGxrFqzcABFpMCksrHGVp4ymRM2BkKjlazDY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=

diff --git a/provider/pkg/provider/provider.go b/provider/pkg/provider/provider.go
@@ -70,11 +70,6 @@ func NewProvider() p.Provider {
 				"java": map[string]any{
 					"buildFiles":                      "gradle",
 					"gradleNexusPublishPluginVersion": "2.0.0",
-					"dependencies": map[string]any{
-						"com.pulumi:pulumi":               "0.10.0",
-						"com.google.code.gson:gson":       "2.8.9",
-						"com.google.code.findbugs:jsr305": "3.0.2",
-					},
 				},
 			},
 		},

diff --git a/sdk/dotnet/Local/Run.cs b/sdk/dotnet/Local/Run.cs
@@ -24,6 +24,13 @@ public static Task<RunResult> InvokeAsync(RunArgs args, InvokeOptions? options =
         /// </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());
     }
 
 

diff --git a/sdk/dotnet/Utilities.cs b/sdk/dotnet/Utilities.cs
@@ -56,6 +56,13 @@ static class Utilities
             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;
 

diff --git a/sdk/go/command/local/run.go b/sdk/go/command/local/run.go
diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle
@@ -44,7 +44,7 @@ repositories {
 dependencies {
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.pulumi:pulumi:0.10.0")
+    implementation("com.pulumi:pulumi:0.18.0")
 }
 
 task sourcesJar(type: Jar) {

diff --git a/sdk/java/src/main/java/com/pulumi/command/Utilities.java b/sdk/java/src/main/java/com/pulumi/command/Utilities.java
@@ -14,6 +14,7 @@
 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 static Optional<java.lang.Double> getEnvDouble(java.lang.String... names)
         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() {

diff --git a/sdk/java/src/main/java/com/pulumi/command/local/LocalFunctions.java b/sdk/java/src/main/java/com/pulumi/command/local/LocalFunctions.java
@@ -11,6 +11,7 @@
 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 static CompletableFuture<RunResult> runPlain(RunPlainArgs args) {
     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.

diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json
@@ -14,7 +14,7 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@pulumi/pulumi": "^3.136.0"
+        "@pulumi/pulumi": "^3.142.0"
     },
     "devDependencies": {
         "@types/node": "^14",

diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml
@@ -1,10 +1,10 @@
 [project]
   name = "pulumi_command"
   description = "The Pulumi Command Provider enables you to execute commands and scripts either locally or remotely as part of the Pulumi resource model."
-  dependencies = ["parver>=0.2.1", "pulumi>=3.136.0,<4.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""]
+  dependencies = ["parver>=0.2.1", "pulumi>=3.142.0,<4.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""]
   keywords = ["pulumi", "command", "category/utility", "kind/native"]
   readme = "README.md"
-  requires-python = ">=3.8"
+  requires-python = ">=3.9"
   version = "1.0.0a0+dev"
   [project.license]
     text = "Apache-2.0"