Skip to content

Commit

Permalink
Upgrade terraform-provider-confluent to v1.50.0 (#169)
Browse files Browse the repository at this point in the history
* make tfgen

* make build_sdks
  • Loading branch information
aq17 authored Jul 25, 2023
1 parent 447a567 commit 355fa30
Show file tree
Hide file tree
Showing 57 changed files with 3,538 additions and 265 deletions.
30 changes: 30 additions & 0 deletions provider/cmd/pulumi-resource-confluentcloud/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,26 @@
},
"link_mode": {},
"link_name": {},
"local_kafka_cluster": {
"maxItemsOne": true,
"elem": {
"fields": {
"credentials": {
"maxItemsOne": true
}
}
}
},
"remote_kafka_cluster": {
"maxItemsOne": true,
"elem": {
"fields": {
"credentials": {
"maxItemsOne": true
}
}
}
},
"source_kafka_cluster": {
"maxItemsOne": true,
"elem": {
Expand Down Expand Up @@ -1536,6 +1556,14 @@
"bootstrapEndpoint": "bootstrap_endpoint",
"restEndpoint": "rest_endpoint"
},
"confluentcloud:index/ClusterLinkLocalKafkaCluster:ClusterLinkLocalKafkaCluster": {
"bootstrapEndpoint": "bootstrap_endpoint",
"restEndpoint": "rest_endpoint"
},
"confluentcloud:index/ClusterLinkRemoteKafkaCluster:ClusterLinkRemoteKafkaCluster": {
"bootstrapEndpoint": "bootstrap_endpoint",
"restEndpoint": "rest_endpoint"
},
"confluentcloud:index/ClusterLinkSourceKafkaCluster:ClusterLinkSourceKafkaCluster": {
"bootstrapEndpoint": "bootstrap_endpoint",
"restEndpoint": "rest_endpoint"
Expand Down Expand Up @@ -1609,6 +1637,8 @@
"destinationKafkaCluster": "destination_kafka_cluster",
"link": "link_name",
"linkMode": "link_mode",
"localKafkaCluster": "local_kafka_cluster",
"remoteKafkaCluster": "remote_kafka_cluster",
"sourceKafkaCluster": "source_kafka_cluster"
},
"confluentcloud:index/connector:Connector": {
Expand Down
142 changes: 123 additions & 19 deletions provider/cmd/pulumi-resource-confluentcloud/schema.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replace (

require (
github.com/confluentinc/terraform-provider-confluent v1.32.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.1
github.com/pulumi/pulumi/sdk/v3 v3.75.0
)

Expand Down Expand Up @@ -90,7 +90,7 @@ require (
github.com/confluentinc/ccloud-sdk-go-v2/iam v0.10.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/identity-provider v0.2.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/kafka-quotas v0.4.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.13.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.14.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/ksql v0.1.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/mds v0.3.0 // indirect
github.com/confluentinc/ccloud-sdk-go-v2/networking v0.7.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -972,8 +972,8 @@ github.com/confluentinc/ccloud-sdk-go-v2/identity-provider v0.2.0 h1:9TT8UCFRc5z
github.com/confluentinc/ccloud-sdk-go-v2/identity-provider v0.2.0/go.mod h1:JLmrXfnT2PzcuXHD8a6c2cW1c9LKK7aMsdZjjqxYPEk=
github.com/confluentinc/ccloud-sdk-go-v2/kafka-quotas v0.4.0 h1:T9e7lNj/VjxE89+tcpX2RS2NE4rWNWbJjxcO2yehEqM=
github.com/confluentinc/ccloud-sdk-go-v2/kafka-quotas v0.4.0/go.mod h1:7gqwWFIyj2MAGpL/kf6SGXm/pi2Z6qpMJIjKlgEEhhg=
github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.13.0 h1:T+o8qhde3p4sc5Sm1i26VDhZYWINvR8Y0BzimDcTU0k=
github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.13.0/go.mod h1:UZB+e0EXNFKNT8yPIHcQMDy0QvNvJzL55VOEnM9bMoY=
github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.14.0 h1:PBtG7eLIbaYngsPe42nO8bFbYdG9Q41RctCap/PkiLg=
github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.14.0/go.mod h1:1hTwJlTy/3WPjA6I4tFf3X8RjXRHe0RQhRYfR+gHaqc=
github.com/confluentinc/ccloud-sdk-go-v2/ksql v0.1.0 h1:dtLqrG3nltpe2xucO8Bj17HPw+mTJG5zYxJksQ7+Yhw=
github.com/confluentinc/ccloud-sdk-go-v2/ksql v0.1.0/go.mod h1:0LAvd4VqlaRwKU4yvDEkVCtV43yNezt56+hBe9Lmg7Q=
github.com/confluentinc/ccloud-sdk-go-v2/mds v0.3.0 h1:DaipFGVdZjAE8eSztUrA/4b74kj6k5lZ0EJmK1RqccU=
Expand Down Expand Up @@ -2192,8 +2192,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
github.com/pulumi/pulumi-java/pkg v0.9.4 h1:gIQZmlUI1o9ye8CL2XFqtmAX6Lwr9uj/+HzjboiSmK4=
github.com/pulumi/pulumi-java/pkg v0.9.4/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPYWBaG5gimbHouUQ=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0 h1:xp0lE7r3O7lD7lVjJ8KhDL0sNYDCDHippxWUR6sXQx0=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0/go.mod h1:OgOp9PzeKBBqWRZ87VX+amwG8Jt1V1pI+/WZ5dGkYG8=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.1 h1:vTu0+el9A3AH9klQKdxloOCuvLONHZPDVFDC6cFor+g=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.1/go.mod h1:OgOp9PzeKBBqWRZ87VX+amwG8Jt1V1pI+/WZ5dGkYG8=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 h1:rIzMmtcVpPX8ynaz6/nW5AHNY63DiNfCohqmxWvMpM4=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4/go.mod h1:Kt8RIZWa/N8rW3+0g6NrqCBmF3o+HuIhFaZpssEkG6w=
github.com/pulumi/pulumi-yaml v1.1.1 h1:8pyBNIU8+ym0wYpjhsCqN+cutygfK1XbhY2YEeNfyXY=
Expand Down
48 changes: 37 additions & 11 deletions sdk/dotnet/ClusterLink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@ namespace Pulumi.ConfluentCloud
/// <summary>
/// ## Import
///
/// You can import a Kafka mirror topic by using the cluster link name, cluster link mode, cluster link connection mode, source Kafka cluster ID, and destination Kafka cluster ID, in the format `&lt;Cluster link name&gt;/&lt;Cluster link mode&gt;/&lt;Cluster connection mode&gt;/&lt;Source Kafka cluster ID&gt;/&lt;Destination Kafka cluster ID&gt;`, for example$ export IMPORT_SOURCE_KAFKA_BOOTSTRAP_ENDPOINT="&lt;source_kafka_bootstrap_endpoint&gt;" $ export IMPORT_SOURCE_KAFKA_API_KEY="&lt;source_kafka_api_key&gt;" $ export IMPORT_SOURCE_KAFKA_API_SECRET="&lt;source_kafka_api_secret&gt;" $ export IMPORT_DESTINATION_KAFKA_REST_ENDPOINT="&lt;destination_kafka_rest_endpoint&gt;" $ export IMPORT_DESTINATION_KAFKA_API_KEY="&lt;destination_kafka_api_key&gt;" $ export IMPORT_DESTINATION_KAFKA_API_SECRET="&lt;destination_kafka_api_secret&gt;"
/// You can import a Kafka mirror topic by using the cluster link name, cluster link mode, cluster link connection mode, source (or local for bidirectional cluster links) Kafka cluster ID, and destination (or remote
///
/// for bidirectional cluster links) Kafka cluster ID, in the format `&lt;Cluster link name&gt;/&lt;Cluster link mode&gt;/&lt;Cluster connection mode&gt;/&lt;Source (Local) Kafka cluster ID&gt;/&lt;Destination (Remote) Kafka cluster ID&gt;`, for exampleOption #1 when using source-initiated or destination-initiated cluster links $ export IMPORT_SOURCE_KAFKA_BOOTSTRAP_ENDPOINT="&lt;source_kafka_bootstrap_endpoint&gt;" $ export IMPORT_SOURCE_KAFKA_API_KEY="&lt;source_kafka_api_key&gt;" $ export IMPORT_SOURCE_KAFKA_API_SECRET="&lt;source_kafka_api_secret&gt;" $ export IMPORT_DESTINATION_KAFKA_REST_ENDPOINT="&lt;destination_kafka_rest_endpoint&gt;" $ export IMPORT_DESTINATION_KAFKA_API_KEY="&lt;destination_kafka_api_key&gt;" $ export IMPORT_DESTINATION_KAFKA_API_SECRET="&lt;destination_kafka_api_secret&gt;"
///
/// ```sh
/// $ pulumi import confluentcloud:index/clusterLink:ClusterLink my_cluster_link my-cluster-link/DESTINATION/OUTBOUND/lkc-abc123/lkc-xyz456
/// ```
///
/// Option #2 when using bidirectional cluster links $ export IMPORT_LOCAL_KAFKA_BOOTSTRAP_ENDPOINT="&lt;local_kafka_bootstrap_endpoint&gt;" $ export IMPORT_LOCAL_KAFKA_API_KEY="&lt;local_kafka_api_key&gt;" $ export IMPORT_LOCAL_KAFKA_API_SECRET="&lt;local_kafka_api_secret&gt;" $ export IMPORT_REMOTE_KAFKA_REST_ENDPOINT="&lt;remote_kafka_rest_endpoint&gt;" $ export IMPORT_REMOTE_KAFKA_API_KEY="&lt;remote_kafka_api_key&gt;" $ export IMPORT_REMOTE_KAFKA_API_SECRET="&lt;remote_kafka_api_secret&gt;"
///
/// ```sh
/// $ pulumi import confluentcloud:index/clusterLink:ClusterLink my_cluster_link my-cluster-link/BIDIRECTIONAL/OUTBOUND/lkc-abc123/lkc-xyz456
/// ```
///
/// !&gt; **Warning:** Do not forget to delete terminal command history afterwards for security purposes.
/// </summary>
[ConfluentCloudResourceType("confluentcloud:index/clusterLink:ClusterLink")]
Expand All @@ -36,7 +44,7 @@ public partial class ClusterLink : global::Pulumi.CustomResource
public Output<string?> ConnectionMode { get; private set; } = null!;

[Output("destinationKafkaCluster")]
public Output<Outputs.ClusterLinkDestinationKafkaCluster> DestinationKafkaCluster { get; private set; } = null!;
public Output<Outputs.ClusterLinkDestinationKafkaCluster?> DestinationKafkaCluster { get; private set; } = null!;

/// <summary>
/// The name of the cluster link, for example, `my-cluster-link`.
Expand All @@ -45,13 +53,19 @@ public partial class ClusterLink : global::Pulumi.CustomResource
public Output<string> Link { get; private set; } = null!;

/// <summary>
/// The mode of the cluster link. The supported values are `"DESTINATION"` and `"SOURCE"`. Defaults to `"DESTINATION"`.
/// The mode of the cluster link. The supported values are `"DESTINATION"`, `"SOURCE"`, and `"BIDIRECTIONAL"`. Defaults to `"DESTINATION"`.
/// </summary>
[Output("linkMode")]
public Output<string?> LinkMode { get; private set; } = null!;

[Output("localKafkaCluster")]
public Output<Outputs.ClusterLinkLocalKafkaCluster?> LocalKafkaCluster { get; private set; } = null!;

[Output("remoteKafkaCluster")]
public Output<Outputs.ClusterLinkRemoteKafkaCluster?> RemoteKafkaCluster { get; private set; } = null!;

[Output("sourceKafkaCluster")]
public Output<Outputs.ClusterLinkSourceKafkaCluster> SourceKafkaCluster { get; private set; } = null!;
public Output<Outputs.ClusterLinkSourceKafkaCluster?> SourceKafkaCluster { get; private set; } = null!;


/// <summary>
Expand All @@ -61,7 +75,7 @@ public partial class ClusterLink : global::Pulumi.CustomResource
/// <param name="name">The unique name of the resource</param>
/// <param name="args">The arguments used to populate this resource's properties</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public ClusterLink(string name, ClusterLinkArgs args, CustomResourceOptions? options = null)
public ClusterLink(string name, ClusterLinkArgs? args = null, CustomResourceOptions? options = null)
: base("confluentcloud:index/clusterLink:ClusterLink", name, args ?? new ClusterLinkArgs(), MakeResourceOptions(options, ""))
{
}
Expand Down Expand Up @@ -117,8 +131,8 @@ public InputMap<string> Config
[Input("connectionMode")]
public Input<string>? ConnectionMode { get; set; }

[Input("destinationKafkaCluster", required: true)]
public Input<Inputs.ClusterLinkDestinationKafkaClusterArgs> DestinationKafkaCluster { get; set; } = null!;
[Input("destinationKafkaCluster")]
public Input<Inputs.ClusterLinkDestinationKafkaClusterArgs>? DestinationKafkaCluster { get; set; }

/// <summary>
/// The name of the cluster link, for example, `my-cluster-link`.
Expand All @@ -127,13 +141,19 @@ public InputMap<string> Config
public Input<string>? Link { get; set; }

/// <summary>
/// The mode of the cluster link. The supported values are `"DESTINATION"` and `"SOURCE"`. Defaults to `"DESTINATION"`.
/// The mode of the cluster link. The supported values are `"DESTINATION"`, `"SOURCE"`, and `"BIDIRECTIONAL"`. Defaults to `"DESTINATION"`.
/// </summary>
[Input("linkMode")]
public Input<string>? LinkMode { get; set; }

[Input("sourceKafkaCluster", required: true)]
public Input<Inputs.ClusterLinkSourceKafkaClusterArgs> SourceKafkaCluster { get; set; } = null!;
[Input("localKafkaCluster")]
public Input<Inputs.ClusterLinkLocalKafkaClusterArgs>? LocalKafkaCluster { get; set; }

[Input("remoteKafkaCluster")]
public Input<Inputs.ClusterLinkRemoteKafkaClusterArgs>? RemoteKafkaCluster { get; set; }

[Input("sourceKafkaCluster")]
public Input<Inputs.ClusterLinkSourceKafkaClusterArgs>? SourceKafkaCluster { get; set; }

public ClusterLinkArgs()
{
Expand Down Expand Up @@ -171,11 +191,17 @@ public InputMap<string> Config
public Input<string>? Link { get; set; }

/// <summary>
/// The mode of the cluster link. The supported values are `"DESTINATION"` and `"SOURCE"`. Defaults to `"DESTINATION"`.
/// The mode of the cluster link. The supported values are `"DESTINATION"`, `"SOURCE"`, and `"BIDIRECTIONAL"`. Defaults to `"DESTINATION"`.
/// </summary>
[Input("linkMode")]
public Input<string>? LinkMode { get; set; }

[Input("localKafkaCluster")]
public Input<Inputs.ClusterLinkLocalKafkaClusterGetArgs>? LocalKafkaCluster { get; set; }

[Input("remoteKafkaCluster")]
public Input<Inputs.ClusterLinkRemoteKafkaClusterGetArgs>? RemoteKafkaCluster { get; set; }

[Input("sourceKafkaCluster")]
public Input<Inputs.ClusterLinkSourceKafkaClusterGetArgs>? SourceKafkaCluster { get; set; }

Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/Inputs/ClusterLinkDestinationKafkaClusterArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Pulumi.ConfluentCloud.Inputs
public sealed class ClusterLinkDestinationKafkaClusterArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// The bootstrap endpoint of the destination Kafka cluster, for example, `SASL_SSL://pkc-00000.us-central1.gcp.confluent.cloud:9092` or `pkc-00000.us-central1.gcp.confluent.cloud:9092`).
/// The bootstrap endpoint of the remote Kafka cluster, for example, `SASL_SSL://pkc-00000.us-central1.gcp.confluent.cloud:9092` or `pkc-00000.us-central1.gcp.confluent.cloud:9092`).
/// </summary>
[Input("bootstrapEndpoint")]
public Input<string>? BootstrapEndpoint { get; set; }
Expand All @@ -31,13 +31,13 @@ public Input<Inputs.ClusterLinkDestinationKafkaClusterCredentialsArgs>? Credenti
}

/// <summary>
/// The ID of the destination Kafka cluster, for example, `lkc-abc123`.
/// The ID of the remote Kafka cluster, for example, `lkc-abc123`.
/// </summary>
[Input("id", required: true)]
public Input<string> Id { get; set; } = null!;

/// <summary>
/// The REST endpoint of the destination Kafka cluster, for example, `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
/// The REST endpoint of the remote Kafka cluster, for example, `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
/// </summary>
[Input("restEndpoint")]
public Input<string>? RestEndpoint { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public Input<string>? Key

/// <summary>
/// The Kafka API Secret.
///
/// &gt; **Note:** The `local_kafka_cluster`, `remote_kafka_cluster` configuration block and `link_mode = BIDIRECTIONAL` are in a [Preview lifecycle stage](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy).
/// </summary>
public Input<string>? Secret
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public Input<string>? Key

/// <summary>
/// The Kafka API Secret.
///
/// &gt; **Note:** The `local_kafka_cluster`, `remote_kafka_cluster` configuration block and `link_mode = BIDIRECTIONAL` are in a [Preview lifecycle stage](https://docs.confluent.io/cloud/current/api.html#section/Versioning/API-Lifecycle-Policy).
/// </summary>
public Input<string>? Secret
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Pulumi.ConfluentCloud.Inputs
public sealed class ClusterLinkDestinationKafkaClusterGetArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// The bootstrap endpoint of the destination Kafka cluster, for example, `SASL_SSL://pkc-00000.us-central1.gcp.confluent.cloud:9092` or `pkc-00000.us-central1.gcp.confluent.cloud:9092`).
/// The bootstrap endpoint of the remote Kafka cluster, for example, `SASL_SSL://pkc-00000.us-central1.gcp.confluent.cloud:9092` or `pkc-00000.us-central1.gcp.confluent.cloud:9092`).
/// </summary>
[Input("bootstrapEndpoint")]
public Input<string>? BootstrapEndpoint { get; set; }
Expand All @@ -31,13 +31,13 @@ public Input<Inputs.ClusterLinkDestinationKafkaClusterCredentialsGetArgs>? Crede
}

/// <summary>
/// The ID of the destination Kafka cluster, for example, `lkc-abc123`.
/// The ID of the remote Kafka cluster, for example, `lkc-abc123`.
/// </summary>
[Input("id", required: true)]
public Input<string> Id { get; set; } = null!;

/// <summary>
/// The REST endpoint of the destination Kafka cluster, for example, `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
/// The REST endpoint of the remote Kafka cluster, for example, `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
/// </summary>
[Input("restEndpoint")]
public Input<string>? RestEndpoint { get; set; }
Expand Down
50 changes: 50 additions & 0 deletions sdk/dotnet/Inputs/ClusterLinkLocalKafkaClusterArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.ConfluentCloud.Inputs
{

public sealed class ClusterLinkLocalKafkaClusterArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// The bootstrap endpoint of the remote Kafka cluster, for example, `SASL_SSL://pkc-00000.us-central1.gcp.confluent.cloud:9092` or `pkc-00000.us-central1.gcp.confluent.cloud:9092`).
/// </summary>
[Input("bootstrapEndpoint")]
public Input<string>? BootstrapEndpoint { get; set; }

[Input("credentials")]
private Input<Inputs.ClusterLinkLocalKafkaClusterCredentialsArgs>? _credentials;
public Input<Inputs.ClusterLinkLocalKafkaClusterCredentialsArgs>? Credentials
{
get => _credentials;
set
{
var emptySecret = Output.CreateSecret(0);
_credentials = Output.Tuple<Input<Inputs.ClusterLinkLocalKafkaClusterCredentialsArgs>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// The ID of the remote Kafka cluster, for example, `lkc-abc123`.
/// </summary>
[Input("id", required: true)]
public Input<string> Id { get; set; } = null!;

/// <summary>
/// The REST endpoint of the remote Kafka cluster, for example, `https://pkc-00000.us-central1.gcp.confluent.cloud:443`).
/// </summary>
[Input("restEndpoint")]
public Input<string>? RestEndpoint { get; set; }

public ClusterLinkLocalKafkaClusterArgs()
{
}
public static new ClusterLinkLocalKafkaClusterArgs Empty => new ClusterLinkLocalKafkaClusterArgs();
}
}
Loading

0 comments on commit 355fa30

Please sign in to comment.