feat:support ca addon (#2327)

* feat:support ca addon

* feat:add base64 and json

* modify logic for json and base64 compatible

* update doc

Author: lyu571

.changelog/2327.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_addon_attachment: Support `raw_values` and `raw_values_type`.
+```

tencentcloud/resource_tc_kubernetes_addon_attachment.go

@@ -130,6 +130,7 @@ package tencentcloud
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 	"strings"
 
@@ -169,6 +170,21 @@ func resourceTencentCloudTkeAddonAttachment() *schema.Resource {
 				ConflictsWith: []string{"request_body"},
 				Elem:          &schema.Schema{Type: schema.TypeString},
 			},
+			"raw_values": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				Description:   "Raw Values. Conflict with `request_body`. Required with `raw_values_type`.",
+				ConflictsWith: []string{"request_body"},
+				RequiredWith:  []string{"raw_values_type"},
+			},
+			"raw_values_type": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				Description:  "The type of raw Values. Required with `raw_values`.",
+				RequiredWith: []string{"raw_values"},
+			},
 			"request_body": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -204,11 +220,13 @@ func resourceTencentCloudTkeAddonAttachmentCreate(d *schema.ResourceData, meta i
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	var (
-		clusterId = d.Get("cluster_id").(string)
-		addonName = d.Get("name").(string)
-		version   = d.Get("version").(string)
-		values    = d.Get("values").([]interface{})
-		reqBody   = d.Get("request_body").(string)
+		clusterId     = d.Get("cluster_id").(string)
+		addonName     = d.Get("name").(string)
+		version       = d.Get("version").(string)
+		values        = d.Get("values").([]interface{})
+		rawValues     *string
+		rawValuesType *string
+		reqBody       = d.Get("request_body").(string)
 	)
 
 	if version == "" {
@@ -227,9 +245,16 @@ func resourceTencentCloudTkeAddonAttachmentCreate(d *schema.ResourceData, meta i
 	}
 
 	if reqBody == "" {
+		if v, ok := d.GetOk("raw_values"); ok {
+			rawValues = helper.String(v.(string))
+		}
+		if v, ok := d.GetOk("raw_values_type"); ok {
+			rawValuesType = helper.String(v.(string))
+		}
+
 		var reqErr error
 		v := helper.InterfacesStringsPoint(values)
-		reqBody, reqErr = service.GetAddonReqBody(addonName, version, v)
+		reqBody, reqErr = service.GetAddonReqBody(addonName, version, v, rawValues, rawValuesType)
 		if reqErr != nil {
 			return reqErr
 		}
@@ -317,6 +342,17 @@ func resourceTencentCloudTkeAddonAttachmentRead(d *schema.ResourceData, meta int
 			filteredValues := getFilteredValues(d, spec.Values.Values)
 			_ = d.Set("values", filteredValues)
 		}
+
+		if spec.Values != nil && spec.Values.RawValues != nil {
+			rawValues := spec.Values.RawValues
+			rawValuesType := spec.Values.RawValuesType
+
+			base64DecodeValues, _ := base64.StdEncoding.DecodeString(*rawValues)
+			jsonValues := string(base64DecodeValues)
+
+			_ = d.Set("raw_values", jsonValues)
+			_ = d.Set("raw_values_type", rawValuesType)
+		}
 	}
 
 	if statuses != nil || len(statuses) == 0 {
@@ -339,18 +375,26 @@ func resourceTencentCloudTkeAddonAttachmentUpdate(d *schema.ResourceData, meta i
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 
 	var (
-		id        = d.Id()
-		split     = strings.Split(id, FILED_SP)
-		clusterId = split[0]
-		addonName = split[1]
-		version   = d.Get("version").(string)
-		values    = d.Get("values").([]interface{})
-		reqBody   = d.Get("request_body").(string)
-		err       error
+		id            = d.Id()
+		split         = strings.Split(id, FILED_SP)
+		clusterId     = split[0]
+		addonName     = split[1]
+		version       = d.Get("version").(string)
+		values        = d.Get("values").([]interface{})
+		reqBody       = d.Get("request_body").(string)
+		err           error
+		rawValues     *string
+		rawValuesType *string
 	)
 
-	if d.HasChange("request_body") && reqBody == "" || d.HasChange("version") || d.HasChange("values") {
-		reqBody, err = service.GetAddonReqBody(addonName, version, helper.InterfacesStringsPoint(values))
+	if d.HasChange("request_body") && reqBody == "" || d.HasChange("version") || d.HasChange("values") || d.HasChange("raw_values") || d.HasChange("raw_values_type") {
+		if v, ok := d.GetOk("raw_values"); ok {
+			rawValues = helper.String(v.(string))
+		}
+		if v, ok := d.GetOk("raw_values_type"); ok {
+			rawValuesType = helper.String(v.(string))
+		}
+		reqBody, err = service.GetAddonReqBody(addonName, version, helper.InterfacesStringsPoint(values), rawValues, rawValuesType)
 	}
 
 	if err != nil {

tencentcloud/service_tencentcloud_tke_addons.go

@@ -2,6 +2,7 @@ package tencentcloud
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -19,6 +20,7 @@ type AddonSpecChart struct {
 
 type AddonSpecValues struct {
 	RawValuesType *string   `json:"rawValuesType,omitempty"`
+	RawValues     *string   `json:"rawValues,omitempty"`
 	Values        []*string `json:"values,omitempty"`
 }
 
@@ -154,7 +156,7 @@ func (me *TkeService) DescribeExtensionAddon(ctx context.Context, clusterName, a
 	return
 }
 
-func (me *TkeService) GetAddonReqBody(addon, version string, values []*string) (string, error) {
+func (me *TkeService) GetAddonReqBody(addon, version string, values []*string, rawValues, rawValuesType *string) (string, error) {
 	var reqBody = &AddonRequestBody{}
 	//reqBody.Kind = helper.String("App") // Optional
 	//reqBody.ApiVersion = helper.String("application.tkestack.io/v1") // Optional
@@ -165,13 +167,20 @@ func (me *TkeService) GetAddonReqBody(addon, version string, values []*string) (
 		},
 	}
 
+	addonValues := &AddonSpecValues{}
 	if len(values) > 0 {
-		reqBody.Spec.Values = &AddonSpecValues{
-			RawValuesType: helper.String("yaml"),
-			Values:        values,
-		}
+		addonValues.RawValuesType = helper.String("yaml")
+		addonValues.Values = values
+	}
+
+	if rawValuesType != nil && rawValues != nil {
+		base64EncodeValues := base64.StdEncoding.EncodeToString([]byte(*rawValues))
+		addonValues.RawValuesType = rawValuesType
+		addonValues.RawValues = &base64EncodeValues
 	}
 
+	reqBody.Spec.Values = addonValues
+
 	result, err := json.Marshal(reqBody)
 	if err != nil {
 		return "", err

website/docs/r/kubernetes_addon_attachment.html.markdown

@@ -134,6 +134,8 @@ The following arguments are supported:
 
 * `cluster_id` - (Required, String, ForceNew) ID of cluster.
 * `name` - (Required, String, ForceNew) Name of addon.
+* `raw_values_type` - (Optional, String) The type of raw Values. Required with `raw_values`.
+* `raw_values` - (Optional, String) Raw Values. Conflict with `request_body`. Required with `raw_values_type`.
 * `request_body` - (Optional, String) Serialized json string as request body of addon spec. If set, will ignore `version` and `values`.
 * `values` - (Optional, List: [`String`]) Values the addon passthroughs. Conflict with `request_body`.
 * `version` - (Optional, String) Addon version, default latest version. Conflict with `request_body`.