From b0e3faf8cfa87356653d76753a7985eb8cf1aac6 Mon Sep 17 00:00:00 2001 From: Guilherme Branco Date: Fri, 20 Dec 2024 16:54:15 -0300 Subject: [PATCH] OCM-13210 | fix: include wait knobs to cluster datasource --- docs/data-sources/cluster_rosa_classic.md | 1 + docs/data-sources/cluster_rosa_hcp.md | 2 ++ .../classic/cluster_rosa_classic_datasource.go | 4 ++++ provider/clusterrosa/hcp/datasource.go | 8 ++++++++ 4 files changed, 15 insertions(+) diff --git a/docs/data-sources/cluster_rosa_classic.md b/docs/data-sources/cluster_rosa_classic.md index 57318cff..48d33cef 100644 --- a/docs/data-sources/cluster_rosa_classic.md +++ b/docs/data-sources/cluster_rosa_classic.md @@ -63,6 +63,7 @@ data "rhcs_cluster_rosa_classic" "cluster" { - `host_prefix` (Number) Length of the prefix of the subnet assigned to each node. After the creation of the resource, it is not possible to update the attribute value. - `infra_id` (String) The ROSA cluster infrastructure ID. - `machine_cidr` (String) Block of IP addresses for nodes. After the creation of the resource, it is not possible to update the attribute value. +- `max_cluster_wait_timeout_in_minutes` (Number) This attribute is not supported for cluster data source. Therefore, it will not be displayed as an output of the datasource - `max_replicas` (Number) This attribute is not supported for cluster data source. Therefore, it will not be displayed as an output of the datasource - `min_replicas` (Number) This attribute is not supported for cluster data source. Therefore, it will not be displayed as an output of the datasource - `multi_az` (Boolean) Indicates if the cluster should be deployed to multiple availability zones. Default value is 'false'. This attribute specifically applies to the Worker Machine Pool and becomes irrelevant once the resource is created. Any modifications to the initial Machine Pool should be made through the Terraform imported Machine Pool resource. For more details, refer to [Worker Machine Pool in ROSA Cluster](../guides/worker-machine-pool.md) diff --git a/docs/data-sources/cluster_rosa_hcp.md b/docs/data-sources/cluster_rosa_hcp.md index 7571db21..57964420 100644 --- a/docs/data-sources/cluster_rosa_hcp.md +++ b/docs/data-sources/cluster_rosa_hcp.md @@ -57,6 +57,8 @@ data "rhcs_cluster_rosa_hcp" "cluster" { - `external_id` (String) Unique external identifier of the cluster. After the creation of the resource, it is not possible to update the attribute value. - `host_prefix` (Number) Length of the prefix of the subnet assigned to each node. After the creation of the resource, it is not possible to update the attribute value. - `machine_cidr` (String) Block of IP addresses for nodes. After the creation of the resource, it is not possible to update the attribute value. +- `max_hcp_cluster_wait_timeout_in_minutes` (Number) This attribute is not supported for cluster data source. Therefore, it will not be displayed as an output of the datasource +- `max_machinepool_wait_timeout_in_minutes` (Number) This attribute is not supported for cluster data source. Therefore, it will not be displayed as an output of the datasource - `name` (String) Name of the cluster. Cannot exceed 54 characters in length. After the creation of the resource, it is not possible to update the attribute value. - `ocm_properties` (Map of String) Merged properties defined by OCM and the user defined 'properties'. - `pod_cidr` (String) Block of IP addresses for pods. After the creation of the resource, it is not possible to update the attribute value. diff --git a/provider/clusterrosa/classic/cluster_rosa_classic_datasource.go b/provider/clusterrosa/classic/cluster_rosa_classic_datasource.go index ca4a5c7e..e751fd8f 100644 --- a/provider/clusterrosa/classic/cluster_rosa_classic_datasource.go +++ b/provider/clusterrosa/classic/cluster_rosa_classic_datasource.go @@ -320,6 +320,10 @@ func (r *ClusterRosaClassicDatasource) Schema(ctx context.Context, req datasourc ElementType: types.StringType, Computed: true, }, + "max_cluster_wait_timeout_in_minutes": schema.Int64Attribute{ + Description: deprecatedMessage, + Computed: true, + }, }, } } diff --git a/provider/clusterrosa/hcp/datasource.go b/provider/clusterrosa/hcp/datasource.go index f183f21e..ffd64eec 100644 --- a/provider/clusterrosa/hcp/datasource.go +++ b/provider/clusterrosa/hcp/datasource.go @@ -243,6 +243,14 @@ func (r *ClusterRosaHcpDatasource) Schema(ctx context.Context, req datasource.Sc Description: deprecatedMessage, Computed: true, }, + "max_hcp_cluster_wait_timeout_in_minutes": schema.Int64Attribute{ + Description: deprecatedMessage, + Computed: true, + }, + "max_machinepool_wait_timeout_in_minutes": schema.Int64Attribute{ + Description: deprecatedMessage, + Computed: true, + }, "create_admin_user": schema.BoolAttribute{ Description: deprecatedMessage, Computed: true,