feat: add project field support to cluster data (#317)

hanxiaop · web-flow · commit 923453ee50e4 · 2025-03-24T16:55:26.000+08:00
diff --git a/akp/apis/v1alpha1/cluster.go b/akp/apis/v1alpha1/cluster.go
@@ -66,4 +66,5 @@ type ClusterData struct {
 
 	MultiClusterK8SDashboardEnabled *bool             `json:"multiClusterK8sDashboardEnabled,omitempty"`
 	AutoscalerConfig                *AutoScalerConfig `json:"autoscalerConfig,omitempty"`
+	Project                         string            `json:"project,omitempty"`
 }
diff --git a/akp/data_source_akp_cluster_schema.go b/akp/data_source_akp_cluster_schema.go
@@ -131,6 +131,10 @@ func getClusterDataDataSourceAttributes() map[string]schema.Attribute {
 			Computed:            true,
 			Attributes:          getCustomAgentSizeConfigDataSourceAttributes(),
 		},
+		"project": schema.StringAttribute{
+			MarkdownDescription: "Project name",
+			Computed:            true,
+		},
 	}
 }
 
diff --git a/akp/resource_akp_cluster_schema.go b/akp/resource_akp_cluster_schema.go
@@ -231,6 +231,14 @@ func getClusterDataAttributes() map[string]schema.Attribute {
 			Optional:            true,
 			Attributes:          getCustomAgentSizeConfigAttributes(),
 		},
+		"project": schema.StringAttribute{
+			MarkdownDescription: "Project name",
+			Optional:            true,
+			Computed:            true,
+			PlanModifiers: []planmodifier.String{
+				stringplanmodifier.UseStateForUnknown(),
+			},
+		},
 	}
 }
 
diff --git a/akp/types/cluster.go b/akp/types/cluster.go
@@ -88,6 +88,7 @@ type ClusterData struct {
 	EksAddonEnabled                 types.Bool             `tfsdk:"eks_addon_enabled"`
 	ManagedClusterConfig            *ManagedClusterConfig  `tfsdk:"managed_cluster_config"`
 	MultiClusterK8SDashboardEnabled types.Bool             `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
-	AutoscalerConfig                basetypes.ObjectValue  `tfsdk:"auto_agent_size_config"`
 	CustomAgentSizeConfig           *CustomAgentSizeConfig `tfsdk:"custom_agent_size_config"`
+	AutoscalerConfig                basetypes.ObjectValue  `tfsdk:"auto_agent_size_config"`
+	Project                         types.String           `tfsdk:"project"`
 }
diff --git a/akp/types/types.go b/akp/types/types.go
@@ -286,6 +286,7 @@ func (c *Cluster) Update(ctx context.Context, diagnostics *diag.Diagnostics, api
 			MultiClusterK8SDashboardEnabled: tftypes.BoolValue(apiCluster.GetData().GetMultiClusterK8SDashboardEnabled()),
 			AutoscalerConfig:                autoscalerConfig,
 			CustomAgentSizeConfig:           customConfig,
+			Project:                         tftypes.StringValue(apiCluster.GetData().GetProject()),
 		},
 	}
 }
@@ -476,6 +477,7 @@ func toClusterDataAPIModel(ctx context.Context, diagnostics *diag.Diagnostics, c
 		ManagedClusterConfig:            managedConfig,
 		MultiClusterK8SDashboardEnabled: toBoolPointer(clusterData.MultiClusterK8SDashboardEnabled),
 		AutoscalerConfig:                autoscalerConfigAPI,
+		Project:                         clusterData.Project.ValueString(),
 	}
 }
 
diff --git a/docs/data-sources/cluster.md b/docs/data-sources/cluster.md
@@ -85,6 +85,7 @@ Read-Only:
 - `kustomization` (String) Kustomize configuration that will be applied to generated agent installation manifests
 - `managed_cluster_config` (Attributes) The config to access managed Kubernetes cluster. By default agent is using "in-cluster" config. (see [below for nested schema](#nestedatt--spec--data--managed_cluster_config))
 - `multi_cluster_k8s_dashboard_enabled` (Boolean) Enable the KubeVision feature on the managed cluster
+- `project` (String) Project name
 - `redis_tunneling` (Boolean) Enables the ability to connect to Redis over a web-socket tunnel that allows using Akuity agent behind HTTPS proxy
 - `size` (String) Cluster Size. One of `small`, `medium`, `large`, `custom` or `auto`
 - `target_version` (String) The version of the agent to install on your cluster
diff --git a/docs/data-sources/clusters.md b/docs/data-sources/clusters.md
@@ -96,6 +96,7 @@ Read-Only:
 - `kustomization` (String) Kustomize configuration that will be applied to generated agent installation manifests
 - `managed_cluster_config` (Attributes) The config to access managed Kubernetes cluster. By default agent is using "in-cluster" config. (see [below for nested schema](#nestedatt--clusters--spec--data--managed_cluster_config))
 - `multi_cluster_k8s_dashboard_enabled` (Boolean) Enable the KubeVision feature on the managed cluster
+- `project` (String) Project name
 - `redis_tunneling` (Boolean) Enables the ability to connect to Redis over a web-socket tunnel that allows using Akuity agent behind HTTPS proxy
 - `size` (String) Cluster Size. One of `small`, `medium`, `large`, `custom` or `auto`
 - `target_version` (String) The version of the agent to install on your cluster
diff --git a/docs/resources/cluster.md b/docs/resources/cluster.md
@@ -253,6 +253,7 @@ Optional:
 - `kustomization` (String) Kustomize configuration that will be applied to generated agent installation manifests
 - `managed_cluster_config` (Attributes) The config to access managed Kubernetes cluster. By default agent is using "in-cluster" config. (see [below for nested schema](#nestedatt--spec--data--managed_cluster_config))
 - `multi_cluster_k8s_dashboard_enabled` (Boolean) Enable the KubeVision feature on the managed cluster
+- `project` (String) Project name
 - `redis_tunneling` (Boolean) Enables the ability to connect to Redis over a web-socket tunnel that allows using Akuity agent behind HTTPS proxy
 - `target_version` (String) The version of the agent to install on your cluster
 
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.23.0
 toolchain go1.23.1
 
 require (
-	github.com/akuity/api-client-go v0.20.1
+	github.com/akuity/api-client-go v0.21.3
 	github.com/akuity/grpc-gateway-client v0.0.0-20240912082144-55a48e8b4b89
 	github.com/hashicorp/terraform-plugin-docs v0.20.1
 	github.com/hashicorp/terraform-plugin-framework v1.14.1
diff --git a/go.sum b/go.sum
@@ -22,8 +22,8 @@ github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/akuity/api-client-go v0.20.1 h1:OhATFkxJtCeN86vb+L1oaA9JNJBLPZbkr75DJjk8pOE=
-github.com/akuity/api-client-go v0.20.1/go.mod h1:l1KysY8NXHVy2yN3+vEyygqKIqVEWvA78dTw0lShCUE=
+github.com/akuity/api-client-go v0.21.3 h1:vuWRmRiF0CMLdgK/EWRK84XgOCV1pCSaA+N0a/PnOIU=
+github.com/akuity/api-client-go v0.21.3/go.mod h1:l1KysY8NXHVy2yN3+vEyygqKIqVEWvA78dTw0lShCUE=
 github.com/akuity/grpc-gateway-client v0.0.0-20240912082144-55a48e8b4b89 h1:TNZN2oYHs6ymIMyDeVu6RnwNowChc/q4U/p7ruHA/GM=
 github.com/akuity/grpc-gateway-client v0.0.0-20240912082144-55a48e8b4b89/go.mod h1:0MZqOxL+zq+hGedAjYhkm1tOKuZyjUmE/xA8nqXa9q0=
 github.com/alevinval/sse v1.0.1 h1:cFubh2lMNdHT6niFLCsyTuhAgljaAWbdmceAe6qPIfo=

Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,5 @@ type ClusterData struct {`
`66`	`66`
`67`	`67`	MultiClusterK8SDashboardEnabled *bool `json:"multiClusterK8sDashboardEnabled,omitempty"`
`68`	`68`	AutoscalerConfig *AutoScalerConfig `json:"autoscalerConfig,omitempty"`
	`69`	+ Project string `json:"project,omitempty"`
`69`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,10 @@ func getClusterDataDataSourceAttributes() map[string]schema.Attribute {`
`131`	`131`	`Computed: true,`
`132`	`132`	`Attributes: getCustomAgentSizeConfigDataSourceAttributes(),`
`133`	`133`	`},`
	`134`	`+ "project": schema.StringAttribute{`
	`135`	`+ MarkdownDescription: "Project name",`
	`136`	`+ Computed: true,`
	`137`	`+ },`
`134`	`138`	`}`
`135`	`139`	`}`
`136`	`140`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,14 @@ func getClusterDataAttributes() map[string]schema.Attribute {`
`231`	`231`	`Optional: true,`
`232`	`232`	`Attributes: getCustomAgentSizeConfigAttributes(),`
`233`	`233`	`},`
	`234`	`+ "project": schema.StringAttribute{`
	`235`	`+ MarkdownDescription: "Project name",`
	`236`	`+ Optional: true,`
	`237`	`+ Computed: true,`
	`238`	`+ PlanModifiers: []planmodifier.String{`
	`239`	`+ stringplanmodifier.UseStateForUnknown(),`
	`240`	`+ },`
	`241`	`+ },`
`234`	`242`	`}`
`235`	`243`	`}`
`236`	`244`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ type ClusterData struct {`
`88`	`88`	EksAddonEnabled types.Bool `tfsdk:"eks_addon_enabled"`
`89`	`89`	ManagedClusterConfig *ManagedClusterConfig `tfsdk:"managed_cluster_config"`
`90`	`90`	MultiClusterK8SDashboardEnabled types.Bool `tfsdk:"multi_cluster_k8s_dashboard_enabled"`
`91`		- AutoscalerConfig basetypes.ObjectValue `tfsdk:"auto_agent_size_config"`
`92`	`91`	CustomAgentSizeConfig *CustomAgentSizeConfig `tfsdk:"custom_agent_size_config"`
	`92`	+ AutoscalerConfig basetypes.ObjectValue `tfsdk:"auto_agent_size_config"`
	`93`	+ Project types.String `tfsdk:"project"`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,7 @@ func (c Cluster) Update(ctx context.Context, diagnostics diag.Diagnostics, api`
`286`	`286`	`MultiClusterK8SDashboardEnabled: tftypes.BoolValue(apiCluster.GetData().GetMultiClusterK8SDashboardEnabled()),`
`287`	`287`	`AutoscalerConfig: autoscalerConfig,`
`288`	`288`	`CustomAgentSizeConfig: customConfig,`
	`289`	`+ Project: tftypes.StringValue(apiCluster.GetData().GetProject()),`
`289`	`290`	`},`
`290`	`291`	`}`
`291`	`292`	`}`
`@@ -476,6 +477,7 @@ func toClusterDataAPIModel(ctx context.Context, diagnostics *diag.Diagnostics, c`
`476`	`477`	`ManagedClusterConfig: managedConfig,`
`477`	`478`	`MultiClusterK8SDashboardEnabled: toBoolPointer(clusterData.MultiClusterK8SDashboardEnabled),`
`478`	`479`	`AutoscalerConfig: autoscalerConfigAPI,`
	`480`	`+ Project: clusterData.Project.ValueString(),`
`479`	`481`	`}`
`480`	`482`	`}`
`481`	`483`