fix(cynosdb): [] support cynos_version : command not found fields

Author: gitmkn

tencentcloud/services/cynosdb/extension_cynosdb.go

@@ -483,6 +483,12 @@ func TencentCynosdbClusterBaseInfo() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Serverless cluster status. NOTE: This is a readonly attribute, to modify, please set `serverless_status_flag`.",
 		},
+		"cynos_version": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "Kernel version, you can enter it when modifying.",
+		},
 	}
 
 	for k, v := range TencentCynosdbInstanceBaseInfo() {

tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster.go

@@ -201,6 +201,10 @@ func resourceTencentCloudCynosdbClusterCreate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	if v, ok := d.GetOk("cynos_version"); ok && v != "" {
+		return fmt.Errorf("Setting cynos_version is not supported when creating a cluster")
+	}
+
 	request.PayMode = &chargeType
 	var response *cynosdb.CreateClustersResponse
 	var err error
@@ -588,6 +592,16 @@ func resourceTencentCloudCynosdbClusterRead(d *schema.ResourceData, meta interfa
 		_ = d.Set("param_items", resultParamItems)
 	}
 
+	if v, ok := d.GetOkExists("force_delete"); ok {
+		_ = d.Set("force_delete", v)
+	} else {
+		_ = d.Set("force_delete", false)
+	}
+
+	if cluster.CynosVersion != nil {
+		_ = d.Set("cynos_version", cluster.CynosVersion)
+	}
+
 	return nil
 }
 
@@ -944,6 +958,36 @@ func resourceTencentCloudCynosdbClusterUpdate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	if d.HasChange("cynos_version") {
+		cynosVersion := d.Get("cynos_version").(string)
+		flowId, err := cynosdbService.UpgradeClusterVersion(ctx, clusterId, cynosVersion)
+		if err != nil {
+			return err
+		}
+
+		service := CynosdbService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+		err = resource.Retry(6*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+			ok, err := service.DescribeFlow(ctx, flowId)
+			if err != nil {
+				if _, ok := err.(*sdkErrors.TencentCloudSDKError); !ok {
+					return resource.RetryableError(err)
+				} else {
+					return resource.NonRetryableError(err)
+				}
+			}
+
+			if ok {
+				return nil
+			} else {
+				return resource.RetryableError(fmt.Errorf("update cynosdb cynos_version is processing"))
+			}
+		})
+
+		if err != nil {
+			return err
+		}
+	}
+
 	d.Partial(false)
 
 	return resourceTencentCloudCynosdbClusterRead(d, meta)

tencentcloud/services/cynosdb/service_tencentcloud_cynosdb.go

@@ -2927,3 +2927,31 @@ func (me *CynosdbService) DescribeCynosdbBackupConfigById(ctx context.Context, c
 	ret = response.Response
 	return
 }
+
+func (me *CynosdbService) UpgradeClusterVersion(ctx context.Context, clusterId, cynosVersion string) (flowId int64, errRet error) {
+	logId := tccommon.GetLogId(ctx)
+	request := cynosdb.NewUpgradeClusterVersionRequest()
+	response := cynosdb.NewUpgradeClusterVersionResponse()
+
+	request.ClusterId = &clusterId
+	request.CynosVersion = &cynosVersion
+	request.UpgradeType = helper.String(CYNOSDB_UPGRADE_IMMEDIATE)
+
+	errRet = resource.Retry(tccommon.WriteRetryTimeout*2, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		response, errRet = me.client.UseCynosdbClient().UpgradeClusterVersion(request)
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, reason:%s", logId, request.GetAction(), errRet.Error())
+			return tccommon.RetryError(errRet)
+		}
+		return nil
+	})
+	if errRet != nil {
+		return
+	}
+	if response != nil && response.Response != nil {
+		flowId = *response.Response.FlowId
+	}
+
+	return
+}

website/docs/r/cynosdb_cluster.html.markdown

@@ -219,6 +219,7 @@ The following arguments are supported:
 * `auto_pause` - (Optional, String) Specify whether the cluster can auto-pause while `db_mode` is `SERVERLESS`. Values: `yes` (default), `no`.
 * `auto_renew_flag` - (Optional, Int) Auto renew flag. Valid values are `0`(MANUAL_RENEW), `1`(AUTO_RENEW). Default value is `0`. Only works for PREPAID cluster.
 * `charge_type` - (Optional, String, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`.
+* `cynos_version` - (Optional, String) Kernel version, you can enter it when modifying.
 * `db_mode` - (Optional, String) Specify DB mode, only available when `db_type` is `MYSQL`. Values: `NORMAL` (Default), `SERVERLESS`.
 * `force_delete` - (Optional, Bool) Indicate whether to delete cluster instance directly or not. Default is false. If set true, the cluster and its `All RELATED INSTANCES` will be deleted instead of staying recycle bin. Note: works for both `PREPAID` and `POSTPAID_BY_HOUR` cluster.
 * `instance_cpu_core` - (Optional, Int) The number of CPU cores of read-write type instance in the CynosDB cluster. Required while creating normal cluster. Note: modification of this field will take effect immediately, if want to upgrade on maintenance window, please upgrade from console.