fix: tke_addon - npe error (#762)

Author: Kagashino

tencentcloud/resource_tc_kubernetes_addon_attachment.go

@@ -20,7 +20,7 @@ resource "tencentcloud_kubernetes_addon_attachment" "addon_tcr" {
   version = "1.0.0"
   values = [
     # imagePullSecretsCrs is an array which can configure image pull
-    "global.imagePullSecretsCrs[0].name=sample-vpc",
+    "global.imagePullSecretsCrs[0].name=unique-sample-vpc",
     "global.imagePullSecretsCrs[0].namespaces=tcr-assistant-system",
     "global.imagePullSecretsCrs[0].serviceAccounts=*",
     "global.imagePullSecretsCrs[0].type=docker",
@@ -173,7 +173,7 @@ func resourceTencentCloudTkeAddonAttachmentCreate(d *schema.ResourceData, meta i
 	phase, has, err := service.PollingAddonsPhase(ctx, clusterId, addonName, resData)
 
 	if resData.Status != nil && resData.Status["reason"] != nil {
-		reason = *resData.Status["reason"]
+		reason = resData.Status["reason"].(string)
 	}
 
 	if !has {
@@ -202,6 +202,9 @@ func resourceTencentCloudTkeAddonAttachmentRead(d *schema.ResourceData, meta int
 	id := d.Id()
 	has := false
 	split := strings.Split(id, FILED_SP)
+	if len(split) < 2 {
+		return fmt.Errorf("id expected format: cluster_id#addon_name but no addon_name provided")
+	}
 	clusterId := split[0]
 	addonName := split[1]
 
@@ -321,7 +324,7 @@ func getFilteredValues(d *schema.ResourceData, values []*string) []string {
 		kv := strings.Split(*value, "=")
 		key := kv[0]
 
-		if IsContains(TKE_ADDON_DEFAULT_VALUES_KEY, key) || !IsContains(rawValues, *value) {
+		if IsContains(TKE_ADDON_DEFAULT_VALUES_KEY, key) || IsContains(rawValues, *value) {
 			continue
 		}
 		rawValues = append(rawValues, *value)

tencentcloud/service_tencentcloud_tke_addons.go

@@ -45,11 +45,11 @@ type AddonResponseMeta struct {
 }
 
 type AddonResponseData struct {
-	Kind       *string            `json:"kind,omitempty"`
-	ApiVersion *string            `json:"apiVersion,omitempty"`
-	Metadata   *AddonResponseMeta `json:"metadata,omitempty"`
-	Spec       *AddonSpec         `json:"spec,omitempty"`
-	Status     map[string]*string `json:"status,omitempty"`
+	Kind       *string                `json:"kind,omitempty"`
+	ApiVersion *string                `json:"apiVersion,omitempty"`
+	Metadata   *AddonResponseMeta     `json:"metadata,omitempty"`
+	Spec       *AddonSpec             `json:"spec,omitempty"`
+	Status     map[string]interface{} `json:"status,omitempty"`
 }
 
 func (me *TkeService) GetTkeAppChartList(ctx context.Context, request *tke.GetTkeAppChartListRequest) (info []*tke.AppChart, errRet error) {
@@ -79,10 +79,10 @@ func (me *TkeService) GetTkeAppChartList(ctx context.Context, request *tke.GetTk
 
 func (me *TkeService) PollingAddonsPhase(ctx context.Context, clusterId, addonName string, addonResponseData *AddonResponseData) (string, bool, error) {
 	var (
-		err error
-		phase string
+		err      error
+		phase    string
 		response string
-		has bool
+		has      bool
 	)
 
 	if addonResponseData == nil {
@@ -104,13 +104,13 @@ func (me *TkeService) PollingAddonsPhase(ctx context.Context, clusterId, addonNa
 
 		reason := addonResponseData.Status["reason"]
 		if addonResponseData.Status["phase"] != nil {
-			phase = *addonResponseData.Status["phase"]
+			phase = addonResponseData.Status["phase"].(string)
 		}
 		if reason == nil {
 			reason = helper.String("unknown error")
 		}
 
-		if phase == "Upgrading" || phase == "Installing" || phase == "ChartFetched" || phase == "RollingBack" || phase == "Terminating"{
+		if phase == "Upgrading" || phase == "Installing" || phase == "ChartFetched" || phase == "RollingBack" || phase == "Terminating" {
 			return resource.RetryableError(fmt.Errorf("addon %s is %s, retrying", addonName, phase))
 		}
 

website/docs/r/kubernetes_addon_attachment.html.markdown

@@ -29,7 +29,7 @@ resource "tencentcloud_kubernetes_addon_attachment" "addon_tcr" {
   version    = "1.0.0"
   values = [
     # imagePullSecretsCrs is an array which can configure image pull
-    "global.imagePullSecretsCrs[0].name=sample-vpc",
+    "global.imagePullSecretsCrs[0].name=unique-sample-vpc",
     "global.imagePullSecretsCrs[0].namespaces=tcr-assistant-system",
     "global.imagePullSecretsCrs[0].serviceAccounts=*",
     "global.imagePullSecretsCrs[0].type=docker",