Automatic Terraform Provider Sync (#398)

Automatic sync from Akuity Platform

Author: akuitybot

akp/data_source_akp_instance_schema.go

@@ -199,7 +199,8 @@ func getInstanceSpecDataSourceAttributes() map[string]schema.Attribute {
 			Attributes:          getAppSetDelegateDataSourceAttributes(),
 		},
 		"assistant_extension_enabled": schema.BoolAttribute{
-			MarkdownDescription: "Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.",
+			MarkdownDescription: "Deprecated: upcoming removal. Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.",
+			DeprecationMessage:  "assistant_extension_enabled field will be removed in a future release; remove it from configs.",
 			Computed:            true,
 		},
 		"appset_policy": schema.SingleNestedAttribute{

akp/provider.go

@@ -5,21 +5,21 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/akuity/api-client-go/pkg/api/gateway/accesscontrol"
-	gwoption "github.com/akuity/api-client-go/pkg/api/gateway/option"
-	argocdv1 "github.com/akuity/api-client-go/pkg/api/gen/argocd/v1"
-	kargov1 "github.com/akuity/api-client-go/pkg/api/gen/kargo/v1"
-	orgcv1 "github.com/akuity/api-client-go/pkg/api/gen/organization/v1"
-	idv1 "github.com/akuity/api-client-go/pkg/api/gen/types/id/v1"
-	httpctx "github.com/akuity/grpc-gateway-client/pkg/http/context"
-
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/provider"
 	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
+
+	"github.com/akuity/api-client-go/pkg/api/gateway/accesscontrol"
+	gwoption "github.com/akuity/api-client-go/pkg/api/gateway/option"
+	argocdv1 "github.com/akuity/api-client-go/pkg/api/gen/argocd/v1"
+	kargov1 "github.com/akuity/api-client-go/pkg/api/gen/kargo/v1"
+	orgcv1 "github.com/akuity/api-client-go/pkg/api/gen/organization/v1"
+	idv1 "github.com/akuity/api-client-go/pkg/api/gen/types/id/v1"
+	httpctx "github.com/akuity/grpc-gateway-client/pkg/http/context"
 )
 
 var _ provider.Provider = &AkpProvider{}

akp/resource_akp_cluster.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	tftypes "github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/pkg/errors"
 	"golang.org/x/exp/slices"
@@ -618,25 +619,37 @@ func (v sizeConfigValidator) MarkdownDescription(ctx context.Context) string {
 }
 
 func (v sizeConfigValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
-	// Get the full resource configuration
-	var config types.Cluster
+	dataPath := path.Root("spec").AtName("data")
 
-	resp.Diagnostics.Append(req.Config.Get(ctx, &config)...)
-	if resp.Diagnostics.HasError() {
+	var data tftypes.Object
+	resp.Diagnostics.Append(req.Config.GetAttribute(ctx, dataPath, &data)...)
+	if resp.Diagnostics.HasError() || data.IsNull() || data.IsUnknown() {
+		return
+	}
+
+	var size tftypes.String
+	resp.Diagnostics.Append(req.Config.GetAttribute(ctx, dataPath.AtName("size"), &size)...)
+	if resp.Diagnostics.HasError() || size.IsNull() || size.IsUnknown() {
 		return
 	}
+	sizeValue := size.ValueString()
 
-	// Check if spec is nil
-	if config.Spec == nil {
+	var autoConfig tftypes.Object
+	resp.Diagnostics.Append(req.Config.GetAttribute(ctx, dataPath.AtName("auto_agent_size_config"), &autoConfig)...)
+	if resp.Diagnostics.HasError() || autoConfig.IsUnknown() {
 		return
 	}
+	hasAutoConfig := !autoConfig.IsNull()
 
-	data := &config.Spec.Data
-	size := data.Size.ValueString()
-	hasAutoConfig := !data.AutoscalerConfig.IsNull()
-	hasCustomConfig := data.CustomAgentSizeConfig != nil
+	customConfigPath := dataPath.AtName("custom_agent_size_config")
+	var customConfig tftypes.Object
+	resp.Diagnostics.Append(req.Config.GetAttribute(ctx, customConfigPath, &customConfig)...)
+	if resp.Diagnostics.HasError() || customConfig.IsUnknown() {
+		return
+	}
+	hasCustomConfig := !customConfig.IsNull()
 
-	switch size {
+	switch sizeValue {
 	case "auto":
 		// auto_agent_size_config is optional when size is "auto" - API provides defaults if not specified
 		if hasCustomConfig {
@@ -666,14 +679,14 @@ func (v sizeConfigValidator) ValidateResource(ctx context.Context, req resource.
 			resp.Diagnostics.AddAttributeError(
 				path.Root("spec").AtName("data").AtName("auto_agent_size_config"),
 				"Invalid auto_agent_size_config",
-				fmt.Sprintf("auto_agent_size_config cannot be used when size is '%s'", size),
+				fmt.Sprintf("auto_agent_size_config cannot be used when size is '%s'", sizeValue),
 			)
 		}
 		if hasCustomConfig {
 			resp.Diagnostics.AddAttributeError(
 				path.Root("spec").AtName("data").AtName("custom_agent_size_config"),
 				"Invalid custom_agent_size_config",
-				fmt.Sprintf("custom_agent_size_config cannot be used when size is '%s'", size),
+				fmt.Sprintf("custom_agent_size_config cannot be used when size is '%s'", sizeValue),
 			)
 		}
 	default:

akp/resource_akp_cluster_test.go

@@ -1510,6 +1510,93 @@ resource "akp_cluster" "test_validation" {
 	})
 }
 
+func testAccClusterResourceConfigMergeData(name, instanceId string) string {
+	return fmt.Sprintf(`
+variable "config" {
+  type    = map(any)
+  default = {}
+}
+
+resource "akp_cluster" "test" {
+  instance_id = %q
+  name        = %q
+  namespace   = "test"
+
+  labels = merge({
+    "condor.io/cluster-name" = %q
+    },
+    {
+      environment = "test"
+      managed-by  = "terraform"
+    }
+  )
+
+  annotations = merge({
+    "argocd.argoproj.io/instance" = %q
+    },
+    {
+      team  = "platform"
+      owner = "devops"
+    }
+  )
+
+  spec = {
+    namespace_scoped = false
+    description      = "Managed by Terraform, do not edit!"
+    data = merge({
+      kustomization = <<EOF
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+  - patch: |-
+      apiVersion: apps/v1
+      kind: Deployment
+      metadata:
+        name: argocd-repo-server
+      spec:
+        template:
+          spec:
+            containers:
+            - name: argocd-repo-server
+              resources:
+                limits:
+                  memory: 2Gi
+                requests:
+                  cpu: 500m
+                  memory: 1Gi
+    target:
+      kind: Deployment
+      name: argocd-repo-server
+EOF
+    }, {
+      size                  = "small"
+      auto_upgrade_disabled = true
+    }, var.config)
+  }
+}
+`, instanceId, name, name, "test-instance")
+}
+
+func TestAccClusterResourceMergeData(t *testing.T) {
+	name := acctest.RandomWithPrefix("test-merge-data")
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: providerConfig + testAccClusterResourceConfigMergeData(name, getInstanceId()),
+			},
+			{
+				Config: providerConfig + testAccClusterResourceConfigMergeData(name, getInstanceId()),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("akp_cluster.test", "spec.data.size", "small"),
+					resource.TestCheckResourceAttr("akp_cluster.test", "spec.data.auto_upgrade_disabled", "true"),
+				),
+			},
+		},
+	})
+}
+
 // TestAccCluster_CustomAgentSizeInconsistency tests for custom agent size configuration inconsistencies
 // This test provokes issues in the complex custom agent size logic in types.go lines 226-241
 func TestAccCluster_CustomAgentSizeInconsistency(t *testing.T) {

akp/resource_akp_instance_schema.go

@@ -299,9 +299,10 @@ func getInstanceSpecAttributes() map[string]schema.Attribute {
 			Attributes:          getAppSetDelegateAttributes(),
 		},
 		"assistant_extension_enabled": schema.BoolAttribute{
-			MarkdownDescription: "Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.",
+			MarkdownDescription: "Deprecated: upcoming removal. Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.",
 			Optional:            true,
 			Computed:            true,
+			DeprecationMessage:  "assistant_extension_enabled field will be removed in a future release; remove it from configs.",
 			PlanModifiers: []planmodifier.Bool{
 				boolplanmodifier.UseStateForUnknown(),
 			},

akp/types/cluster.go

@@ -40,6 +40,11 @@ type Resources struct {
 	Cpu    types.String `tfsdk:"cpu"`
 }
 
+type DirectClusterSpec struct {
+	ClusterType     types.String `tfsdk:"cluster_type"`
+	KargoInstanceId types.String `tfsdk:"kargo_instance_id"`
+}
+
 type ManagedClusterConfig struct {
 	SecretName types.String `tfsdk:"secret_name"`
 	SecretKey  types.String `tfsdk:"secret_key"`
@@ -86,20 +91,15 @@ type ClusterArgoCDNotificationsSettings struct {
 	InClusterSettings types.Bool `tfsdk:"in_cluster_settings"`
 }
 
-type DirectClusterSpec struct {
-	ClusterType     types.String `tfsdk:"cluster_type"`
-	KargoInstanceId types.String `tfsdk:"kargo_instance_id"`
-}
-
 type ClusterData struct {
 	Size                            types.String                        `tfsdk:"size"`
 	AutoUpgradeDisabled             types.Bool                          `tfsdk:"auto_upgrade_disabled"`
 	Kustomization                   types.String                        `tfsdk:"kustomization"`
 	AppReplication                  types.Bool                          `tfsdk:"app_replication"`
 	TargetVersion                   types.String                        `tfsdk:"target_version"`
 	RedisTunneling                  types.Bool                          `tfsdk:"redis_tunneling"`
-	DatadogAnnotationsEnabled       types.Bool                          `tfsdk:"datadog_annotations_enabled"`
 	DirectClusterSpec               *DirectClusterSpec                  `tfsdk:"direct_cluster_spec"`
+	DatadogAnnotationsEnabled       types.Bool                          `tfsdk:"datadog_annotations_enabled"`
 	EksAddonEnabled                 types.Bool                          `tfsdk:"eks_addon_enabled"`
 	ManagedClusterConfig            *ManagedClusterConfig               `tfsdk:"managed_cluster_config"`
 	MultiClusterK8SDashboardEnabled types.Bool                          `tfsdk:"multi_cluster_k8s_dashboard_enabled"`

docs/data-sources/instance.md

@@ -72,7 +72,7 @@ Read-Only:
 - `app_set_delegate` (Attributes) Select cluster in which you want to Install Application Set controller (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--app_set_delegate))
 - `appset_plugins` (Attributes List) Application Set plugins (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--appset_plugins))
 - `appset_policy` (Attributes) Configures Application Set policy settings. (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--appset_policy))
-- `assistant_extension_enabled` (Boolean) Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.
+- `assistant_extension_enabled` (Boolean, Deprecated) Deprecated: upcoming removal. Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.
 - `audit_extension_enabled` (Boolean) Enable Audit Extension. Set this to `true` to install Audit Extension to Argo CD instance.
 - `backend_ip_allow_list_enabled` (Boolean) Enable ip allow list for cluster agents
 - `cluster_customization_defaults` (Attributes) Default values for cluster agents (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--cluster_customization_defaults))

docs/resources/instance.md

@@ -616,7 +616,7 @@ Optional:
 - `app_set_delegate` (Attributes) Select cluster in which you want to Install Application Set controller (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--app_set_delegate))
 - `appset_plugins` (Attributes List) Application Set plugins (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--appset_plugins))
 - `appset_policy` (Attributes) Configures Application Set policy settings. (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--appset_policy))
-- `assistant_extension_enabled` (Boolean) Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.
+- `assistant_extension_enabled` (Boolean, Deprecated) Deprecated: upcoming removal. Enable Powerful AI-powered assistant Extension. It helps analyze Kubernetes resources behavior and provides suggestions about resolving issues.
 - `audit_extension_enabled` (Boolean) Enable Audit Extension. Set this to `true` to install Audit Extension to Argo CD instance.
 - `backend_ip_allow_list_enabled` (Boolean) Enable ip allow list for cluster agents
 - `cluster_customization_defaults` (Attributes) Default values for cluster agents (see [below for nested schema](#nestedatt--argocd--spec--instance_spec--cluster_customization_defaults))