From a7b834b75458b600c7d5cde4ebab5dee0f465679 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Thu, 8 Aug 2024 18:42:47 +0000 Subject: [PATCH 1/2] make tfgen --- .pulumi-java-gen.version | 2 +- examples/go.mod | 4 ++-- examples/go.sum | 8 ++++---- provider/go.mod | 7 ++++--- provider/go.sum | 14 ++++++++------ sdk/go.mod | 2 +- sdk/go.sum | 4 ++-- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version index d33c3a21..0548fb4e 100644 --- a/.pulumi-java-gen.version +++ b/.pulumi-java-gen.version @@ -1 +1 @@ -0.12.0 \ No newline at end of file +0.14.0 \ No newline at end of file diff --git a/examples/go.mod b/examples/go.mod index 54cc54b4..acd9bd3d 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -2,7 +2,7 @@ module github.com/pulumi/pulumi-kafka/examples/v3 go 1.21 -require github.com/pulumi/pulumi/pkg/v3 v3.126.0 +require github.com/pulumi/pulumi/pkg/v3 v3.128.0 require ( cloud.google.com/go v0.112.1 // indirect @@ -123,7 +123,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect github.com/pulumi/esc v0.9.1 // indirect - github.com/pulumi/pulumi/sdk/v3 v3.126.0 // indirect + github.com/pulumi/pulumi/sdk/v3 v3.128.0 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index 8ef90117..01fb8a55 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -342,10 +342,10 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= -github.com/pulumi/pulumi/pkg/v3 v3.126.0 h1:XaZU1ehjHN2I5ihkfwxK/UFMDiCDM9FSt2TBnbldAx4= -github.com/pulumi/pulumi/pkg/v3 v3.126.0/go.mod h1:1P4/oK9zceOJUm48QQl/TqjDN68lfsdnTR1FITTFddw= -github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s= -github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= +github.com/pulumi/pulumi/pkg/v3 v3.128.0 h1:K3qtJYjHg4DkA7LxknY/MoQZ+QHdHQDh/k2njjmjHXM= +github.com/pulumi/pulumi/pkg/v3 v3.128.0/go.mod h1:/spoJXy/mqQ8fBLgXBEbUrAnL7pHdfXOviIo5fZROEY= +github.com/pulumi/pulumi/sdk/v3 v3.128.0 h1:5VPFfygxt6rva0bEYVQZXxsGAo2/D1wsb9erGOtXxzk= +github.com/pulumi/pulumi/sdk/v3 v3.128.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= diff --git a/provider/go.mod b/provider/go.mod index ccc7d9ca..e7a77d05 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/Mongey/terraform-provider-kafka v0.7.1 - github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0 + github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.1-0.20240808181221-46d7e984a474 ) require ( @@ -175,8 +175,8 @@ require ( github.com/pulumi/pulumi-java/pkg v0.11.0 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect github.com/pulumi/pulumi-yaml v1.9.1 // indirect - github.com/pulumi/pulumi/pkg/v3 v3.126.0 // indirect - github.com/pulumi/pulumi/sdk/v3 v3.126.0 // indirect + github.com/pulumi/pulumi/pkg/v3 v3.128.0 // indirect + github.com/pulumi/pulumi/sdk/v3 v3.128.0 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect @@ -210,6 +210,7 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/yuin/goldmark v1.7.4 // indirect github.com/zclconf/go-cty v1.14.2 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect diff --git a/provider/go.sum b/provider/go.sum index 8d198c76..064cdd2e 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1952,16 +1952,16 @@ github.com/pulumi/providertest v0.0.14 h1:5QlAPAAs82jkQraHsJvq1xgVfC7xtW8sFJwv2p github.com/pulumi/providertest v0.0.14/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= github.com/pulumi/pulumi-java/pkg v0.11.0 h1:Jw9gBvyfmfOMq/EkYDm9+zGPxsDAA8jfeMpHmtZ+1oA= github.com/pulumi/pulumi-java/pkg v0.11.0/go.mod h1:sXAk25P47AQVQL6ilAbFmRNgZykC7og/+87ihnqzFTc= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0 h1:0W2Y3Fk7VAWHpjD3FwzVnqWo7g1hD+96C0YDobMnvDU= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0/go.mod h1:QSDiqiCMMbfzrsp3oyRPWgSVE/dkVH5ujxoFappqjdo= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.1-0.20240808181221-46d7e984a474 h1:zLS2tKHR4+LyNg3wj+7CclK1yCujCcfqaZsZxVMkTRg= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.1-0.20240808181221-46d7e984a474/go.mod h1:EWGqRo+ogMPty23b6rVUajgJXUDSNXU+WqcZTPlzyEI= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY= github.com/pulumi/pulumi-yaml v1.9.1 h1:JPeI80M23SPactxgnCFS1casZlSr7ZhAXwSx4H55QQ4= github.com/pulumi/pulumi-yaml v1.9.1/go.mod h1:OH0R34yJxA5u6zjYBN4JXcWoEvfkRoOVWi6viu8buoA= -github.com/pulumi/pulumi/pkg/v3 v3.126.0 h1:XaZU1ehjHN2I5ihkfwxK/UFMDiCDM9FSt2TBnbldAx4= -github.com/pulumi/pulumi/pkg/v3 v3.126.0/go.mod h1:1P4/oK9zceOJUm48QQl/TqjDN68lfsdnTR1FITTFddw= -github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s= -github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= +github.com/pulumi/pulumi/pkg/v3 v3.128.0 h1:K3qtJYjHg4DkA7LxknY/MoQZ+QHdHQDh/k2njjmjHXM= +github.com/pulumi/pulumi/pkg/v3 v3.128.0/go.mod h1:/spoJXy/mqQ8fBLgXBEbUrAnL7pHdfXOviIo5fZROEY= +github.com/pulumi/pulumi/sdk/v3 v3.128.0 h1:5VPFfygxt6rva0bEYVQZXxsGAo2/D1wsb9erGOtXxzk= +github.com/pulumi/pulumi/sdk/v3 v3.128.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo= github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k= github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI= @@ -2092,6 +2092,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg= +github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= diff --git a/sdk/go.mod b/sdk/go.mod index d81ae7d2..7d0013fc 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/blang/semver v3.5.1+incompatible - github.com/pulumi/pulumi/sdk/v3 v3.126.0 + github.com/pulumi/pulumi/sdk/v3 v3.128.0 ) require ( diff --git a/sdk/go.sum b/sdk/go.sum index c4e7aede..2543199c 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -150,8 +150,8 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= -github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s= -github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= +github.com/pulumi/pulumi/sdk/v3 v3.128.0 h1:5VPFfygxt6rva0bEYVQZXxsGAo2/D1wsb9erGOtXxzk= +github.com/pulumi/pulumi/sdk/v3 v3.128.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= From b130b35449ee7b3730e709587cb472b313c28c12 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Thu, 8 Aug 2024 18:44:29 +0000 Subject: [PATCH 2/2] make build_sdks --- sdk/java/build.gradle | 4 ++-- .../src/main/java/com/pulumi/kafka/Acl.java | 23 ++++++++++++------- .../main/java/com/pulumi/kafka/Provider.java | 17 ++++++++++---- .../src/main/java/com/pulumi/kafka/Quota.java | 23 ++++++++++++------- .../src/main/java/com/pulumi/kafka/Topic.java | 23 ++++++++++++------- .../com/pulumi/kafka/UserScramCredential.java | 23 ++++++++++++------- .../main/java/com/pulumi/kafka/Utilities.java | 14 +++++------ 7 files changed, 81 insertions(+), 46 deletions(-) diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index 3ab337f2..2bb97c8b 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.12.0") + implementation("com.pulumi:pulumi:0.14.0") } task sourcesJar(type: Jar) { @@ -150,4 +150,4 @@ if (signingKey) { useInMemoryPgpKeys(signingKey, signingPassword) sign publishing.publications.mainPublication } -} \ No newline at end of file +} diff --git a/sdk/java/src/main/java/com/pulumi/kafka/Acl.java b/sdk/java/src/main/java/com/pulumi/kafka/Acl.java index 7cedbb48..3942ef0a 100644 --- a/sdk/java/src/main/java/com/pulumi/kafka/Acl.java +++ b/sdk/java/src/main/java/com/pulumi/kafka/Acl.java @@ -188,7 +188,7 @@ public Output> resourcePatternTypeFilter() { * * @param name The _unique_ name of the resulting resource. */ - public Acl(String name) { + public Acl(java.lang.String name) { this(name, AclArgs.Empty); } /** @@ -196,7 +196,7 @@ public Acl(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Acl(String name, AclArgs args) { + public Acl(java.lang.String name, AclArgs args) { this(name, args, null); } /** @@ -205,15 +205,22 @@ public Acl(String name, AclArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Acl(String name, AclArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/acl:Acl", name, args == null ? AclArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Acl(java.lang.String name, AclArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/acl:Acl", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Acl(String name, Output id, @Nullable AclState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/acl:Acl", name, state, makeResourceOptions(options, id)); + private Acl(java.lang.String name, Output id, @Nullable AclState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/acl:Acl", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static AclArgs makeArgs(AclArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? AclArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -229,7 +236,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Acl get(String name, Output id, @Nullable AclState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Acl get(java.lang.String name, Output id, @Nullable AclState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Acl(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/kafka/Provider.java b/sdk/java/src/main/java/com/pulumi/kafka/Provider.java index e0c26761..f549d5e8 100644 --- a/sdk/java/src/main/java/com/pulumi/kafka/Provider.java +++ b/sdk/java/src/main/java/com/pulumi/kafka/Provider.java @@ -251,7 +251,7 @@ public Output> saslUsername() { * * @param name The _unique_ name of the resulting resource. */ - public Provider(String name) { + public Provider(java.lang.String name) { this(name, ProviderArgs.Empty); } /** @@ -259,7 +259,7 @@ public Provider(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Provider(String name, ProviderArgs args) { + public Provider(java.lang.String name, ProviderArgs args) { this(name, args, null); } /** @@ -268,11 +268,18 @@ public Provider(String name, ProviderArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Provider(String name, ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka", name, args == null ? ProviderArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Provider(java.lang.String name, ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static ProviderArgs makeArgs(ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ProviderArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); diff --git a/sdk/java/src/main/java/com/pulumi/kafka/Quota.java b/sdk/java/src/main/java/com/pulumi/kafka/Quota.java index 17273a01..1b93d786 100644 --- a/sdk/java/src/main/java/com/pulumi/kafka/Quota.java +++ b/sdk/java/src/main/java/com/pulumi/kafka/Quota.java @@ -109,7 +109,7 @@ public Output entityType() { * * @param name The _unique_ name of the resulting resource. */ - public Quota(String name) { + public Quota(java.lang.String name) { this(name, QuotaArgs.Empty); } /** @@ -117,7 +117,7 @@ public Quota(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Quota(String name, QuotaArgs args) { + public Quota(java.lang.String name, QuotaArgs args) { this(name, args, null); } /** @@ -126,15 +126,22 @@ public Quota(String name, QuotaArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Quota(String name, QuotaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/quota:Quota", name, args == null ? QuotaArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Quota(java.lang.String name, QuotaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/quota:Quota", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Quota(String name, Output id, @Nullable QuotaState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/quota:Quota", name, state, makeResourceOptions(options, id)); + private Quota(java.lang.String name, Output id, @Nullable QuotaState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/quota:Quota", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static QuotaArgs makeArgs(QuotaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? QuotaArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -150,7 +157,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Quota get(String name, Output id, @Nullable QuotaState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Quota get(java.lang.String name, Output id, @Nullable QuotaState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Quota(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/kafka/Topic.java b/sdk/java/src/main/java/com/pulumi/kafka/Topic.java index 203d4240..bc39bf1b 100644 --- a/sdk/java/src/main/java/com/pulumi/kafka/Topic.java +++ b/sdk/java/src/main/java/com/pulumi/kafka/Topic.java @@ -133,7 +133,7 @@ public Output replicationFactor() { * * @param name The _unique_ name of the resulting resource. */ - public Topic(String name) { + public Topic(java.lang.String name) { this(name, TopicArgs.Empty); } /** @@ -141,7 +141,7 @@ public Topic(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public Topic(String name, TopicArgs args) { + public Topic(java.lang.String name, TopicArgs args) { this(name, args, null); } /** @@ -150,15 +150,22 @@ public Topic(String name, TopicArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public Topic(String name, TopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/topic:Topic", name, args == null ? TopicArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public Topic(java.lang.String name, TopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/topic:Topic", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private Topic(String name, Output id, @Nullable TopicState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/topic:Topic", name, state, makeResourceOptions(options, id)); + private Topic(java.lang.String name, Output id, @Nullable TopicState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/topic:Topic", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static TopicArgs makeArgs(TopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? TopicArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .build(); @@ -174,7 +181,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static Topic get(String name, Output id, @Nullable TopicState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static Topic get(java.lang.String name, Output id, @Nullable TopicState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new Topic(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/kafka/UserScramCredential.java b/sdk/java/src/main/java/com/pulumi/kafka/UserScramCredential.java index a9134e17..2a3aa604 100644 --- a/sdk/java/src/main/java/com/pulumi/kafka/UserScramCredential.java +++ b/sdk/java/src/main/java/com/pulumi/kafka/UserScramCredential.java @@ -79,7 +79,7 @@ public Output username() { * * @param name The _unique_ name of the resulting resource. */ - public UserScramCredential(String name) { + public UserScramCredential(java.lang.String name) { this(name, UserScramCredentialArgs.Empty); } /** @@ -87,7 +87,7 @@ public UserScramCredential(String name) { * @param name The _unique_ name of the resulting resource. * @param args The arguments to use to populate this resource's properties. */ - public UserScramCredential(String name, UserScramCredentialArgs args) { + public UserScramCredential(java.lang.String name, UserScramCredentialArgs args) { this(name, args, null); } /** @@ -96,15 +96,22 @@ public UserScramCredential(String name, UserScramCredentialArgs args) { * @param args The arguments to use to populate this resource's properties. * @param options A bag of options that control this resource's behavior. */ - public UserScramCredential(String name, UserScramCredentialArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/userScramCredential:UserScramCredential", name, args == null ? UserScramCredentialArgs.Empty : args, makeResourceOptions(options, Codegen.empty())); + public UserScramCredential(java.lang.String name, UserScramCredentialArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/userScramCredential:UserScramCredential", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); } - private UserScramCredential(String name, Output id, @Nullable UserScramCredentialState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { - super("kafka:index/userScramCredential:UserScramCredential", name, state, makeResourceOptions(options, id)); + private UserScramCredential(java.lang.String name, Output id, @Nullable UserScramCredentialState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("kafka:index/userScramCredential:UserScramCredential", name, state, makeResourceOptions(options, id), false); } - private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + private static UserScramCredentialArgs makeArgs(UserScramCredentialArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? UserScramCredentialArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) .additionalSecretOutputs(List.of( @@ -123,7 +130,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N * @param state * @param options Optional settings to control the behavior of the CustomResource. */ - public static UserScramCredential get(String name, Output id, @Nullable UserScramCredentialState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { + public static UserScramCredential get(java.lang.String name, Output id, @Nullable UserScramCredentialState state, @Nullable com.pulumi.resources.CustomResourceOptions options) { return new UserScramCredential(name, id, state, options); } } diff --git a/sdk/java/src/main/java/com/pulumi/kafka/Utilities.java b/sdk/java/src/main/java/com/pulumi/kafka/Utilities.java index 864eca06..a3811c04 100644 --- a/sdk/java/src/main/java/com/pulumi/kafka/Utilities.java +++ b/sdk/java/src/main/java/com/pulumi/kafka/Utilities.java @@ -17,7 +17,7 @@ public class Utilities { - public static Optional getEnv(String... names) { + public static Optional getEnv(java.lang.String... names) { for (var n : names) { var value = Environment.getEnvironmentVariable(n); if (value.isValue()) { @@ -27,7 +27,7 @@ public static Optional getEnv(String... names) { return Optional.empty(); } - public static Optional getEnvBoolean(String... names) { + public static Optional getEnvBoolean(java.lang.String... names) { for (var n : names) { var value = Environment.getBooleanEnvironmentVariable(n); if (value.isValue()) { @@ -37,7 +37,7 @@ public static Optional getEnvBoolean(String... names) { return Optional.empty(); } - public static Optional getEnvInteger(String... names) { + public static Optional getEnvInteger(java.lang.String... names) { for (var n : names) { var value = Environment.getIntegerEnvironmentVariable(n); if (value.isValue()) { @@ -47,7 +47,7 @@ public static Optional getEnvInteger(String... names) { return Optional.empty(); } - public static Optional getEnvDouble(String... names) { + public static Optional getEnvDouble(java.lang.String... names) { for (var n : names) { var value = Environment.getDoubleEnvironmentVariable(n); if (value.isValue()) { @@ -68,8 +68,8 @@ public static InvokeOptions withVersion(@Nullable InvokeOptions options) { ); } - private static final String version; - public static String getVersion() { + private static final java.lang.String version; + public static java.lang.String getVersion() { return version; } @@ -78,7 +78,7 @@ public static String getVersion() { var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName); if (versionFile == null) { throw new IllegalStateException( - String.format("expected resource '%s' on Classpath, not found", resourceName) + java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName) ); } version = new BufferedReader(new InputStreamReader(versionFile))