Regenerating Java SDK based on updated modules

pulumi · Jan 29, 2025 · fc13a39 · fc13a39
1 parent bc11424
commit fc13a39
Show file tree

Hide file tree

Showing 22 changed files with 61 additions and 37 deletions.
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:1.0.0")
 }
 
 task sourcesJar(type: Jar) {
@@ -65,11 +65,13 @@ def genPulumiResources = tasks.register('genPulumiResources') {
         def outDir = file("$resourcesDir/$subDir")
         outDir.mkdirs()
         new File(outDir, "version.txt").text = resolvedVersion
-        def info = new Object()
-        info.metaClass.resource = true
-        info.metaClass.name = "command"
-        info.metaClass.version = resolvedVersion
-        def infoJson = new groovy.json.JsonBuilder(info).toPrettyString()
+        def builder = new groovy.json.JsonBuilder()
+        builder {
+            resource true
+            name "command"
+            version resolvedVersion
+        }
+        def infoJson = builder.toPrettyString()
         new File(outDir, "plugin.json").text = infoJson
     }
 }
@@ -150,4 +152,4 @@ if (signingKey) {
         useInMemoryPgpKeys(signingKey, signingPassword)
         sign publishing.publications.mainPublication
     }
-}
+}
diff --git a/sdk/java/src/main/java/com/pulumi/command/Provider.java b/sdk/java/src/main/java/com/pulumi/command/Provider.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command;

diff --git a/sdk/java/src/main/java/com/pulumi/command/ProviderArgs.java b/sdk/java/src/main/java/com/pulumi/command/ProviderArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command;

diff --git a/sdk/java/src/main/java/com/pulumi/command/Utilities.java b/sdk/java/src/main/java/com/pulumi/command/Utilities.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command;
@@ -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/Command.java b/sdk/java/src/main/java/com/pulumi/command/local/Command.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local;

diff --git a/sdk/java/src/main/java/com/pulumi/command/local/CommandArgs.java b/sdk/java/src/main/java/com/pulumi/command/local/CommandArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local;

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
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local;
@@ -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/java/src/main/java/com/pulumi/command/local/enums/Logging.java b/sdk/java/src/main/java/com/pulumi/command/local/enums/Logging.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local.enums;

diff --git a/sdk/java/src/main/java/com/pulumi/command/local/inputs/RunArgs.java b/sdk/java/src/main/java/com/pulumi/command/local/inputs/RunArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local.inputs;

diff --git a/sdk/java/src/main/java/com/pulumi/command/local/inputs/RunPlainArgs.java b/sdk/java/src/main/java/com/pulumi/command/local/inputs/RunPlainArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local.inputs;

diff --git a/sdk/java/src/main/java/com/pulumi/command/local/outputs/RunResult.java b/sdk/java/src/main/java/com/pulumi/command/local/outputs/RunResult.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.local.outputs;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/Command.java b/sdk/java/src/main/java/com/pulumi/command/remote/Command.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/CommandArgs.java b/sdk/java/src/main/java/com/pulumi/command/remote/CommandArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/CopyFile.java b/sdk/java/src/main/java/com/pulumi/command/remote/CopyFile.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/CopyFileArgs.java b/sdk/java/src/main/java/com/pulumi/command/remote/CopyFileArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/CopyToRemote.java b/sdk/java/src/main/java/com/pulumi/command/remote/CopyToRemote.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/CopyToRemoteArgs.java b/sdk/java/src/main/java/com/pulumi/command/remote/CopyToRemoteArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/enums/Logging.java b/sdk/java/src/main/java/com/pulumi/command/remote/enums/Logging.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote.enums;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/inputs/ConnectionArgs.java b/sdk/java/src/main/java/com/pulumi/command/remote/inputs/ConnectionArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote.inputs;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/inputs/ProxyConnectionArgs.java b/sdk/java/src/main/java/com/pulumi/command/remote/inputs/ProxyConnectionArgs.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote.inputs;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/outputs/Connection.java b/sdk/java/src/main/java/com/pulumi/command/remote/outputs/Connection.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote.outputs;

diff --git a/sdk/java/src/main/java/com/pulumi/command/remote/outputs/ProxyConnection.java b/sdk/java/src/main/java/com/pulumi/command/remote/outputs/ProxyConnection.java
@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumi. ***
+// *** WARNING: this file was generated by pulumi-language-java. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 package com.pulumi.command.remote.outputs;