Merge pull request #55 from pulumi/guin/v1.19.0

Upgrade terraform-provider-confluent to v 1.19.0

provider/go.mod

@@ -3,7 +3,7 @@ module github.com/pulumi/pulumi-confluentcloud/provider
 go 1.19
 
 replace (
-	github.com/confluentinc/terraform-provider-confluent => github.com/pulumi/terraform-provider-confluent v0.0.0-20221122221850-4dd4c9531d27
+	github.com/confluentinc/terraform-provider-confluent => github.com/pulumi/terraform-provider-confluent v0.0.0-20221205182427-7f5cfa878b3e
 	github.com/confluentinc/terraform-provider-confluent/shim => ./shim
 	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9
 )
@@ -75,8 +75,7 @@ require (
 	github.com/confluentinc/ccloud-sdk-go-v2/networking v0.4.0 // indirect
 	github.com/confluentinc/ccloud-sdk-go-v2/org v0.4.0 // indirect
 	github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.2.0 // indirect
-	github.com/confluentinc/ccloud-sdk-go-v2/stream-governance v0.2.0 // indirect
-	github.com/confluentinc/terraform-provider-confluent v1.16.0 // indirect
+	github.com/confluentinc/terraform-provider-confluent v1.19.0 // indirect
 	github.com/containerd/cgroups v1.0.3 // indirect
 	github.com/containerd/containerd v1.6.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

provider/go.sum

@@ -347,8 +347,6 @@ github.com/confluentinc/ccloud-sdk-go-v2/org v0.4.0 h1:WcJs6RbY8nU5HapaG0ZCH9ftF
 github.com/confluentinc/ccloud-sdk-go-v2/org v0.4.0/go.mod h1:zREJ+OOZz0rEXCaPx0JbCVj2EfNnYs/c6qhPDfhldI0=
 github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.2.0 h1:ezCzDCOOavjTPVKvdET0QjAXm1u9iRJjg2s5lkSMrps=
 github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.2.0/go.mod h1:qY4Y/QCDKI0eR+HLVJWGFstsTAiI83+sowKOyoRFhF0=
-github.com/confluentinc/ccloud-sdk-go-v2/stream-governance v0.2.0 h1:wg+Nocg0LfsbgtyJ/xlkOFt7KBFnostVdjPNQuXO3Dk=
-github.com/confluentinc/ccloud-sdk-go-v2/stream-governance v0.2.0/go.mod h1:IitA7EBhH+W0WuecDiETuXApHTxAuiWzJEpotexhWjA=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -1260,8 +1258,8 @@ github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Di
 github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
 github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9 h1:JMw+t5I+6E8Lna7JF+ghAoOLOl23UIbshJyRNP+K1HU=
 github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9/go.mod h1:mYPs/uchNcBq7AclQv9QUtSf9iNcfp1Ag21jqTlDf2M=
-github.com/pulumi/terraform-provider-confluent v0.0.0-20221122221850-4dd4c9531d27 h1:8ezgAYkAzPAhzgboH7aYHiQymw4z7J6aKRZ32atPpPc=
-github.com/pulumi/terraform-provider-confluent v0.0.0-20221122221850-4dd4c9531d27/go.mod h1:OtfYM8judQRStPm8QT+qo4piMf0T90e+CcqSK52iRX8=
+github.com/pulumi/terraform-provider-confluent v0.0.0-20221205182427-7f5cfa878b3e h1:wm1+xCh3ZGgIuHR5YqRDZnnGq7drPULgX4o3j+U0npg=
+github.com/pulumi/terraform-provider-confluent v0.0.0-20221205182427-7f5cfa878b3e/go.mod h1:B7qu0d6DsMec1CWbjN9ZQYjgHxAfOCeZNWXbCOYnpGo=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=

provider/resources.go

@@ -99,7 +99,6 @@ func Provider() tfbridge.ProviderInfo {
 			"confluent_identity_provider":          {Tok: tfbridge.MakeResource(mainPkg, mainMod, "IdentityProvider")},
 			"confluent_ksql_cluster":               {Tok: tfbridge.MakeResource(mainPkg, mainMod, "KsqlCluster")},
 			"confluent_schema_registry_cluster":    {Tok: tfbridge.MakeResource(mainPkg, mainMod, "SchemaRegistryCluster")},
-			"confluent_stream_governance_cluster":  {Tok: tfbridge.MakeResource(mainPkg, mainMod, "StreamGovernanceCluster")},
 			"confluent_transit_gateway_attachment": {Tok: tfbridge.MakeResource(mainPkg, mainMod, "TransitGatewayAttachment")},
 		},
 		DataSources: map[string]*tfbridge.DataSourceInfo{
@@ -119,9 +118,7 @@ func Provider() tfbridge.ProviderInfo {
 			"confluent_ksql_cluster":               {Tok: tfbridge.MakeDataSource(mainPkg, mainMod, "getKsqlCluster")},
 			"confluent_schema_registry_cluster":    {Tok: tfbridge.MakeDataSource(mainPkg, mainMod, "getSchemaRegistryCluster")},
 			"confluent_schema_registry_region":     {Tok: tfbridge.MakeDataSource(mainPkg, mainMod, "getSchemaRegistryRegion")},
-			"confluent_stream_governance_cluster":  {Tok: tfbridge.MakeDataSource(mainPkg, mainMod, "getStreatGovernanceCluster")},
 			"confluent_transit_gateway_attachment": {Tok: tfbridge.MakeDataSource(mainPkg, mainMod, "getTransitGatewayAttachment")},
-			"confluent_stream_governance_region":   {Tok: tfbridge.MakeDataSource(mainPkg, mainMod, "getStreamGovernanceRegion")},
 		},
 		JavaScript: &tfbridge.JavaScriptInfo{
 			Dependencies: map[string]string{

provider/shim/go.mod

@@ -3,11 +3,11 @@ module github.com/confluentinc/terraform-provider-confluent/shim
 go 1.19
 
 require (
-	github.com/confluentinc/terraform-provider-confluent v1.16.0
+	github.com/confluentinc/terraform-provider-confluent v1.19.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.0
 )
 
-replace github.com/confluentinc/terraform-provider-confluent => github.com/pulumi/terraform-provider-confluent v0.0.0-20221109214506-bbfca8f3bcd9
+replace github.com/confluentinc/terraform-provider-confluent => github.com/pulumi/terraform-provider-confluent v0.0.0-20221205182427-7f5cfa878b3e
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -27,7 +27,7 @@ require (
 	github.com/confluentinc/ccloud-sdk-go-v2/mds v0.3.0 // indirect
 	github.com/confluentinc/ccloud-sdk-go-v2/networking v0.4.0 // indirect
 	github.com/confluentinc/ccloud-sdk-go-v2/org v0.4.0 // indirect
-	github.com/confluentinc/ccloud-sdk-go-v2/stream-governance v0.2.0 // indirect
+	github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.2.0 // indirect
 	github.com/containerd/cgroups v1.0.3 // indirect
 	github.com/containerd/containerd v1.6.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

provider/shim/go.sum

@@ -196,8 +196,8 @@ github.com/confluentinc/ccloud-sdk-go-v2/networking v0.4.0 h1:y9dsFQ6GATM+5r56Fk
 github.com/confluentinc/ccloud-sdk-go-v2/networking v0.4.0/go.mod h1:EcmHhRib8dDuO5ZsO+qS3scX9xEP5E/IXOVoItp5X2s=
 github.com/confluentinc/ccloud-sdk-go-v2/org v0.4.0 h1:WcJs6RbY8nU5HapaG0ZCH9ftFBtZyuKMIuNAkdVmc2o=
 github.com/confluentinc/ccloud-sdk-go-v2/org v0.4.0/go.mod h1:zREJ+OOZz0rEXCaPx0JbCVj2EfNnYs/c6qhPDfhldI0=
-github.com/confluentinc/ccloud-sdk-go-v2/stream-governance v0.2.0 h1:wg+Nocg0LfsbgtyJ/xlkOFt7KBFnostVdjPNQuXO3Dk=
-github.com/confluentinc/ccloud-sdk-go-v2/stream-governance v0.2.0/go.mod h1:IitA7EBhH+W0WuecDiETuXApHTxAuiWzJEpotexhWjA=
+github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.2.0 h1:ezCzDCOOavjTPVKvdET0QjAXm1u9iRJjg2s5lkSMrps=
+github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.2.0/go.mod h1:qY4Y/QCDKI0eR+HLVJWGFstsTAiI83+sowKOyoRFhF0=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -873,8 +873,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pulumi/terraform-provider-confluent v0.0.0-20221109214506-bbfca8f3bcd9 h1:DuIom6FMTyg7YsteJ6A7WwthqK0HjngPEQ71pcv5oxo=
-github.com/pulumi/terraform-provider-confluent v0.0.0-20221109214506-bbfca8f3bcd9/go.mod h1:v6BWFLLzc573WdOh93hxN4YJFkR3LsAZ7mNYnbfyNEg=
+github.com/pulumi/terraform-provider-confluent v0.0.0-20221205182427-7f5cfa878b3e h1:wm1+xCh3ZGgIuHR5YqRDZnnGq7drPULgX4o3j+U0npg=
+github.com/pulumi/terraform-provider-confluent v0.0.0-20221205182427-7f5cfa878b3e/go.mod h1:B7qu0d6DsMec1CWbjN9ZQYjgHxAfOCeZNWXbCOYnpGo=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

sdk/dotnet/ClusterLink.cs

@@ -23,6 +23,12 @@ namespace Pulumi.ConfluentCloud
     [ConfluentCloudResourceType("confluentcloud:index/clusterLink:ClusterLink")]
     public partial class ClusterLink : global::Pulumi.CustomResource
     {
+        /// <summary>
+        /// The custom cluster link settings to set:
+        /// </summary>
+        [Output("config")]
+        public Output<ImmutableDictionary<string, string>> Config { get; private set; } = null!;
+
         /// <summary>
         /// The connection mode of the cluster link. The supported values are `"INBOUND"` and `"OUTBOUND"`. Defaults to `"OUTBOUND"`.
         /// </summary>
@@ -93,6 +99,18 @@ public static ClusterLink Get(string name, Input<string> id, ClusterLinkState? s
 
     public sealed class ClusterLinkArgs : global::Pulumi.ResourceArgs
     {
+        [Input("config")]
+        private InputMap<string>? _config;
+
+        /// <summary>
+        /// The custom cluster link settings to set:
+        /// </summary>
+        public InputMap<string> Config
+        {
+            get => _config ?? (_config = new InputMap<string>());
+            set => _config = value;
+        }
+
         /// <summary>
         /// The connection mode of the cluster link. The supported values are `"INBOUND"` and `"OUTBOUND"`. Defaults to `"OUTBOUND"`.
         /// </summary>
@@ -125,6 +143,18 @@ public ClusterLinkArgs()
 
     public sealed class ClusterLinkState : global::Pulumi.ResourceArgs
     {
+        [Input("config")]
+        private InputMap<string>? _config;
+
+        /// <summary>
+        /// The custom cluster link settings to set:
+        /// </summary>
+        public InputMap<string> Config
+        {
+            get => _config ?? (_config = new InputMap<string>());
+            set => _config = value;
+        }
+
         /// <summary>
         /// The connection mode of the cluster link. The supported values are `"INBOUND"` and `"OUTBOUND"`. Defaults to `"OUTBOUND"`.
         /// </summary>

sdk/dotnet/Config/Config.cs

@@ -92,5 +92,15 @@ public static string? KafkaRestEndpoint
             set => _kafkaRestEndpoint.Set(value);
         }
 
+        private static readonly __Value<int?> _maxRetries = new __Value<int?>(() => __config.GetInt32("maxRetries"));
+        /// <summary>
+        /// Maximum number of retries of HTTP client. Defaults to 4.
+        /// </summary>
+        public static int? MaxRetries
+        {
+            get => _maxRetries.Get();
+            set => _maxRetries.Set(value);
+        }
+
     }
 }

sdk/dotnet/GetKsqlCluster.cs

@@ -14,10 +14,7 @@ public static class GetKsqlCluster
         /// <summary>
         /// ## # confluentcloud.KsqlCluster Data Source
         /// 
-        /// [![Open Preview](https://img.shields.io/badge/Lifecycle%20Stage-Open%20Preview-%2300afba)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
-        /// 
-        /// &gt; **Note:** `confluentcloud.KsqlCluster` data source is available in **Open Preview** for early adopters. Open Preview features are introduced to gather customer feedback. This feature should be used only for evaluation and non-production testing purposes or to provide feedback to Confluent, particularly as it becomes more widely available in follow-on editions.  
-        /// **Open Preview** features are intended for evaluation use in development and testing environments only, and not for production use. The warranty, SLA, and Support Services provisions of your agreement with Confluent do not apply to Open Preview features. Open Preview features are considered to be a Proof of Concept as defined in the Confluent Cloud Terms of Service. Confluent may discontinue providing preview releases of the Open Preview features at any time in Confluent’s sole discretion.
+        /// [![General Availability](https://img.shields.io/badge/Lifecycle%20Stage-General%20Availability-%2345c6e8)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
         /// 
         /// `confluentcloud.KsqlCluster` describes a ksqlDB cluster data source.
         /// 
@@ -66,10 +63,7 @@ public static Task<GetKsqlClusterResult> InvokeAsync(GetKsqlClusterArgs args, In
         /// <summary>
         /// ## # confluentcloud.KsqlCluster Data Source
         /// 
-        /// [![Open Preview](https://img.shields.io/badge/Lifecycle%20Stage-Open%20Preview-%2300afba)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
-        /// 
-        /// &gt; **Note:** `confluentcloud.KsqlCluster` data source is available in **Open Preview** for early adopters. Open Preview features are introduced to gather customer feedback. This feature should be used only for evaluation and non-production testing purposes or to provide feedback to Confluent, particularly as it becomes more widely available in follow-on editions.  
-        /// **Open Preview** features are intended for evaluation use in development and testing environments only, and not for production use. The warranty, SLA, and Support Services provisions of your agreement with Confluent do not apply to Open Preview features. Open Preview features are considered to be a Proof of Concept as defined in the Confluent Cloud Terms of Service. Confluent may discontinue providing preview releases of the Open Preview features at any time in Confluent’s sole discretion.
+        /// [![General Availability](https://img.shields.io/badge/Lifecycle%20Stage-General%20Availability-%2345c6e8)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
         /// 
         /// `confluentcloud.KsqlCluster` describes a ksqlDB cluster data source.
         /// 
@@ -189,6 +183,10 @@ public sealed class GetKsqlClusterResult
         /// </summary>
         public readonly string Kind;
         /// <summary>
+        /// (Required String) The Confluent Resource Name of the ksqlDB cluster.
+        /// </summary>
+        public readonly string ResourceName;
+        /// <summary>
         /// (Required String) The API endpoint of the ksqlDB cluster, for example, `https://pksqlc-00000.us-central1.gcp.glb.confluent.cloud`.
         /// - `kafka_cluster` (Optional Configuration Block) supports the following:
         /// </summary>
@@ -221,6 +219,8 @@ private GetKsqlClusterResult(
 
             string kind,
 
+            string resourceName,
+
             string restEndpoint,
 
             int storage,
@@ -237,6 +237,7 @@ private GetKsqlClusterResult(
             Id = id;
             KafkaClusters = kafkaClusters;
             Kind = kind;
+            ResourceName = resourceName;
             RestEndpoint = restEndpoint;
             Storage = storage;
             TopicPrefix = topicPrefix;

sdk/dotnet/GetPrivateLinkAccess.cs

@@ -14,7 +14,7 @@ public static class GetPrivateLinkAccess
         /// <summary>
         /// [![General Availability](https://img.shields.io/badge/Lifecycle%20Stage-General%20Availability-%2345c6e8)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
         /// 
-        /// `confluentcloud.PrivateLinkAccess` describes a Network data source.
+        /// `confluentcloud.PrivateLinkAccess` describes a Private Link Access data source.
         /// 
         /// {{% examples %}}
         /// ## Example Usage
@@ -61,7 +61,7 @@ public static Task<GetPrivateLinkAccessResult> InvokeAsync(GetPrivateLinkAccessA
         /// <summary>
         /// [![General Availability](https://img.shields.io/badge/Lifecycle%20Stage-General%20Availability-%2345c6e8)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
         /// 
-        /// `confluentcloud.PrivateLinkAccess` describes a Network data source.
+        /// `confluentcloud.PrivateLinkAccess` describes a Private Link Access data source.
         /// 
         /// {{% examples %}}
         /// ## Example Usage

sdk/dotnet/GetSchemaRegistryCluster.cs

@@ -12,10 +12,7 @@ namespace Pulumi.ConfluentCloud
     public static class GetSchemaRegistryCluster
     {
         /// <summary>
-        /// [![Open Preview](https://img.shields.io/badge/Lifecycle%20Stage-Open%20Preview-%2300afba)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
-        /// 
-        /// &gt; **Note:** `confluentcloud.SchemaRegistryCluster` resource is available in **Open Preview** for early adopters. Open Preview features are introduced to gather customer feedback. This feature should be used only for evaluation and non-production testing purposes or to provide feedback to Confluent, particularly as it becomes more widely available in follow-on editions.  
-        /// **Open Preview** features are intended for evaluation use in development and testing environments only, and not for production use. The warranty, SLA, and Support Services provisions of your agreement with Confluent do not apply to Open Preview features. Open Preview features are considered to be a Proof of Concept as defined in the Confluent Cloud Terms of Service. Confluent may discontinue providing preview releases of the Open Preview features at any time in Confluent’s sole discretion.
+        /// [![General Availability](https://img.shields.io/badge/Lifecycle%20Stage-General%20Availability-%2345c6e8)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
         /// 
         /// `confluentcloud.SchemaRegistryCluster` describes a Schema Registry cluster data source.
         /// 
@@ -62,10 +59,7 @@ public static Task<GetSchemaRegistryClusterResult> InvokeAsync(GetSchemaRegistry
             => global::Pulumi.Deployment.Instance.InvokeAsync<GetSchemaRegistryClusterResult>("confluentcloud:index/getSchemaRegistryCluster:getSchemaRegistryCluster", args ?? new GetSchemaRegistryClusterArgs(), options.WithDefaults());
 
         /// <summary>
-        /// [![Open Preview](https://img.shields.io/badge/Lifecycle%20Stage-Open%20Preview-%2300afba)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
-        /// 
-        /// &gt; **Note:** `confluentcloud.SchemaRegistryCluster` resource is available in **Open Preview** for early adopters. Open Preview features are introduced to gather customer feedback. This feature should be used only for evaluation and non-production testing purposes or to provide feedback to Confluent, particularly as it becomes more widely available in follow-on editions.  
-        /// **Open Preview** features are intended for evaluation use in development and testing environments only, and not for production use. The warranty, SLA, and Support Services provisions of your agreement with Confluent do not apply to Open Preview features. Open Preview features are considered to be a Proof of Concept as defined in the Confluent Cloud Terms of Service. Confluent may discontinue providing preview releases of the Open Preview features at any time in Confluent’s sole discretion.
+        /// [![General Availability](https://img.shields.io/badge/Lifecycle%20Stage-General%20Availability-%2345c6e8)](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy)
         /// 
         /// `confluentcloud.SchemaRegistryCluster` describes a Schema Registry cluster data source.
         ///