make build_sdks

pulumi · Oct 2, 2023 · e199958 · e199958
1 parent 4c667a4
commit e199958
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 34 deletions.
diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle
@@ -29,7 +29,7 @@ java {
 
 compileJava {
     options.fork = true
-    options.forkOptions.jvmArgs.addAll(["-Xmx4g"])
+    options.forkOptions.jvmArgs.addAll(["-Xmx16g"])
 }
 
 repositories {
@@ -43,17 +43,18 @@ 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.5.4")
+    implementation("com.pulumi:pulumi:0.9.5")
 }
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
+    zip64 = true
 }
 
 def genPulumiResources = tasks.register('genPulumiResources') {
@@ -123,7 +124,11 @@ javadoc {
     if (JavaVersion.current().isJava9Compatible()) {
         options.addBooleanOption('html5', true)
     }
-    options.jFlags("-Xmx2g", "-Xms512m")
+    options.jFlags("-Xmx8g", "-Xms512m")
+}
+
+jar {
+    zip64 = true
 }
 
 if (publishRepoUsername) {
@@ -144,4 +149,4 @@ if (signingKey) {
         useInMemoryPgpKeys(signingKey, signingPassword)
         sign publishing.publications.mainPublication
     }
-}
+}
diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/Acl.java b/sdk/java/src/main/java/com/pulumi/tailscale/Acl.java
@@ -61,7 +61,7 @@ public class Acl extends com.pulumi.resources.CustomResource {
      * The JSON-based policy that defines which devices and users are allowed to connect in your network
      * 
      */
-    @Export(name="acl", type=String.class, parameters={})
+    @Export(name="acl", refs={String.class}, tree="[0]")
     private Output<String> acl;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DeviceAuthorization.java b/sdk/java/src/main/java/com/pulumi/tailscale/DeviceAuthorization.java
@@ -61,7 +61,7 @@ public class DeviceAuthorization extends com.pulumi.resources.CustomResource {
      * Whether or not the device is authorized
      * 
      */
-    @Export(name="authorized", type=Boolean.class, parameters={})
+    @Export(name="authorized", refs={Boolean.class}, tree="[0]")
     private Output<Boolean> authorized;
 
     /**
@@ -75,7 +75,7 @@ public Output<Boolean> authorized() {
      * The device to set as authorized
      * 
      */
-    @Export(name="deviceId", type=String.class, parameters={})
+    @Export(name="deviceId", refs={String.class}, tree="[0]")
     private Output<String> deviceId;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DeviceKey.java b/sdk/java/src/main/java/com/pulumi/tailscale/DeviceKey.java
@@ -62,7 +62,7 @@ public class DeviceKey extends com.pulumi.resources.CustomResource {
      * The device to update the key properties of
      * 
      */
-    @Export(name="deviceId", type=String.class, parameters={})
+    @Export(name="deviceId", refs={String.class}, tree="[0]")
     private Output<String> deviceId;
 
     /**
@@ -76,7 +76,7 @@ public Output<String> deviceId() {
      * Determines whether or not the device&#39;s key will expire
      * 
      */
-    @Export(name="keyExpiryDisabled", type=Boolean.class, parameters={})
+    @Export(name="keyExpiryDisabled", refs={Boolean.class}, tree="[0]")
     private Output</* @Nullable */ Boolean> keyExpiryDisabled;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DeviceSubnetRoutes.java b/sdk/java/src/main/java/com/pulumi/tailscale/DeviceSubnetRoutes.java
@@ -64,7 +64,7 @@ public class DeviceSubnetRoutes extends com.pulumi.resources.CustomResource {
      * The device to set subnet routes for
      * 
      */
-    @Export(name="deviceId", type=String.class, parameters={})
+    @Export(name="deviceId", refs={String.class}, tree="[0]")
     private Output<String> deviceId;
 
     /**
@@ -78,7 +78,7 @@ public Output<String> deviceId() {
      * The subnet routes that are enabled to be routed by a device
      * 
      */
-    @Export(name="routes", type=List.class, parameters={String.class})
+    @Export(name="routes", refs={List.class,String.class}, tree="[0,1]")
     private Output<List<String>> routes;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DeviceTags.java b/sdk/java/src/main/java/com/pulumi/tailscale/DeviceTags.java
@@ -61,7 +61,7 @@ public class DeviceTags extends com.pulumi.resources.CustomResource {
      * The device to set tags for
      * 
      */
-    @Export(name="deviceId", type=String.class, parameters={})
+    @Export(name="deviceId", refs={String.class}, tree="[0]")
     private Output<String> deviceId;
 
     /**
@@ -75,7 +75,7 @@ public Output<String> deviceId() {
      * The tags to apply to the device
      * 
      */
-    @Export(name="tags", type=List.class, parameters={String.class})
+    @Export(name="tags", refs={List.class,String.class}, tree="[0,1]")
     private Output<List<String>> tags;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DnsNameservers.java b/sdk/java/src/main/java/com/pulumi/tailscale/DnsNameservers.java
@@ -56,7 +56,7 @@ public class DnsNameservers extends com.pulumi.resources.CustomResource {
      * Devices on your network will use these nameservers to resolve DNS names. IPv4 or IPv6 addresses are accepted.
      * 
      */
-    @Export(name="nameservers", type=List.class, parameters={String.class})
+    @Export(name="nameservers", refs={List.class,String.class}, tree="[0,1]")
     private Output<List<String>> nameservers;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DnsPreferences.java b/sdk/java/src/main/java/com/pulumi/tailscale/DnsPreferences.java
@@ -53,7 +53,7 @@ public class DnsPreferences extends com.pulumi.resources.CustomResource {
      * Whether or not to enable magic DNS
      * 
      */
-    @Export(name="magicDns", type=Boolean.class, parameters={})
+    @Export(name="magicDns", refs={Boolean.class}, tree="[0]")
     private Output<Boolean> magicDns;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/DnsSearchPaths.java b/sdk/java/src/main/java/com/pulumi/tailscale/DnsSearchPaths.java
@@ -54,7 +54,7 @@ public class DnsSearchPaths extends com.pulumi.resources.CustomResource {
      * Devices on your network will use these domain suffixes to resolve DNS names.
      * 
      */
-    @Export(name="searchPaths", type=List.class, parameters={String.class})
+    @Export(name="searchPaths", refs={List.class,String.class}, tree="[0,1]")
     private Output<List<String>> searchPaths;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/Provider.java b/sdk/java/src/main/java/com/pulumi/tailscale/Provider.java
@@ -28,7 +28,7 @@ public class Provider extends com.pulumi.resources.ProviderResource {
      * Conflicts with &#39;oauth_client_id&#39; and &#39;oauth_client_secret&#39;.
      * 
      */
-    @Export(name="apiKey", type=String.class, parameters={})
+    @Export(name="apiKey", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> apiKey;
 
     /**
@@ -44,7 +44,7 @@ public Output<Optional<String>> apiKey() {
      * environment variable.
      * 
      */
-    @Export(name="baseUrl", type=String.class, parameters={})
+    @Export(name="baseUrl", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> baseUrl;
 
     /**
@@ -60,7 +60,7 @@ public Output<Optional<String>> baseUrl() {
      * variable. Both &#39;oauth_client_id&#39; and &#39;oauth_client_secret&#39; must be set. Conflicts with &#39;api_key&#39;.
      * 
      */
-    @Export(name="oauthClientId", type=String.class, parameters={})
+    @Export(name="oauthClientId", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> oauthClientId;
 
     /**
@@ -76,7 +76,7 @@ public Output<Optional<String>> oauthClientId() {
      * environment variable. Both &#39;oauth_client_id&#39; and &#39;oauth_client_secret&#39; must be set. Conflicts with &#39;api_key&#39;.
      * 
      */
-    @Export(name="oauthClientSecret", type=String.class, parameters={})
+    @Export(name="oauthClientSecret", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> oauthClientSecret;
 
     /**
@@ -92,7 +92,7 @@ public Output<Optional<String>> oauthClientSecret() {
      * variable. Default is the tailnet that owns API credentials passed to the provider.
      * 
      */
-    @Export(name="tailnet", type=String.class, parameters={})
+    @Export(name="tailnet", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> tailnet;
 
     /**
@@ -107,7 +107,7 @@ public Output<Optional<String>> tailnet() {
      * User-Agent header for API requests.
      * 
      */
-    @Export(name="userAgent", type=String.class, parameters={})
+    @Export(name="userAgent", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> userAgent;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/TailnetKey.java b/sdk/java/src/main/java/com/pulumi/tailscale/TailnetKey.java
@@ -61,7 +61,7 @@ public class TailnetKey extends com.pulumi.resources.CustomResource {
      * The creation timestamp of the key in RFC3339 format
      * 
      */
-    @Export(name="createdAt", type=String.class, parameters={})
+    @Export(name="createdAt", refs={String.class}, tree="[0]")
     private Output<String> createdAt;
 
     /**
@@ -75,7 +75,7 @@ public Output<String> createdAt() {
      * A description of the key consisting of alphanumeric characters.
      * 
      */
-    @Export(name="description", type=String.class, parameters={})
+    @Export(name="description", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> description;
 
     /**
@@ -89,7 +89,7 @@ public Output<Optional<String>> description() {
      * Indicates if the key is ephemeral.
      * 
      */
-    @Export(name="ephemeral", type=Boolean.class, parameters={})
+    @Export(name="ephemeral", refs={Boolean.class}, tree="[0]")
     private Output</* @Nullable */ Boolean> ephemeral;
 
     /**
@@ -103,7 +103,7 @@ public Output<Optional<Boolean>> ephemeral() {
      * The expiry timestamp of the key in RFC3339 format
      * 
      */
-    @Export(name="expiresAt", type=String.class, parameters={})
+    @Export(name="expiresAt", refs={String.class}, tree="[0]")
     private Output<String> expiresAt;
 
     /**
@@ -117,7 +117,7 @@ public Output<String> expiresAt() {
      * The expiry of the key in seconds
      * 
      */
-    @Export(name="expiry", type=Integer.class, parameters={})
+    @Export(name="expiry", refs={Integer.class}, tree="[0]")
     private Output</* @Nullable */ Integer> expiry;
 
     /**
@@ -131,7 +131,7 @@ public Output<Optional<Integer>> expiry() {
      * The authentication key
      * 
      */
-    @Export(name="key", type=String.class, parameters={})
+    @Export(name="key", refs={String.class}, tree="[0]")
     private Output<String> key;
 
     /**
@@ -145,7 +145,7 @@ public Output<String> key() {
      * Determines whether or not the machines authenticated by the key will be authorized for the tailnet by default.
      * 
      */
-    @Export(name="preauthorized", type=Boolean.class, parameters={})
+    @Export(name="preauthorized", refs={Boolean.class}, tree="[0]")
     private Output</* @Nullable */ Boolean> preauthorized;
 
     /**
@@ -159,7 +159,7 @@ public Output<Optional<Boolean>> preauthorized() {
      * Indicates if the key is reusable or single-use.
      * 
      */
-    @Export(name="reusable", type=Boolean.class, parameters={})
+    @Export(name="reusable", refs={Boolean.class}, tree="[0]")
     private Output</* @Nullable */ Boolean> reusable;
 
     /**
@@ -173,7 +173,7 @@ public Output<Optional<Boolean>> reusable() {
      * List of tags to apply to the machines authenticated by the key.
      * 
      */
-    @Export(name="tags", type=List.class, parameters={String.class})
+    @Export(name="tags", refs={List.class,String.class}, tree="[0,1]")
     private Output</* @Nullable */ List<String>> tags;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/tailscale/Utilities.java b/sdk/java/src/main/java/com/pulumi/tailscale/Utilities.java
@@ -57,7 +57,6 @@ public static Optional<Double> getEnvDouble(String... names) {
         return Optional.empty();
 	}
 
-	// TODO: this probably should be done via a mutator on the InvokeOptions
 	public static InvokeOptions withVersion(@Nullable InvokeOptions options) {
             if (options != null && options.getVersion().isPresent()) {
                 return options;