diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version
index d33c3a21..51de3305 100644
--- a/.pulumi-java-gen.version
+++ b/.pulumi-java-gen.version
@@ -1 +1 @@
-0.12.0
\ No newline at end of file
+0.13.0
\ No newline at end of file
diff --git a/provider/go.mod b/provider/go.mod
index 6d7fae32..92083988 100644
--- a/provider/go.mod
+++ b/provider/go.mod
@@ -106,7 +106,7 @@ require (
 	github.com/dghubble/sling v1.4.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/djherbis/times v1.5.0 // indirect
-	github.com/docker/docker v26.0.2+incompatible // indirect
+	github.com/docker/docker v26.1.4+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
diff --git a/provider/go.sum b/provider/go.sum
index 6fd47b48..c61f8f1b 100644
--- a/provider/go.sum
+++ b/provider/go.sum
@@ -1405,8 +1405,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU=
 github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0=
-github.com/docker/docker v26.0.2+incompatible h1:yGVmKUFGgcxA6PXWAokO0sQL22BrQ67cgVjko8tGdXE=
-github.com/docker/docker v26.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
+github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle
index 4a4c7b3b..1223788c 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.13.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/confluentcloud/AccessPoint.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/AccessPoint.java
index d6080301..0a0e2984 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/AccessPoint.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/AccessPoint.java
@@ -193,13 +193,20 @@ public AccessPoint(String name, AccessPointArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public AccessPoint(String name, AccessPointArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/accessPoint:AccessPoint", name, args == null ? AccessPointArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/accessPoint:AccessPoint", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private AccessPoint(String name, Output<String> id, @Nullable AccessPointState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/accessPoint:AccessPoint", name, state, makeResourceOptions(options, id));
     }
 
+    private static AccessPointArgs makeArgs(AccessPointArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? AccessPointArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/ApiKey.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/ApiKey.java
index 0c908461..522e753c 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/ApiKey.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/ApiKey.java
@@ -433,13 +433,20 @@ public ApiKey(String name, ApiKeyArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public ApiKey(String name, ApiKeyArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/apiKey:ApiKey", name, args == null ? ApiKeyArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/apiKey:ApiKey", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private ApiKey(String name, Output<String> id, @Nullable ApiKeyState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/apiKey:ApiKey", name, state, makeResourceOptions(options, id));
     }
 
+    private static ApiKeyArgs makeArgs(ApiKeyArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? ApiKeyArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadata.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadata.java
index 6aa3fbd5..f5aea904 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadata.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadata.java
@@ -152,13 +152,20 @@ public BusinessMetadata(String name, @Nullable BusinessMetadataArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public BusinessMetadata(String name, @Nullable BusinessMetadataArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/businessMetadata:BusinessMetadata", name, args == null ? BusinessMetadataArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/businessMetadata:BusinessMetadata", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private BusinessMetadata(String name, Output<String> id, @Nullable BusinessMetadataState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/businessMetadata:BusinessMetadata", name, state, makeResourceOptions(options, id));
     }
 
+    private static BusinessMetadataArgs makeArgs(@Nullable BusinessMetadataArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? BusinessMetadataArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadataBinding.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadataBinding.java
index da402af3..1a6d78bb 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadataBinding.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/BusinessMetadataBinding.java
@@ -151,13 +151,20 @@ public BusinessMetadataBinding(String name, BusinessMetadataBindingArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public BusinessMetadataBinding(String name, BusinessMetadataBindingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/businessMetadataBinding:BusinessMetadataBinding", name, args == null ? BusinessMetadataBindingArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/businessMetadataBinding:BusinessMetadataBinding", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private BusinessMetadataBinding(String name, Output<String> id, @Nullable BusinessMetadataBindingState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/businessMetadataBinding:BusinessMetadataBinding", name, state, makeResourceOptions(options, id));
     }
 
+    private static BusinessMetadataBindingArgs makeArgs(BusinessMetadataBindingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? BusinessMetadataBindingArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/ByokKey.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/ByokKey.java
index 6422b57d..26a72557 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/ByokKey.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/ByokKey.java
@@ -190,13 +190,20 @@ public ByokKey(String name, @Nullable ByokKeyArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public ByokKey(String name, @Nullable ByokKeyArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/byokKey:ByokKey", name, args == null ? ByokKeyArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/byokKey:ByokKey", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private ByokKey(String name, Output<String> id, @Nullable ByokKeyState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/byokKey:ByokKey", name, state, makeResourceOptions(options, id));
     }
 
+    private static ByokKeyArgs makeArgs(@Nullable ByokKeyArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? ByokKeyArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/CatalogEntityAttributes.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/CatalogEntityAttributes.java
index 460cc252..cd88d876 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/CatalogEntityAttributes.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/CatalogEntityAttributes.java
@@ -119,13 +119,20 @@ public CatalogEntityAttributes(String name, CatalogEntityAttributesArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public CatalogEntityAttributes(String name, CatalogEntityAttributesArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/catalogEntityAttributes:CatalogEntityAttributes", name, args == null ? CatalogEntityAttributesArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/catalogEntityAttributes:CatalogEntityAttributes", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private CatalogEntityAttributes(String name, Output<String> id, @Nullable CatalogEntityAttributesState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/catalogEntityAttributes:CatalogEntityAttributes", name, state, makeResourceOptions(options, id));
     }
 
+    private static CatalogEntityAttributesArgs makeArgs(CatalogEntityAttributesArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? CatalogEntityAttributesArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/ClusterLink.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/ClusterLink.java
index 40cfff5d..623cf27f 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/ClusterLink.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/ClusterLink.java
@@ -258,13 +258,20 @@ public ClusterLink(String name, @Nullable ClusterLinkArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public ClusterLink(String name, @Nullable ClusterLinkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/clusterLink:ClusterLink", name, args == null ? ClusterLinkArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/clusterLink:ClusterLink", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private ClusterLink(String name, Output<String> id, @Nullable ClusterLinkState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/clusterLink:ClusterLink", name, state, makeResourceOptions(options, id));
     }
 
+    private static ClusterLinkArgs makeArgs(@Nullable ClusterLinkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? ClusterLinkArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Connector.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Connector.java
index 6bbdcef3..a7d76f8a 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Connector.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Connector.java
@@ -406,13 +406,20 @@ public Connector(String name, ConnectorArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Connector(String name, ConnectorArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/connector:Connector", name, args == null ? ConnectorArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/connector:Connector", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Connector(String name, Output<String> id, @Nullable ConnectorState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/connector:Connector", name, state, makeResourceOptions(options, id));
     }
 
+    private static ConnectorArgs makeArgs(ConnectorArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? ConnectorArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/CustomConnectorPlugin.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/CustomConnectorPlugin.java
index 7e665d38..b52e9211 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/CustomConnectorPlugin.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/CustomConnectorPlugin.java
@@ -208,13 +208,20 @@ public CustomConnectorPlugin(String name, CustomConnectorPluginArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public CustomConnectorPlugin(String name, CustomConnectorPluginArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/customConnectorPlugin:CustomConnectorPlugin", name, args == null ? CustomConnectorPluginArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/customConnectorPlugin:CustomConnectorPlugin", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private CustomConnectorPlugin(String name, Output<String> id, @Nullable CustomConnectorPluginState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/customConnectorPlugin:CustomConnectorPlugin", name, state, makeResourceOptions(options, id));
     }
 
+    private static CustomConnectorPluginArgs makeArgs(CustomConnectorPluginArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? CustomConnectorPluginArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsForwarder.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsForwarder.java
index 077aff1d..e12e9780 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsForwarder.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsForwarder.java
@@ -175,13 +175,20 @@ public DnsForwarder(String name, DnsForwarderArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public DnsForwarder(String name, DnsForwarderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/dnsForwarder:DnsForwarder", name, args == null ? DnsForwarderArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/dnsForwarder:DnsForwarder", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private DnsForwarder(String name, Output<String> id, @Nullable DnsForwarderState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/dnsForwarder:DnsForwarder", name, state, makeResourceOptions(options, id));
     }
 
+    private static DnsForwarderArgs makeArgs(DnsForwarderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? DnsForwarderArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsRecord.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsRecord.java
index d5dfb3dc..573bf0f6 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsRecord.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/DnsRecord.java
@@ -170,13 +170,20 @@ public DnsRecord(String name, DnsRecordArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public DnsRecord(String name, DnsRecordArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/dnsRecord:DnsRecord", name, args == null ? DnsRecordArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/dnsRecord:DnsRecord", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private DnsRecord(String name, Output<String> id, @Nullable DnsRecordState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/dnsRecord:DnsRecord", name, state, makeResourceOptions(options, id));
     }
 
+    private static DnsRecordArgs makeArgs(DnsRecordArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? DnsRecordArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Environment.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Environment.java
index daa5871b..f936e238 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Environment.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Environment.java
@@ -161,13 +161,20 @@ public Environment(String name, @Nullable EnvironmentArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Environment(String name, @Nullable EnvironmentArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/environment:Environment", name, args == null ? EnvironmentArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/environment:Environment", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Environment(String name, Output<String> id, @Nullable EnvironmentState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/environment:Environment", name, state, makeResourceOptions(options, id));
     }
 
+    private static EnvironmentArgs makeArgs(@Nullable EnvironmentArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? EnvironmentArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkComputePool.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkComputePool.java
index f3f7ef58..3debf377 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkComputePool.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkComputePool.java
@@ -216,13 +216,20 @@ public FlinkComputePool(String name, FlinkComputePoolArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public FlinkComputePool(String name, FlinkComputePoolArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/flinkComputePool:FlinkComputePool", name, args == null ? FlinkComputePoolArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/flinkComputePool:FlinkComputePool", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private FlinkComputePool(String name, Output<String> id, @Nullable FlinkComputePoolState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/flinkComputePool:FlinkComputePool", name, state, makeResourceOptions(options, id));
     }
 
+    private static FlinkComputePoolArgs makeArgs(FlinkComputePoolArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? FlinkComputePoolArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkStatement.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkStatement.java
index f0beb255..59b55370 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkStatement.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/FlinkStatement.java
@@ -189,13 +189,20 @@ public FlinkStatement(String name, FlinkStatementArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public FlinkStatement(String name, FlinkStatementArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/flinkStatement:FlinkStatement", name, args == null ? FlinkStatementArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/flinkStatement:FlinkStatement", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private FlinkStatement(String name, Output<String> id, @Nullable FlinkStatementState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/flinkStatement:FlinkStatement", name, state, makeResourceOptions(options, id));
     }
 
+    private static FlinkStatementArgs makeArgs(FlinkStatementArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? FlinkStatementArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/GroupMapping.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/GroupMapping.java
index 53bb216e..1e902df9 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/GroupMapping.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/GroupMapping.java
@@ -148,13 +148,20 @@ public GroupMapping(String name, GroupMappingArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public GroupMapping(String name, GroupMappingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/groupMapping:GroupMapping", name, args == null ? GroupMappingArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/groupMapping:GroupMapping", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private GroupMapping(String name, Output<String> id, @Nullable GroupMappingState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/groupMapping:GroupMapping", name, state, makeResourceOptions(options, id));
     }
 
+    private static GroupMappingArgs makeArgs(GroupMappingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? GroupMappingArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityPool.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityPool.java
index 2ac5af74..153292b3 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityPool.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityPool.java
@@ -237,13 +237,20 @@ public IdentityPool(String name, IdentityPoolArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public IdentityPool(String name, IdentityPoolArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/identityPool:IdentityPool", name, args == null ? IdentityPoolArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/identityPool:IdentityPool", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private IdentityPool(String name, Output<String> id, @Nullable IdentityPoolState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/identityPool:IdentityPool", name, state, makeResourceOptions(options, id));
     }
 
+    private static IdentityPoolArgs makeArgs(IdentityPoolArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? IdentityPoolArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityProvider.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityProvider.java
index 0ad0017f..fda7abad 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityProvider.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/IdentityProvider.java
@@ -200,13 +200,20 @@ public IdentityProvider(String name, IdentityProviderArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public IdentityProvider(String name, IdentityProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/identityProvider:IdentityProvider", name, args == null ? IdentityProviderArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/identityProvider:IdentityProvider", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private IdentityProvider(String name, Output<String> id, @Nullable IdentityProviderState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/identityProvider:IdentityProvider", name, state, makeResourceOptions(options, id));
     }
 
+    private static IdentityProviderArgs makeArgs(IdentityProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? IdentityProviderArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Invitation.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Invitation.java
index 574f7666..cd3ef4d9 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Invitation.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Invitation.java
@@ -207,13 +207,20 @@ public Invitation(String name, InvitationArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Invitation(String name, InvitationArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/invitation:Invitation", name, args == null ? InvitationArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/invitation:Invitation", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Invitation(String name, Output<String> id, @Nullable InvitationState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/invitation:Invitation", name, state, makeResourceOptions(options, id));
     }
 
+    private static InvitationArgs makeArgs(InvitationArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? InvitationArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaAcl.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaAcl.java
index 589b2df7..cb2eced6 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaAcl.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaAcl.java
@@ -204,13 +204,20 @@ public KafkaAcl(String name, KafkaAclArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KafkaAcl(String name, KafkaAclArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/kafkaAcl:KafkaAcl", name, args == null ? KafkaAclArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/kafkaAcl:KafkaAcl", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KafkaAcl(String name, Output<String> id, @Nullable KafkaAclState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/kafkaAcl:KafkaAcl", name, state, makeResourceOptions(options, id));
     }
 
+    private static KafkaAclArgs makeArgs(KafkaAclArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KafkaAclArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClientQuota.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClientQuota.java
index cf01022a..a511ed99 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClientQuota.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClientQuota.java
@@ -187,13 +187,20 @@ public KafkaClientQuota(String name, KafkaClientQuotaArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KafkaClientQuota(String name, KafkaClientQuotaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/kafkaClientQuota:KafkaClientQuota", name, args == null ? KafkaClientQuotaArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/kafkaClientQuota:KafkaClientQuota", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KafkaClientQuota(String name, Output<String> id, @Nullable KafkaClientQuotaState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/kafkaClientQuota:KafkaClientQuota", name, state, makeResourceOptions(options, id));
     }
 
+    private static KafkaClientQuotaArgs makeArgs(KafkaClientQuotaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KafkaClientQuotaArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaCluster.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaCluster.java
index 33e275d6..9ed93b8e 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaCluster.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaCluster.java
@@ -568,13 +568,20 @@ public KafkaCluster(String name, KafkaClusterArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KafkaCluster(String name, KafkaClusterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/kafkaCluster:KafkaCluster", name, args == null ? KafkaClusterArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/kafkaCluster:KafkaCluster", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KafkaCluster(String name, Output<String> id, @Nullable KafkaClusterState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/kafkaCluster:KafkaCluster", name, state, makeResourceOptions(options, id));
     }
 
+    private static KafkaClusterArgs makeArgs(KafkaClusterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KafkaClusterArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClusterConfig.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClusterConfig.java
index 9a695ba3..b144663a 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClusterConfig.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaClusterConfig.java
@@ -117,13 +117,20 @@ public KafkaClusterConfig(String name, KafkaClusterConfigArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KafkaClusterConfig(String name, KafkaClusterConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/kafkaClusterConfig:KafkaClusterConfig", name, args == null ? KafkaClusterConfigArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/kafkaClusterConfig:KafkaClusterConfig", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KafkaClusterConfig(String name, Output<String> id, @Nullable KafkaClusterConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/kafkaClusterConfig:KafkaClusterConfig", name, state, makeResourceOptions(options, id));
     }
 
+    private static KafkaClusterConfigArgs makeArgs(KafkaClusterConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KafkaClusterConfigArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaMirrorTopic.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaMirrorTopic.java
index 14f3714a..75006266 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaMirrorTopic.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaMirrorTopic.java
@@ -157,13 +157,20 @@ public KafkaMirrorTopic(String name, KafkaMirrorTopicArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KafkaMirrorTopic(String name, KafkaMirrorTopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/kafkaMirrorTopic:KafkaMirrorTopic", name, args == null ? KafkaMirrorTopicArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/kafkaMirrorTopic:KafkaMirrorTopic", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KafkaMirrorTopic(String name, Output<String> id, @Nullable KafkaMirrorTopicState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/kafkaMirrorTopic:KafkaMirrorTopic", name, state, makeResourceOptions(options, id));
     }
 
+    private static KafkaMirrorTopicArgs makeArgs(KafkaMirrorTopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KafkaMirrorTopicArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaTopic.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaTopic.java
index bc9fa209..487c0865 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaTopic.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KafkaTopic.java
@@ -216,13 +216,20 @@ public KafkaTopic(String name, KafkaTopicArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KafkaTopic(String name, KafkaTopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/kafkaTopic:KafkaTopic", name, args == null ? KafkaTopicArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/kafkaTopic:KafkaTopic", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KafkaTopic(String name, Output<String> id, @Nullable KafkaTopicState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/kafkaTopic:KafkaTopic", name, state, makeResourceOptions(options, id));
     }
 
+    private static KafkaTopicArgs makeArgs(KafkaTopicArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KafkaTopicArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/KsqlCluster.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/KsqlCluster.java
index 8748315d..5c0878ce 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/KsqlCluster.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/KsqlCluster.java
@@ -220,13 +220,20 @@ public KsqlCluster(String name, KsqlClusterArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public KsqlCluster(String name, KsqlClusterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/ksqlCluster:KsqlCluster", name, args == null ? KsqlClusterArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/ksqlCluster:KsqlCluster", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private KsqlCluster(String name, Output<String> id, @Nullable KsqlClusterState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/ksqlCluster:KsqlCluster", name, state, makeResourceOptions(options, id));
     }
 
+    private static KsqlClusterArgs makeArgs(KsqlClusterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? KsqlClusterArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Network.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Network.java
index 8f25a263..934de355 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Network.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Network.java
@@ -534,13 +534,20 @@ public Network(String name, NetworkArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Network(String name, NetworkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/network:Network", name, args == null ? NetworkArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/network:Network", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Network(String name, Output<String> id, @Nullable NetworkState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/network:Network", name, state, makeResourceOptions(options, id));
     }
 
+    private static NetworkArgs makeArgs(NetworkArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? NetworkArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkEndpoint.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkEndpoint.java
index fa0f00f2..d8691752 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkEndpoint.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkEndpoint.java
@@ -189,13 +189,20 @@ public NetworkLinkEndpoint(String name, NetworkLinkEndpointArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public NetworkLinkEndpoint(String name, NetworkLinkEndpointArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/networkLinkEndpoint:NetworkLinkEndpoint", name, args == null ? NetworkLinkEndpointArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/networkLinkEndpoint:NetworkLinkEndpoint", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private NetworkLinkEndpoint(String name, Output<String> id, @Nullable NetworkLinkEndpointState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/networkLinkEndpoint:NetworkLinkEndpoint", name, state, makeResourceOptions(options, id));
     }
 
+    private static NetworkLinkEndpointArgs makeArgs(NetworkLinkEndpointArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? NetworkLinkEndpointArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkService.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkService.java
index e3118bf7..00ae1ba0 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkService.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/NetworkLinkService.java
@@ -216,13 +216,20 @@ public NetworkLinkService(String name, NetworkLinkServiceArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public NetworkLinkService(String name, NetworkLinkServiceArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/networkLinkService:NetworkLinkService", name, args == null ? NetworkLinkServiceArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/networkLinkService:NetworkLinkService", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private NetworkLinkService(String name, Output<String> id, @Nullable NetworkLinkServiceState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/networkLinkService:NetworkLinkService", name, state, makeResourceOptions(options, id));
     }
 
+    private static NetworkLinkServiceArgs makeArgs(NetworkLinkServiceArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? NetworkLinkServiceArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Peering.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Peering.java
index 5646036b..11a67849 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Peering.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Peering.java
@@ -345,13 +345,20 @@ public Peering(String name, PeeringArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Peering(String name, PeeringArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/peering:Peering", name, args == null ? PeeringArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/peering:Peering", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Peering(String name, Output<String> id, @Nullable PeeringState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/peering:Peering", name, state, makeResourceOptions(options, id));
     }
 
+    private static PeeringArgs makeArgs(PeeringArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? PeeringArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAccess.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAccess.java
index 60fb98b6..dad5d6ae 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAccess.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAccess.java
@@ -340,13 +340,20 @@ public PrivateLinkAccess(String name, PrivateLinkAccessArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public PrivateLinkAccess(String name, PrivateLinkAccessArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/privateLinkAccess:PrivateLinkAccess", name, args == null ? PrivateLinkAccessArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/privateLinkAccess:PrivateLinkAccess", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private PrivateLinkAccess(String name, Output<String> id, @Nullable PrivateLinkAccessState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/privateLinkAccess:PrivateLinkAccess", name, state, makeResourceOptions(options, id));
     }
 
+    private static PrivateLinkAccessArgs makeArgs(PrivateLinkAccessArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? PrivateLinkAccessArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachment.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachment.java
index 722d8cde..8bd0bbdd 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachment.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachment.java
@@ -231,13 +231,20 @@ public PrivateLinkAttachment(String name, PrivateLinkAttachmentArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public PrivateLinkAttachment(String name, PrivateLinkAttachmentArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/privateLinkAttachment:PrivateLinkAttachment", name, args == null ? PrivateLinkAttachmentArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/privateLinkAttachment:PrivateLinkAttachment", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private PrivateLinkAttachment(String name, Output<String> id, @Nullable PrivateLinkAttachmentState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/privateLinkAttachment:PrivateLinkAttachment", name, state, makeResourceOptions(options, id));
     }
 
+    private static PrivateLinkAttachmentArgs makeArgs(PrivateLinkAttachmentArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? PrivateLinkAttachmentArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachmentConnection.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachmentConnection.java
index 7868b1b7..b1cf5b51 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachmentConnection.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/PrivateLinkAttachmentConnection.java
@@ -206,13 +206,20 @@ public PrivateLinkAttachmentConnection(String name, PrivateLinkAttachmentConnect
      * @param options A bag of options that control this resource's behavior.
      */
     public PrivateLinkAttachmentConnection(String name, PrivateLinkAttachmentConnectionArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/privateLinkAttachmentConnection:PrivateLinkAttachmentConnection", name, args == null ? PrivateLinkAttachmentConnectionArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/privateLinkAttachmentConnection:PrivateLinkAttachmentConnection", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private PrivateLinkAttachmentConnection(String name, Output<String> id, @Nullable PrivateLinkAttachmentConnectionState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/privateLinkAttachmentConnection:PrivateLinkAttachmentConnection", name, state, makeResourceOptions(options, id));
     }
 
+    private static PrivateLinkAttachmentConnectionArgs makeArgs(PrivateLinkAttachmentConnectionArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? PrivateLinkAttachmentConnectionArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Provider.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Provider.java
index 7e5cc9d5..777e96ea 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Provider.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Provider.java
@@ -298,7 +298,14 @@ public Provider(String name, @Nullable ProviderArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Provider(String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud", name, args == null ? ProviderArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
+    }
+
+    private static ProviderArgs makeArgs(@Nullable 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<String> id) {
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/RoleBinding.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/RoleBinding.java
index a81ea881..00241007 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/RoleBinding.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/RoleBinding.java
@@ -102,13 +102,20 @@ public RoleBinding(String name, RoleBindingArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public RoleBinding(String name, RoleBindingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/roleBinding:RoleBinding", name, args == null ? RoleBindingArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/roleBinding:RoleBinding", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private RoleBinding(String name, Output<String> id, @Nullable RoleBindingState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/roleBinding:RoleBinding", name, state, makeResourceOptions(options, id));
     }
 
+    private static RoleBindingArgs makeArgs(RoleBindingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? RoleBindingArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Schema.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Schema.java
index d9b2f436..df4d585f 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Schema.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Schema.java
@@ -267,13 +267,20 @@ public Schema(String name, SchemaArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Schema(String name, SchemaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schema:Schema", name, args == null ? SchemaArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schema:Schema", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Schema(String name, Output<String> id, @Nullable SchemaState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schema:Schema", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaArgs makeArgs(SchemaArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaExporter.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaExporter.java
index c4bb38dc..c8c60a0d 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaExporter.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaExporter.java
@@ -217,13 +217,20 @@ public SchemaExporter(String name, SchemaExporterArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public SchemaExporter(String name, SchemaExporterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schemaExporter:SchemaExporter", name, args == null ? SchemaExporterArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schemaExporter:SchemaExporter", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SchemaExporter(String name, Output<String> id, @Nullable SchemaExporterState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schemaExporter:SchemaExporter", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaExporterArgs makeArgs(SchemaExporterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaExporterArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryCluster.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryCluster.java
index af64af77..a3b2c506 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryCluster.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryCluster.java
@@ -162,13 +162,20 @@ public SchemaRegistryCluster(String name, SchemaRegistryClusterArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public SchemaRegistryCluster(String name, SchemaRegistryClusterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schemaRegistryCluster:SchemaRegistryCluster", name, args == null ? SchemaRegistryClusterArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schemaRegistryCluster:SchemaRegistryCluster", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SchemaRegistryCluster(String name, Output<String> id, @Nullable SchemaRegistryClusterState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schemaRegistryCluster:SchemaRegistryCluster", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaRegistryClusterArgs makeArgs(SchemaRegistryClusterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaRegistryClusterArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterConfig.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterConfig.java
index 1cf63697..1a70b96e 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterConfig.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterConfig.java
@@ -108,13 +108,20 @@ public SchemaRegistryClusterConfig(String name, @Nullable SchemaRegistryClusterC
      * @param options A bag of options that control this resource's behavior.
      */
     public SchemaRegistryClusterConfig(String name, @Nullable SchemaRegistryClusterConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schemaRegistryClusterConfig:SchemaRegistryClusterConfig", name, args == null ? SchemaRegistryClusterConfigArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schemaRegistryClusterConfig:SchemaRegistryClusterConfig", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SchemaRegistryClusterConfig(String name, Output<String> id, @Nullable SchemaRegistryClusterConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schemaRegistryClusterConfig:SchemaRegistryClusterConfig", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaRegistryClusterConfigArgs makeArgs(@Nullable SchemaRegistryClusterConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaRegistryClusterConfigArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterMode.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterMode.java
index 61806e31..5bd18236 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterMode.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryClusterMode.java
@@ -108,13 +108,20 @@ public SchemaRegistryClusterMode(String name, @Nullable SchemaRegistryClusterMod
      * @param options A bag of options that control this resource's behavior.
      */
     public SchemaRegistryClusterMode(String name, @Nullable SchemaRegistryClusterModeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schemaRegistryClusterMode:SchemaRegistryClusterMode", name, args == null ? SchemaRegistryClusterModeArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schemaRegistryClusterMode:SchemaRegistryClusterMode", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SchemaRegistryClusterMode(String name, Output<String> id, @Nullable SchemaRegistryClusterModeState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schemaRegistryClusterMode:SchemaRegistryClusterMode", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaRegistryClusterModeArgs makeArgs(@Nullable SchemaRegistryClusterModeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaRegistryClusterModeArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryDek.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryDek.java
index c6d6e6ea..d297473b 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryDek.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryDek.java
@@ -196,13 +196,20 @@ public SchemaRegistryDek(String name, SchemaRegistryDekArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public SchemaRegistryDek(String name, SchemaRegistryDekArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schemaRegistryDek:SchemaRegistryDek", name, args == null ? SchemaRegistryDekArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schemaRegistryDek:SchemaRegistryDek", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SchemaRegistryDek(String name, Output<String> id, @Nullable SchemaRegistryDekState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schemaRegistryDek:SchemaRegistryDek", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaRegistryDekArgs makeArgs(SchemaRegistryDekArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaRegistryDekArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryKek.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryKek.java
index 9fb3a38e..05b1c26a 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryKek.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SchemaRegistryKek.java
@@ -202,13 +202,20 @@ public SchemaRegistryKek(String name, SchemaRegistryKekArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public SchemaRegistryKek(String name, SchemaRegistryKekArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/schemaRegistryKek:SchemaRegistryKek", name, args == null ? SchemaRegistryKekArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/schemaRegistryKek:SchemaRegistryKek", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SchemaRegistryKek(String name, Output<String> id, @Nullable SchemaRegistryKekState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/schemaRegistryKek:SchemaRegistryKek", name, state, makeResourceOptions(options, id));
     }
 
+    private static SchemaRegistryKekArgs makeArgs(SchemaRegistryKekArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SchemaRegistryKekArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/ServiceAccount.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/ServiceAccount.java
index ee9d1473..612181e7 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/ServiceAccount.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/ServiceAccount.java
@@ -176,13 +176,20 @@ public ServiceAccount(String name, @Nullable ServiceAccountArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public ServiceAccount(String name, @Nullable ServiceAccountArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/serviceAccount:ServiceAccount", name, args == null ? ServiceAccountArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/serviceAccount:ServiceAccount", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private ServiceAccount(String name, Output<String> id, @Nullable ServiceAccountState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/serviceAccount:ServiceAccount", name, state, makeResourceOptions(options, id));
     }
 
+    private static ServiceAccountArgs makeArgs(@Nullable ServiceAccountArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? ServiceAccountArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectConfig.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectConfig.java
index ac71dde9..51e0ea05 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectConfig.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectConfig.java
@@ -122,13 +122,20 @@ public SubjectConfig(String name, SubjectConfigArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public SubjectConfig(String name, SubjectConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/subjectConfig:SubjectConfig", name, args == null ? SubjectConfigArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/subjectConfig:SubjectConfig", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SubjectConfig(String name, Output<String> id, @Nullable SubjectConfigState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/subjectConfig:SubjectConfig", name, state, makeResourceOptions(options, id));
     }
 
+    private static SubjectConfigArgs makeArgs(SubjectConfigArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SubjectConfigArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectMode.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectMode.java
index 1c8b7519..c1edf963 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectMode.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/SubjectMode.java
@@ -122,13 +122,20 @@ public SubjectMode(String name, SubjectModeArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public SubjectMode(String name, SubjectModeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/subjectMode:SubjectMode", name, args == null ? SubjectModeArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/subjectMode:SubjectMode", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private SubjectMode(String name, Output<String> id, @Nullable SubjectModeState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/subjectMode:SubjectMode", name, state, makeResourceOptions(options, id));
     }
 
+    private static SubjectModeArgs makeArgs(SubjectModeArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? SubjectModeArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/Tag.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/Tag.java
index 8c6b416e..dbe56394 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/Tag.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/Tag.java
@@ -151,13 +151,20 @@ public Tag(String name, @Nullable TagArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public Tag(String name, @Nullable TagArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/tag:Tag", name, args == null ? TagArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/tag:Tag", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private Tag(String name, Output<String> id, @Nullable TagState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/tag:Tag", name, state, makeResourceOptions(options, id));
     }
 
+    private static TagArgs makeArgs(@Nullable TagArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? TagArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/TagBinding.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/TagBinding.java
index 91a7c34a..d10709d5 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/TagBinding.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/TagBinding.java
@@ -136,13 +136,20 @@ public TagBinding(String name, TagBindingArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public TagBinding(String name, TagBindingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/tagBinding:TagBinding", name, args == null ? TagBindingArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/tagBinding:TagBinding", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private TagBinding(String name, Output<String> id, @Nullable TagBindingState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/tagBinding:TagBinding", name, state, makeResourceOptions(options, id));
     }
 
+    private static TagBindingArgs makeArgs(TagBindingArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? TagBindingArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/TfImporter.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/TfImporter.java
index bcfff3fd..80fde419 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/TfImporter.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/TfImporter.java
@@ -135,13 +135,20 @@ public TfImporter(String name, @Nullable TfImporterArgs args) {
      * @param options A bag of options that control this resource's behavior.
      */
     public TfImporter(String name, @Nullable TfImporterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/tfImporter:TfImporter", name, args == null ? TfImporterArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/tfImporter:TfImporter", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private TfImporter(String name, Output<String> id, @Nullable TfImporterState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/tfImporter:TfImporter", name, state, makeResourceOptions(options, id));
     }
 
+    private static TfImporterArgs makeArgs(@Nullable TfImporterArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? TfImporterArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/sdk/java/src/main/java/com/pulumi/confluentcloud/TransitGatewayAttachment.java b/sdk/java/src/main/java/com/pulumi/confluentcloud/TransitGatewayAttachment.java
index cb209ca4..23aa83e6 100644
--- a/sdk/java/src/main/java/com/pulumi/confluentcloud/TransitGatewayAttachment.java
+++ b/sdk/java/src/main/java/com/pulumi/confluentcloud/TransitGatewayAttachment.java
@@ -197,13 +197,20 @@ public TransitGatewayAttachment(String name, TransitGatewayAttachmentArgs args)
      * @param options A bag of options that control this resource's behavior.
      */
     public TransitGatewayAttachment(String name, TransitGatewayAttachmentArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
-        super("confluentcloud:index/transitGatewayAttachment:TransitGatewayAttachment", name, args == null ? TransitGatewayAttachmentArgs.Empty : args, makeResourceOptions(options, Codegen.empty()));
+        super("confluentcloud:index/transitGatewayAttachment:TransitGatewayAttachment", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
     }
 
     private TransitGatewayAttachment(String name, Output<String> id, @Nullable TransitGatewayAttachmentState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
         super("confluentcloud:index/transitGatewayAttachment:TransitGatewayAttachment", name, state, makeResourceOptions(options, id));
     }
 
+    private static TransitGatewayAttachmentArgs makeArgs(TransitGatewayAttachmentArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? TransitGatewayAttachmentArgs.Empty : args;
+    }
+
     private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
         var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
             .version(Utilities.getVersion())
diff --git a/upstream b/upstream
index b586e318..ad77f5cf 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit b586e318dbf431d9a8e2d23a0f165fbbcd388052
+Subproject commit ad77f5cfce5000e1c16996998fb55626a149a863