From fe4e56cd1eb3fd20deb69b28fd6e1ff12ad30db7 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Fri, 13 Dec 2024 17:42:04 +0000 Subject: [PATCH] make build_sdks --- sdk/dotnet/Utilities.cs | 7 +++++ sdk/java/build.gradle | 2 +- .../java/com/pulumi/splunk/Utilities.java | 31 +++++++++++++------ sdk/python/pyproject.toml | 2 +- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/sdk/dotnet/Utilities.cs b/sdk/dotnet/Utilities.cs index 494ec74c..7135aa1c 100644 --- 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/java/build.gradle b/sdk/java/build.gradle index 35d8fe68..8c616933 100644 --- 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.18.0") + implementation("com.pulumi:pulumi:0.20.0") } task sourcesJar(type: Jar) { diff --git a/sdk/java/src/main/java/com/pulumi/splunk/Utilities.java b/sdk/java/src/main/java/com/pulumi/splunk/Utilities.java index af675135..e212cdda 100644 --- a/sdk/java/src/main/java/com/pulumi/splunk/Utilities.java +++ b/sdk/java/src/main/java/com/pulumi/splunk/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 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/python/pyproject.toml b/sdk/python/pyproject.toml index de1ee475..54c0328b 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -4,7 +4,7 @@ dependencies = ["parver>=0.2.1", "pulumi>=3.0.0a1,<4.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""] keywords = ["pulumi", "splunk"] readme = "README.md" - requires-python = ">=3.8" + requires-python = ">=3.9" version = "1.0.0a0+dev" [project.license] text = "Apache-2.0"