update codegen tests

pulumi · Nov 25, 2024 · a98f8d6 · a98f8d6
1 parent b974ff8
commit a98f8d6
Show file tree

Hide file tree

Showing 69 changed files with 1,758 additions and 432 deletions.
diff --git a/...en/testing/test/testdata/akamai/java/src/main/java/com/pulumi/akamai/AkamaiFunctions.java b/...en/testing/test/testdata/akamai/java/src/main/java/com/pulumi/akamai/AkamaiFunctions.java
diff --git a/pkg/codegen/testing/test/testdata/akamai/java/src/main/java/com/pulumi/akamai/Utilities.java b/pkg/codegen/testing/test/testdata/akamai/java/src/main/java/com/pulumi/akamai/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 invokeOutputOptionsWithVersion(@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/...g/test/testdata/akamai/java/src/main/java/com/pulumi/akamai/edgedns/EdgednsFunctions.java b/...g/test/testdata/akamai/java/src/main/java/com/pulumi/akamai/edgedns/EdgednsFunctions.java
@@ -14,6 +14,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 EdgednsFunctions {
@@ -54,6 +55,16 @@ public static Output<GetAuthoritiesSetResult> getAuthoritiesSet(GetAuthoritiesSe
      * 
      */
     @Deprecated /* akamai.edgedns/getauthoritiesset.getAuthoritiesSet has been deprecated in favor of akamai.index/getauthoritiesset.getAuthoritiesSet */
+    public static Output<GetAuthoritiesSetResult> getAuthoritiesSet(GetAuthoritiesSetArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:edgedns/getAuthoritiesSet:getAuthoritiesSet", TypeShape.of(GetAuthoritiesSetResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.edgedns/getauthoritiesset.getAuthoritiesSet has been deprecated in favor of akamai.index/getauthoritiesset.getAuthoritiesSet
+     * 
+     */
+    @Deprecated /* akamai.edgedns/getauthoritiesset.getAuthoritiesSet has been deprecated in favor of akamai.index/getauthoritiesset.getAuthoritiesSet */
     public static CompletableFuture<GetAuthoritiesSetResult> getAuthoritiesSetPlain(GetAuthoritiesSetPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:edgedns/getAuthoritiesSet:getAuthoritiesSet", TypeShape.of(GetAuthoritiesSetResult.class), args, Utilities.withVersion(options));
     }
@@ -94,6 +105,16 @@ public static Output<GetDnsRecordSetResult> getDnsRecordSet(GetDnsRecordSetArgs
      * 
      */
     @Deprecated /* akamai.edgedns/getdnsrecordset.getDnsRecordSet has been deprecated in favor of akamai.index/getdnsrecordset.getDnsRecordSet */
+    public static Output<GetDnsRecordSetResult> getDnsRecordSet(GetDnsRecordSetArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:edgedns/getDnsRecordSet:getDnsRecordSet", TypeShape.of(GetDnsRecordSetResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.edgedns/getdnsrecordset.getDnsRecordSet has been deprecated in favor of akamai.index/getdnsrecordset.getDnsRecordSet
+     * 
+     */
+    @Deprecated /* akamai.edgedns/getdnsrecordset.getDnsRecordSet has been deprecated in favor of akamai.index/getdnsrecordset.getDnsRecordSet */
     public static CompletableFuture<GetDnsRecordSetResult> getDnsRecordSetPlain(GetDnsRecordSetPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:edgedns/getDnsRecordSet:getDnsRecordSet", TypeShape.of(GetDnsRecordSetResult.class), args, Utilities.withVersion(options));
     }

diff --git a/.../testdata/akamai/java/src/main/java/com/pulumi/akamai/properties/PropertiesFunctions.java b/.../testdata/akamai/java/src/main/java/com/pulumi/akamai/properties/PropertiesFunctions.java
@@ -20,6 +20,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 PropertiesFunctions {
@@ -60,6 +61,16 @@ public static Output<GetActivationResult> getActivation(GetActivationArgs args,
      * 
      */
     @Deprecated /* akamai.properties/getactivation.getActivation has been deprecated in favor of akamai.index/getpropertyactivation.getPropertyActivation */
+    public static Output<GetActivationResult> getActivation(GetActivationArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:properties/getActivation:getActivation", TypeShape.of(GetActivationResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.properties/getactivation.getActivation has been deprecated in favor of akamai.index/getpropertyactivation.getPropertyActivation
+     * 
+     */
+    @Deprecated /* akamai.properties/getactivation.getActivation has been deprecated in favor of akamai.index/getpropertyactivation.getPropertyActivation */
     public static CompletableFuture<GetActivationResult> getActivationPlain(GetActivationPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:properties/getActivation:getActivation", TypeShape.of(GetActivationResult.class), args, Utilities.withVersion(options));
     }
@@ -100,6 +111,16 @@ public static Output<GetCpCodeResult> getCpCode(GetCpCodeArgs args, InvokeOption
      * 
      */
     @Deprecated /* akamai.properties/getcpcode.getCpCode has been deprecated in favor of akamai.index/getcpcode.getCpCode */
+    public static Output<GetCpCodeResult> getCpCode(GetCpCodeArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:properties/getCpCode:getCpCode", TypeShape.of(GetCpCodeResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.properties/getcpcode.getCpCode has been deprecated in favor of akamai.index/getcpcode.getCpCode
+     * 
+     */
+    @Deprecated /* akamai.properties/getcpcode.getCpCode has been deprecated in favor of akamai.index/getcpcode.getCpCode */
     public static CompletableFuture<GetCpCodeResult> getCpCodePlain(GetCpCodePlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:properties/getCpCode:getCpCode", TypeShape.of(GetCpCodeResult.class), args, Utilities.withVersion(options));
     }
@@ -140,6 +161,16 @@ public static Output<GetPropertyResult> getProperty(GetPropertyArgs args, Invoke
      * 
      */
     @Deprecated /* akamai.properties/getproperty.getProperty has been deprecated in favor of akamai.index/getproperty.getProperty */
+    public static Output<GetPropertyResult> getProperty(GetPropertyArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:properties/getProperty:getProperty", TypeShape.of(GetPropertyResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.properties/getproperty.getProperty has been deprecated in favor of akamai.index/getproperty.getProperty
+     * 
+     */
+    @Deprecated /* akamai.properties/getproperty.getProperty has been deprecated in favor of akamai.index/getproperty.getProperty */
     public static CompletableFuture<GetPropertyResult> getPropertyPlain(GetPropertyPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:properties/getProperty:getProperty", TypeShape.of(GetPropertyResult.class), args, Utilities.withVersion(options));
     }
@@ -180,6 +211,16 @@ public static Output<GetPropertyRulesResult> getPropertyRules(GetPropertyRulesAr
      * 
      */
     @Deprecated /* akamai.properties/getpropertyrules.getPropertyRules has been deprecated in favor of akamai.index/getpropertyrules.getPropertyRules */
+    public static Output<GetPropertyRulesResult> getPropertyRules(GetPropertyRulesArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:properties/getPropertyRules:getPropertyRules", TypeShape.of(GetPropertyRulesResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.properties/getpropertyrules.getPropertyRules has been deprecated in favor of akamai.index/getpropertyrules.getPropertyRules
+     * 
+     */
+    @Deprecated /* akamai.properties/getpropertyrules.getPropertyRules has been deprecated in favor of akamai.index/getpropertyrules.getPropertyRules */
     public static CompletableFuture<GetPropertyRulesResult> getPropertyRulesPlain(GetPropertyRulesPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:properties/getPropertyRules:getPropertyRules", TypeShape.of(GetPropertyRulesResult.class), args, Utilities.withVersion(options));
     }

diff --git a/...ai/java/src/main/java/com/pulumi/akamai/trafficmanagement/TrafficmanagementFunctions.java b/...ai/java/src/main/java/com/pulumi/akamai/trafficmanagement/TrafficmanagementFunctions.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 TrafficmanagementFunctions {
@@ -51,6 +52,16 @@ public static Output<GetGtmDefaultDatacenterResult> getGtmDefaultDatacenter(GetG
      * 
      */
     @Deprecated /* akamai.trafficmanagement/getgtmdefaultdatacenter.getGtmDefaultDatacenter has been deprecated in favor of akamai.index/getgtmdefaultdatacenter.getGtmDefaultDatacenter */
+    public static Output<GetGtmDefaultDatacenterResult> getGtmDefaultDatacenter(GetGtmDefaultDatacenterArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("akamai:trafficmanagement/getGtmDefaultDatacenter:getGtmDefaultDatacenter", TypeShape.of(GetGtmDefaultDatacenterResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
+    /**
+     * 
+     * @deprecated
+     * akamai.trafficmanagement/getgtmdefaultdatacenter.getGtmDefaultDatacenter has been deprecated in favor of akamai.index/getgtmdefaultdatacenter.getGtmDefaultDatacenter
+     * 
+     */
+    @Deprecated /* akamai.trafficmanagement/getgtmdefaultdatacenter.getGtmDefaultDatacenter has been deprecated in favor of akamai.index/getgtmdefaultdatacenter.getGtmDefaultDatacenter */
     public static CompletableFuture<GetGtmDefaultDatacenterResult> getGtmDefaultDatacenterPlain(GetGtmDefaultDatacenterPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("akamai:trafficmanagement/getGtmDefaultDatacenter:getGtmDefaultDatacenter", TypeShape.of(GetGtmDefaultDatacenterResult.class), args, Utilities.withVersion(options));
     }

diff --git a/.../testdata/assets-and-archives/java/src/main/java/com/pulumi/example/ExampleFunctions.java b/.../testdata/assets-and-archives/java/src/main/java/com/pulumi/example/ExampleFunctions.java
@@ -7,6 +7,7 @@
 import com.pulumi.core.TypeShape;
 import com.pulumi.deployment.Deployment;
 import com.pulumi.deployment.InvokeOptions;
+import com.pulumi.deployment.InvokeOutputOptions;
 import com.pulumi.example.Utilities;
 import com.pulumi.example.inputs.GetAssetsArgs;
 import com.pulumi.example.inputs.GetAssetsPlainArgs;
@@ -23,6 +24,9 @@ public static CompletableFuture<GetAssetsResult> getAssetsPlain(GetAssetsPlainAr
     public static Output<GetAssetsResult> getAssets(GetAssetsArgs args, InvokeOptions options) {
         return Deployment.getInstance().invoke("example::GetAssets", TypeShape.of(GetAssetsResult.class), args, Utilities.withVersion(options));
     }
+    public static Output<GetAssetsResult> getAssets(GetAssetsArgs args, InvokeOutputOptions options) {
+        return Deployment.getInstance().invoke("example::GetAssets", TypeShape.of(GetAssetsResult.class), args, Utilities.invokeOutputOptionsWithVersion(options));
+    }
     public static CompletableFuture<GetAssetsResult> getAssetsPlain(GetAssetsPlainArgs args, InvokeOptions options) {
         return Deployment.getInstance().invokeAsync("example::GetAssets", TypeShape.of(GetAssetsResult.class), args, Utilities.withVersion(options));
     }

diff --git a/...ng/test/testdata/assets-and-archives/java/src/main/java/com/pulumi/example/Utilities.java b/...ng/test/testdata/assets-and-archives/java/src/main/java/com/pulumi/example/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 invokeOutputOptionsWithVersion(@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/...stdata/azure-native-nested-types/java/src/main/java/com/pulumi/azurenative/Utilities.java b/...stdata/azure-native-nested-types/java/src/main/java/com/pulumi/azurenative/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 invokeOutputOptionsWithVersion(@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/...sting/test/testdata/config-variables/java/src/main/java/com/pulumi/example/Utilities.java b/...sting/test/testdata/config-variables/java/src/main/java/com/pulumi/example/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 invokeOutputOptionsWithVersion(@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/...n/testing/test/testdata/cyclic-types/java/src/main/java/com/pulumi/example/Utilities.java b/...n/testing/test/testdata/cyclic-types/java/src/main/java/com/pulumi/example/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 invokeOutputOptionsWithVersion(@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() {