fixup! OMNI-496: update RegisterCluster API model

Author: fra98

castai/resource_omni_cluster.go

@@ -24,9 +24,13 @@ type omniClusterResource struct {
 }
 
 type omniClusterModel struct {
-	ID               types.String `tfsdk:"id"`
-	OrganizationID   types.String `tfsdk:"organization_id"`
-	ClusterID        types.String `tfsdk:"cluster_id"`
+	ID             types.String            `tfsdk:"id"`
+	OrganizationID types.String            `tfsdk:"organization_id"`
+	ClusterID      types.String            `tfsdk:"cluster_id"`
+	Status         *omniClusterStatusModel `tfsdk:"status"`
+}
+
+type omniClusterStatusModel struct {
 	OmniAgentVersion types.String `tfsdk:"omni_agent_version"`
 	PodCIDR          types.String `tfsdk:"pod_cidr"`
 }
@@ -64,18 +68,24 @@ func (r *omniClusterResource) Schema(_ context.Context, _ resource.SchemaRequest
 					stringplanmodifier.RequiresReplace(),
 				},
 			},
-			"omni_agent_version": schema.StringAttribute{
+			"status": schema.SingleNestedAttribute{
 				Optional:    true,
-				Description: "Version of the omni agent running on the cluster",
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.RequiresReplace(),
-				},
-			},
-			"pod_cidr": schema.StringAttribute{
-				Optional:    true,
-				Description: "Pod CIDR of the cluster",
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.RequiresReplace(),
+				Description: "Current status of the cluster to report on registration.",
+				Attributes: map[string]schema.Attribute{
+					"omni_agent_version": schema.StringAttribute{
+						Required:    true,
+						Description: "Version of the omni agent running on the cluster.",
+						PlanModifiers: []planmodifier.String{
+							stringplanmodifier.RequiresReplace(),
+						},
+					},
+					"pod_cidr": schema.StringAttribute{
+						Required:    true,
+						Description: "Pod CIDR of the cluster.",
+						PlanModifiers: []planmodifier.String{
+							stringplanmodifier.RequiresReplace(),
+						},
+					},
 				},
 			},
 		},
@@ -107,23 +117,11 @@ func (r *omniClusterResource) Create(ctx context.Context, req resource.CreateReq
 		return
 	}
 
-	agentVersion := plan.OmniAgentVersion.ValueString()
-	podCIDR := plan.PodCIDR.ValueString()
-
-	// Both fields must be set or both must be empty
-	if (agentVersion == "") != (podCIDR == "") {
-		resp.Diagnostics.AddError(
-			"Invalid configuration",
-			"all cluster status fields (omni_agent_version and pod_cidr) must be set",
-		)
-		return
-	}
-
 	body := omni.RegisteredCluster{}
-	if agentVersion != "" {
+	if plan.Status != nil {
 		body.Status = &omni.RegisteredClusterStatus{
-			OmniAgentVersion: agentVersion,
-			PodCidr:          podCIDR,
+			OmniAgentVersion: plan.Status.OmniAgentVersion.ValueString(),
+			PodCidr:          plan.Status.PodCIDR.ValueString(),
 		}
 	}