Rebuild sdks (including java version bump)

pulumi · Aug 25, 2023 · 9a345ca · 9a345ca
1 parent c39ddf0
commit 9a345ca
Show file tree

Hide file tree

Showing 53 changed files with 297 additions and 507 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ TFGEN := pulumi-tfgen-$(PACK)
 PROVIDER := pulumi-resource-$(PACK)
 VERSION := $(shell pulumictl get version)
 JAVA_GEN := pulumi-java-gen
-JAVA_GEN_VERSION := v0.5.4
+JAVA_GEN_VERSION := v0.9.5
 TESTPARALLELISM := 10
 WORKING_DIR := $(shell pwd)
 

diff --git a/sdk/dotnet/GetKafkaTopic.cs b/sdk/dotnet/GetKafkaTopic.cs
@@ -29,9 +29,6 @@ public Inputs.GetKafkaTopicCredentialsArgs? Credentials
             set => _credentials = value;
         }
 
-        [Input("httpEndpoint")]
-        public string? HttpEndpoint { get; set; }
-
         [Input("kafkaCluster")]
         public Inputs.GetKafkaTopicKafkaClusterArgs? KafkaCluster { get; set; }
 
@@ -67,9 +64,6 @@ public Input<Inputs.GetKafkaTopicCredentialsInputArgs>? Credentials
             }
         }
 
-        [Input("httpEndpoint")]
-        public Input<string>? HttpEndpoint { get; set; }
-
         [Input("kafkaCluster")]
         public Input<Inputs.GetKafkaTopicKafkaClusterInputArgs>? KafkaCluster { get; set; }
 
@@ -100,7 +94,6 @@ public sealed class GetKafkaTopicResult
         /// </summary>
         public readonly ImmutableDictionary<string, string> Config;
         public readonly Outputs.GetKafkaTopicCredentialsResult? Credentials;
-        public readonly string HttpEndpoint;
         /// <summary>
         /// The provider-assigned unique ID for this managed resource.
         /// </summary>
@@ -119,8 +112,6 @@ private GetKafkaTopicResult(
 
             Outputs.GetKafkaTopicCredentialsResult? credentials,
 
-            string httpEndpoint,
-
             string id,
 
             Outputs.GetKafkaTopicKafkaClusterResult? kafkaCluster,
@@ -133,7 +124,6 @@ private GetKafkaTopicResult(
         {
             Config = config;
             Credentials = credentials;
-            HttpEndpoint = httpEndpoint;
             Id = id;
             KafkaCluster = kafkaCluster;
             PartitionsCount = partitionsCount;

diff --git a/sdk/dotnet/KafkaTopic.cs b/sdk/dotnet/KafkaTopic.cs
@@ -121,9 +121,6 @@ public partial class KafkaTopic : global::Pulumi.CustomResource
         [Output("credentials")]
         public Output<Outputs.KafkaTopicCredentials?> Credentials { get; private set; } = null!;
 
-        /// <summary>
-        /// The HTTP endpoint of the Kafka cluster (e.g., `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
-        /// </summary>
         [Output("httpEndpoint")]
         public Output<string> HttpEndpoint { get; private set; } = null!;
 
@@ -226,9 +223,6 @@ public Input<Inputs.KafkaTopicCredentialsArgs>? Credentials
             }
         }
 
-        /// <summary>
-        /// The HTTP endpoint of the Kafka cluster (e.g., `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
-        /// </summary>
         [Input("httpEndpoint")]
         public Input<string>? HttpEndpoint { get; set; }
 
@@ -289,9 +283,6 @@ public Input<Inputs.KafkaTopicCredentialsGetArgs>? Credentials
             }
         }
 
-        /// <summary>
-        /// The HTTP endpoint of the Kafka cluster (e.g., `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
-        /// </summary>
         [Input("httpEndpoint")]
         public Input<string>? HttpEndpoint { get; set; }
 

diff --git a/sdk/go/confluentcloud/getKafkaTopic.go b/sdk/go/confluentcloud/getKafkaTopic.go
diff --git a/sdk/go/confluentcloud/kafkaTopic.go b/sdk/go/confluentcloud/kafkaTopic.go
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/confluentcloud/ApiKey.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/ApiKey.java
@@ -42,7 +42,7 @@ public class ApiKey extends com.pulumi.resources.CustomResource {
      * A free-form description of the API Account.
      * 
      */
-    @Export(name="description", type=String.class, parameters={})
+    @Export(name="description", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> description;
 
     /**
@@ -56,7 +56,7 @@ public Output<Optional<String>> description() {
      * An optional flag to disable wait-for-readiness on create. Its primary use case is for Cluster API Keys for private networking options when readiness check fails. Must be unset when importing. Defaults to `false`.
      * 
      */
-    @Export(name="disableWaitForReady", type=Boolean.class, parameters={})
+    @Export(name="disableWaitForReady", refs={Boolean.class}, tree="[0]")
     private Output</* @Nullable */ Boolean> disableWaitForReady;
 
     /**
@@ -70,7 +70,7 @@ public Output<Optional<Boolean>> disableWaitForReady() {
      * A human-readable name for the API Key.
      * 
      */
-    @Export(name="displayName", type=String.class, parameters={})
+    @Export(name="displayName", refs={String.class}, tree="[0]")
     private Output<String> displayName;
 
     /**
@@ -84,7 +84,7 @@ public Output<String> displayName() {
      * The resource associated with this object. The only resource that is supported is &#39;cmk.v2.Cluster&#39;, &#39;srcm.v2.Cluster&#39;.
      * 
      */
-    @Export(name="managedResource", type=ApiKeyManagedResource.class, parameters={})
+    @Export(name="managedResource", refs={ApiKeyManagedResource.class}, tree="[0]")
     private Output</* @Nullable */ ApiKeyManagedResource> managedResource;
 
     /**
@@ -98,7 +98,7 @@ public Output<Optional<ApiKeyManagedResource>> managedResource() {
      * The owner to which the API Key belongs. The owner can be one of &#39;iam.v2.User&#39;, &#39;iam.v2.ServiceAccount&#39;.
      * 
      */
-    @Export(name="owner", type=ApiKeyOwner.class, parameters={})
+    @Export(name="owner", refs={ApiKeyOwner.class}, tree="[0]")
     private Output<ApiKeyOwner> owner;
 
     /**
@@ -112,7 +112,7 @@ public Output<ApiKeyOwner> owner() {
      * (Required String, Sensitive) The secret of the API Key.
      * 
      */
-    @Export(name="secret", type=String.class, parameters={})
+    @Export(name="secret", refs={String.class}, tree="[0]")
     private Output<String> secret;
 
     /**

diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadata.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadata.java
@@ -37,7 +37,7 @@ public class BusinessMetadata extends com.pulumi.resources.CustomResource {
      * The list of attribute definitions (see [Business Metadata](https://docs.confluent.io/cloud/current/stream-governance/stream-catalog.html#business-metadata-for-schemas) for more details):
      * 
      */
-    @Export(name="attributeDefinitions", type=List.class, parameters={BusinessMetadataAttributeDefinition.class})
+    @Export(name="attributeDefinitions", refs={List.class,BusinessMetadataAttributeDefinition.class}, tree="[0,1]")
     private Output<List<BusinessMetadataAttributeDefinition>> attributeDefinitions;
 
     /**
@@ -51,7 +51,7 @@ public Output<List<BusinessMetadataAttributeDefinition>> attributeDefinitions()
      * The Cluster API Credentials.
      * 
      */
-    @Export(name="credentials", type=BusinessMetadataCredentials.class, parameters={})
+    @Export(name="credentials", refs={BusinessMetadataCredentials.class}, tree="[0]")
     private Output</* @Nullable */ BusinessMetadataCredentials> credentials;
 
     /**
@@ -65,7 +65,7 @@ public Output<Optional<BusinessMetadataCredentials>> credentials() {
      * The description of the Business Metadata.
      * 
      */
-    @Export(name="description", type=String.class, parameters={})
+    @Export(name="description", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> description;
 
     /**
@@ -79,7 +79,7 @@ public Output<Optional<String>> description() {
      * The name of the attribute.
      * 
      */
-    @Export(name="name", type=String.class, parameters={})
+    @Export(name="name", refs={String.class}, tree="[0]")
     private Output<String> name;
 
     /**
@@ -93,7 +93,7 @@ public Output<String> name() {
      * The REST endpoint of the Schema Registry cluster, for example, `https://psrc-00000.us-central1.gcp.confluent.cloud:443`).
      * 
      */
-    @Export(name="restEndpoint", type=String.class, parameters={})
+    @Export(name="restEndpoint", refs={String.class}, tree="[0]")
     private Output</* @Nullable */ String> restEndpoint;
 
     /**
@@ -103,7 +103,7 @@ public Output<String> name() {
     public Output<Optional<String>> restEndpoint() {
         return Codegen.optional(this.restEndpoint);
     }
-    @Export(name="schemaRegistryCluster", type=BusinessMetadataSchemaRegistryCluster.class, parameters={})
+    @Export(name="schemaRegistryCluster", refs={BusinessMetadataSchemaRegistryCluster.class}, tree="[0]")
     private Output</* @Nullable */ BusinessMetadataSchemaRegistryCluster> schemaRegistryCluster;
 
     public Output<Optional<BusinessMetadataSchemaRegistryCluster>> schemaRegistryCluster() {
@@ -113,7 +113,7 @@ public Output<Optional<BusinessMetadataSchemaRegistryCluster>> schemaRegistryClu
      * (Required Integer) The version of the Business Metadata, for example, `1`.
      * 
      */
-    @Export(name="version", type=Integer.class, parameters={})
+    @Export(name="version", refs={Integer.class}, tree="[0]")
     private Output<Integer> version;
 
     /**