Add cloudspace, spotnodepool data sources along with allocation and bid status attributes (#7)

* Add bidstatus, allocation info and other computed attributes
* Add cloudspace, spotnodepool data source
* The data sources now accepts name as id
* Rename `rxtspot_token` to `token` in provider config
* Dedupe code for transformation

Author: TheNilesh

Diff for: docs/data-sources/cloudspace.md

@@ -28,16 +28,44 @@ output "csphase" {
 
 ### Required
 
-- `id` (String) ID of the cloudspace
+- `id` (String) ID of the cloudspace, same as cloudspace name.
+
+### Optional
+
+- `preemption_webhook` (String) Webhook URL for preemption notifications.
 
 ### Read-Only
 
 - `api_server_endpoint` (String) Kubernetes api server URL
+- `bids` (Attributes Set) (see [below for nested schema](#nestedatt--bids))
+- `cloudspace_name` (String) Name of the cloudspace
+- `first_ready_timestamp` (String) The time when the cloudspace was first ready.
+- `hacontrol_plane` (Boolean) High Availability Kubernetes (replicated control plane for redundancy). This is a critical feature for production workloads.
 - `health` (String) Health indicates if CloudSpace has a working APIServer and available nodes
 - `kubeconfig` (String, Deprecated) Kubeconfig blob
-- `name` (String) Name of the cloudspace
+- `name` (String, Deprecated) Name of the cloudspace
+- `pending_allocations` (Attributes Set) (see [below for nested schema](#nestedatt--pending_allocations))
 - `phase` (String) Phase of the cloudspace
 - `reason` (String) Reason contains the reason why the CloudSpace is in a certain phase.
 - `region` (String) The region where the cloudspace resides.
+- `spotnodepool_ids` (List of String) IDs of the spotnodepools associated with the cloudspace.
 - `token` (String) Token to use for authentication to kubernetes api server
 - `user` (String) Name of the user to use for authentication to kubernetes api server
+
+<a id="nestedatt--bids"></a>
+### Nested Schema for `bids`
+
+Read-Only:
+
+- `bid_name` (String)
+- `won_count` (Number)
+
+
+<a id="nestedatt--pending_allocations"></a>
+### Nested Schema for `pending_allocations`
+
+Read-Only:
+
+- `bid_name` (String)
+- `count` (Number)
+- `server_class` (String)

Diff for: docs/data-sources/kubeconfig.md

@@ -70,7 +70,7 @@ resource "local_file" "kubeconfig" {
 
 ### Required
 
-- `id` (String) ID of the cloudspace
+- `id` (String) ID of the cloudspace, same as cloudspace name.
 
 ### Read-Only
 

Diff for: docs/data-sources/spotnodepool.md

@@ -0,0 +1,38 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "spot_spotnodepool Data Source - terraform-provider-spot"
+subcategory: ""
+description: |-
+  
+---
+
+# spot_spotnodepool (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `id` (String) ID of the spotnodepool
+
+### Read-Only
+
+- `autoscaling` (Attributes) (see [below for nested schema](#nestedatt--autoscaling))
+- `bid_price` (Number) The bid price for the server in USD
+- `bid_status` (String) Status of the bid associated with this spotnodepool.
+- `cloudspace_name` (String) The name of the cloudspace
+- `desired_server_count` (Number) The desired number of servers in the node pool.
+- `server_class` (String) The class of servers to use for the node pool.
+- `won_count` (Number) Number of won bids.
+
+<a id="nestedatt--autoscaling"></a>
+### Nested Schema for `autoscaling`
+
+Read-Only:
+
+- `max_nodes` (Number) The maximum number of nodes in the node pool.
+- `min_nodes` (Number) The minimum number of nodes in the node pool.

Diff for: docs/index.md

@@ -41,7 +41,7 @@ terraform {
 
 provider "spot" {
   # overrides environment variables
-  rxtspot_token = "<token>"
+  token = "<rxtspot_token>"
 }
 ```
 
@@ -50,7 +50,7 @@ provider "spot" {
 
 ### Optional
 
-- `rxtspot_token` (String, Sensitive) API token used to authenticate against Spot backend
+- `token` (String, Sensitive) API token used to authenticate against Spot backend
 
 ## Create Your First Cloudspace
 

Diff for: docs/resources/cloudspace.md

@@ -37,9 +37,31 @@ resource "spot_cloudspace" "example" {
 
 ### Read-Only
 
-- `id` (String) The id of the cloudspace.
+- `bids` (Attributes Set) (see [below for nested schema](#nestedatt--bids))
+- `first_ready_timestamp` (String) The time when the cloudspace was first ready.
+- `id` (String) The id of the cloudspace
 - `last_updated` (String) The last time the cloudspace was updated.
+- `pending_allocations` (Attributes Set) (see [below for nested schema](#nestedatt--pending_allocations))
 - `resource_version` (String) The version of the resource known to local state. This is used to determine if the resource is modified outside of terraform.
+- `spotnodepool_ids` (List of String) IDs of the spotnodepools associated with the cloudspace.
+
+<a id="nestedatt--bids"></a>
+### Nested Schema for `bids`
+
+Read-Only:
+
+- `bid_name` (String)
+- `won_count` (Number)
+
+
+<a id="nestedatt--pending_allocations"></a>
+### Nested Schema for `pending_allocations`
+
+Read-Only:
+
+- `bid_name` (String)
+- `count` (Number)
+- `server_class` (String)
 
 ### Available Regions
 

Diff for: docs/resources/spotnodepool.md

@@ -41,9 +41,11 @@ resource "spot_spotnodepool" "example" {
 
 ### Read-Only
 
-- `id` (String) The id of the cloudspace.
+- `bid_status` (String) Status of the bid associated with this spotnodepool.
+- `id` (String) The id of the spotnodepool.
 - `last_updated` (String) The last time the spotnodepool was updated.
 - `resource_version` (String) The version of the resource known to local state. This is used to determine if the resource is modified outside of terraform.
+- `won_count` (Number) Number of won bids.
 
 <a id="nestedatt--autoscaling"></a>
 ### Nested Schema for `autoscaling`
@@ -91,5 +93,6 @@ Import is supported using the following syntax:
 
 ```shell
 # A spotnodepool can be imported by specifying its id.
+# An id of the spotnodepool is available in the cloudspace resource attributes, spotnodepool_ids, bids and pending_allocations.
 terraform import spot_spotnodepool.example c126b90d-00d1-48fb-92ae-b8c88e27f511
 ```

Diff for: examples/provider/provider.tf

@@ -8,5 +8,5 @@ terraform {
 
 provider "spot" {
   # overrides environment variables
-  rxtspot_token = "<token>"
+  token = "<rxtspot_token>"
 }

Diff for: examples/resources/spot_spotnodepool/import.sh

@@ -1,2 +1,3 @@
 # A spotnodepool can be imported by specifying its id.
+# An id of the spotnodepool is available in the cloudspace resource attributes, spotnodepool_ids, bids and pending_allocations.
 terraform import spot_spotnodepool.example c126b90d-00d1-48fb-92ae-b8c88e27f511

Diff for: internal/provider/cloudspace_data_source.go

@@ -4,10 +4,13 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
+	"time"
 
 	ngpcv1 "github.com/RSS-Engineering/ngpc-cp/api/v1"
 	"github.com/RSS-Engineering/ngpc-cp/pkg/ngpc"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/rackerlabs/terraform-provider-spot/internal/provider/datasource_cloudspace"
@@ -62,13 +65,26 @@ func (d *cloudspaceDataSource) Read(ctx context.Context, req datasource.ReadRequ
 	}
 
 	// Read API call logic
-	tflog.Debug(ctx, "Computing name, namespace using resource id", map[string]any{"id": data.Id.ValueString()})
-	name, namespace, err := getNameAndNamespaceFromId(data.Id.ValueString())
-	if err != nil {
-		resp.Diagnostics.AddError("Failed to get name and namespace from id", err.Error())
-		return
+	var err error
+	var id, name, namespace string
+	id = data.Id.ValueString()
+	if strings.Contains(id, "/") {
+		tflog.Debug(ctx, "Computing name, namespace using id", map[string]any{"id": id})
+		name, namespace, err = getNameAndNamespaceFromId(id)
+		if err != nil {
+			resp.Diagnostics.AddError("Failed to get name and namespace from id", err.Error())
+			return
+		}
+	} else {
+		// In newer approach we dont include org ns in the id because users are not aware of org ns
+		name = id
+		namespace = os.Getenv("RXTSPOT_ORG_NS")
+		if namespace == "" {
+			resp.Diagnostics.AddError("Failed to get org namespace", "RXTSPOT_ORG_NS is not set")
+			return
+		}
+		tflog.Debug(ctx, "Using namespace from environment", map[string]any{"namespace": namespace})
 	}
-	tflog.Debug(ctx, "Name, namespace using resource id", map[string]any{"name": name, "namespace": namespace})
 	cloudspace := &ngpcv1.CloudSpace{}
 	err = d.client.Get(ctx, ktypes.NamespacedName{
 		Name:      name,
@@ -81,11 +97,80 @@ func (d *cloudspaceDataSource) Read(ctx context.Context, req datasource.ReadRequ
 
 	data.Id = types.StringValue(getIDFromObjectMeta(cloudspace.ObjectMeta))
 	data.Region = types.StringValue(cloudspace.Spec.Region)
+	data.CloudspaceName = types.StringValue(cloudspace.ObjectMeta.Name)
 	data.Name = types.StringValue(cloudspace.ObjectMeta.Name)
 	data.ApiServerEndpoint = types.StringValue(cloudspace.Status.APIServerEndpoint)
 	data.Health = types.StringValue(cloudspace.Status.Health)
 	data.Phase = types.StringValue(string(cloudspace.Status.Phase))
 	data.Reason = types.StringValue(cloudspace.Status.Reason)
+	data.HacontrolPlane = types.BoolValue(cloudspace.Spec.HAControlPlane)
+	data.FirstReadyTimestamp = types.StringValue(cloudspace.Status.FirstReadyTimestamp.Format(time.RFC3339))
+	if cloudspace.Spec.Webhook != "" {
+		// even if we dont set string value it becomes "" by default
+		// assume it as Null if it is not set
+		data.PreemptionWebhook = types.StringValue(cloudspace.Spec.Webhook)
+	} else {
+		data.PreemptionWebhook = types.StringNull()
+	}
+	var diags diag.Diagnostics
+	data.SpotnodepoolIds, diags = types.ListValueFrom(ctx, types.StringType, cloudspace.Spec.BidRequests)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	var bidsSlice []datasource_cloudspace.BidsValue
+	for _, val := range cloudspace.Status.Bids {
+		var wonCount types.Int64
+		if val.WonCount != nil {
+			wonCount = types.Int64Value(int64(*val.WonCount))
+		} else {
+			wonCount = types.Int64Null()
+		}
+		bidObjVal, convertDiags := datasource_cloudspace.BidsValue{
+			BidName:  types.StringValue(val.BidName),
+			WonCount: wonCount,
+		}.ToObjectValue(ctx)
+		resp.Diagnostics.Append(convertDiags...)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+		bidObjValuable, convertDiags := datasource_cloudspace.BidsType{}.ValueFromObject(ctx, bidObjVal)
+		resp.Diagnostics.Append(convertDiags...)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+		bidsSlice = append(bidsSlice, bidObjValuable.(datasource_cloudspace.BidsValue))
+	}
+	data.Bids, diags = types.SetValueFrom(ctx, datasource_cloudspace.BidsValue{}.Type(ctx), bidsSlice)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+	var allocationsSlice []datasource_cloudspace.PendingAllocationsValue
+	for _, val := range cloudspace.Status.PendingAllocations {
+		allocObjVal, convertDiags := datasource_cloudspace.PendingAllocationsValue{
+			BidName:     types.StringValue(val.BidName),
+			ServerClass: types.StringValue(val.ServerClassName),
+			Count:       types.Int64Value(int64(val.Count)),
+		}.ToObjectValue(ctx)
+		resp.Diagnostics.Append(convertDiags...)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+		allocObjValuable, convertDiags := datasource_cloudspace.PendingAllocationsType{}.ValueFromObject(ctx, allocObjVal)
+		resp.Diagnostics.Append(convertDiags...)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+		allocationsSlice = append(allocationsSlice, allocObjValuable.(datasource_cloudspace.PendingAllocationsValue))
+	}
+	data.PendingAllocations, diags = types.SetValueFrom(ctx,
+		datasource_cloudspace.PendingAllocationsValue{}.Type(ctx), allocationsSlice)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	token := os.Getenv("RXTSPOT_TOKEN")
 	if token == "" {