cancel validate required db pwd (#1066)

Author: Kagashino

tencentcloud/extension_mongodb.go

@@ -146,7 +146,7 @@ func TencentMongodbBasicInfo() map[string]*schema.Schema {
 		},
 		"password": {
 			Type:        schema.TypeString,
-			Required:    true,
+			Optional:    true,
 			Sensitive:   true,
 			Description: "Password of this Mongodb account.",
 		},

tencentcloud/resource_tc_mongodb_instance.go

@@ -93,9 +93,9 @@ func mongodbAllInstanceReqSet(requestInter interface{}, d *schema.ResourceData)
 		mongoVersionInterface = d.Get("engine_version").(string)
 		zoneInterface         = d.Get("available_zone").(string)
 		machine               = d.Get("machine_type").(string)
-		password              = d.Get("password").(string)
 		instanceType          = MONGO_INSTANCE_TYPE_FORMAL
 		projectId             = d.Get("project_id").(int)
+		password              string
 	)
 
 	if machine == MONGODB_MACHINE_TYPE_GIO {
@@ -104,6 +104,12 @@ func mongodbAllInstanceReqSet(requestInter interface{}, d *schema.ResourceData)
 		machine = MONGODB_MACHINE_TYPE_HIO10G
 	}
 
+	if v, ok := d.GetOk("password"); ok && v.(string) != "" {
+		password = v.(string)
+	} else {
+		return fmt.Errorf("`password` cannot be empty when creating")
+	}
+
 	getType := reflect.TypeOf(requestInter)
 	value := reflect.ValueOf(requestInter).Elem()
 

tencentcloud/resource_tc_mongodb_instance_test.go

@@ -111,19 +111,18 @@ func TestAccTencentCloudMongodbInstanceResourcePostPaid(t *testing.T) {
 func TestAccTencentCloudNeedFixMongodbInstanceResourcePrepaid(t *testing.T) {
 	// Avoid to set Parallel to make sure EnvVar secure
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckMongodbInstanceDestroy,
+		PreCheck:  func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
+		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccMongodbInstancePrepaid,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMongodbInstanceExists("tencentcloud_mongodb_instance.mongodb_prepaid"),
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "instance_name", "tf-mongodb-test-prepaid"),
-					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "memory"),
-					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "volume"),
-					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "engine_version"),
-					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb", "machine_type"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "memory"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "volume"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "engine_version"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "machine_type"),
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "available_zone", "ap-guangzhou-6"),
 					resource.TestCheckResourceAttr("tencentcloud_mongodb_instance.mongodb_prepaid", "project_id", "0"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mongodb_instance.mongodb_prepaid", "status"),
@@ -147,10 +146,10 @@ func TestAccTencentCloudNeedFixMongodbInstanceResourcePrepaid(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:            "tencentcloud_mongodb_instance.mongodb",
+				ResourceName:            "tencentcloud_mongodb_instance.mongodb_prepaid",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"security_groups", "password", "auto_renew_flag"},
+				ImportStateVerifyIgnore: []string{"security_groups", "password", "auto_renew_flag", "prepaid_period"},
 			},
 		},
 	})

tencentcloud/resource_tc_mongodb_sharding_instance.go

@@ -96,6 +96,12 @@ func mongodbAllShardingInstanceReqSet(requestInter interface{}, d *schema.Resour
 		projectId             = d.Get("project_id").(int)
 	)
 
+	if v, ok := d.GetOk("password"); ok && v.(string) != "" {
+		password = v.(string)
+	} else {
+		return fmt.Errorf("`password` cannot be empty when creating")
+	}
+
 	if machine == MONGODB_MACHINE_TYPE_GIO {
 		machine = MONGODB_MACHINE_TYPE_HIO
 	} else if machine == MONGODB_MACHINE_TYPE_TGIO {

tencentcloud/resource_tc_mongodb_standby_instance_test.go

@@ -52,7 +52,7 @@ func TestAccTencentCloudNeedFixMongodbStandbyInstanceResource(t *testing.T) {
 				ResourceName:            "tencentcloud_mongodb_standby_instance.mongodb",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"security_groups", "auto_renew_flag"},
+				ImportStateVerifyIgnore: []string{"security_groups", "auto_renew_flag", "password"},
 			},
 			{
 				Config: testAccMongodbStandbyInstancePrepaid,

tencentcloud/resource_tc_mysql_instance.go

@@ -260,7 +260,7 @@ func resourceTencentCloudMysqlInstance() *schema.Resource {
 		},
 		"root_password": {
 			Type:         schema.TypeString,
-			Required:     true,
+			Optional:     true,
 			Sensitive:    true,
 			ValidateFunc: validateMysqlPassword,
 			Description:  "Password of root account. This parameter can be specified when you purchase master instances, but it should be ignored when you purchase read-only instances or disaster recovery instances.",
@@ -666,12 +666,18 @@ func resourceTencentCloudMysqlInstanceCreate(d *schema.ResourceData, meta interf
 	// Initialize mysql instance
 	var (
 		version   = d.Get("engine_version").(string)
-		password  = d.Get("root_password").(string)
 		charset   = d.Get("parameters.character_set_server").(string)
 		lowercase = d.Get("parameters.lower_case_table_names").(string)
+		password  string
 		vPort     int
 	)
 
+	if v, ok := d.GetOk("root_password"); ok && v.(string) != "" {
+		password = v.(string)
+	} else {
+		return fmt.Errorf("`root_password` cannot be empty when creating")
+	}
+
 	// 8.0 does not support lower_case_table_names modified, skip this params
 	if version == "8.0" {
 		lowercase = ""

website/docs/r/mongodb_instance.html.markdown

@@ -37,10 +37,10 @@ The following arguments are supported:
 * `instance_name` - (Required) Name of the Mongodb instance.
 * `machine_type` - (Required, ForceNew) Type of Mongodb instance, and available values include `HIO`(or `GIO` which will be deprecated, represents high IO) and `HIO10G`(or `TGIO` which will be deprecated, represents 10-gigabit high IO).
 * `memory` - (Required) Memory size. The minimum value is 2, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
-* `password` - (Required) Password of this Mongodb account.
 * `volume` - (Required) Disk size. The minimum value is 25, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
 * `auto_renew_flag` - (Optional) Auto renew flag. Valid values are `0`(NOTIFY_AND_MANUAL_RENEW), `1`(NOTIFY_AND_AUTO_RENEW) and `2`(DISABLE_NOTIFY_AND_MANUAL_RENEW). Default value is `0`. Note: only works for PREPAID instance. Only supports`0` and `1` for creation.
 * `charge_type` - (Optional, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. Caution that update operation on this field will delete old instances and create new one with new charge type.
+* `password` - (Optional) Password of this Mongodb account.
 * `prepaid_period` - (Optional) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.
 * `project_id` - (Optional) ID of the project which the instance belongs.
 * `security_groups` - (Optional, ForceNew) ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.

website/docs/r/mongodb_sharding_instance.html.markdown

@@ -40,11 +40,11 @@ The following arguments are supported:
 * `machine_type` - (Required, ForceNew) Type of Mongodb instance, and available values include `HIO`(or `GIO` which will be deprecated, represents high IO) and `HIO10G`(or `TGIO` which will be deprecated, represents 10-gigabit high IO).
 * `memory` - (Required) Memory size. The minimum value is 2, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
 * `nodes_per_shard` - (Required, ForceNew) Number of nodes per shard, at least 3(one master and two slaves).
-* `password` - (Required) Password of this Mongodb account.
 * `shard_quantity` - (Required, ForceNew) Number of sharding.
 * `volume` - (Required) Disk size. The minimum value is 25, and unit is GB. Memory and volume must be upgraded or degraded simultaneously.
 * `auto_renew_flag` - (Optional) Auto renew flag. Valid values are `0`(NOTIFY_AND_MANUAL_RENEW), `1`(NOTIFY_AND_AUTO_RENEW) and `2`(DISABLE_NOTIFY_AND_MANUAL_RENEW). Default value is `0`. Note: only works for PREPAID instance. Only supports`0` and `1` for creation.
 * `charge_type` - (Optional, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. Default value is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. Caution that update operation on this field will delete old instances and create new one with new charge type.
+* `password` - (Optional) Password of this Mongodb account.
 * `prepaid_period` - (Optional) The tenancy (time unit is month) of the prepaid instance. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. NOTE: it only works when charge_type is set to `PREPAID`.
 * `project_id` - (Optional) ID of the project which the instance belongs.
 * `security_groups` - (Optional, ForceNew) ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.

website/docs/r/mysql_instance.html.markdown

@@ -51,7 +51,6 @@ The following arguments are supported:
 
 * `instance_name` - (Required) The name of a mysql instance.
 * `mem_size` - (Required) Memory size (in MB).
-* `root_password` - (Required) Password of root account. This parameter can be specified when you purchase master instances, but it should be ignored when you purchase read-only instances or disaster recovery instances.
 * `volume_size` - (Required) Disk size (in GB).
 * `auto_renew_flag` - (Optional) Auto renew flag. NOTES: Only supported prepaid instance.
 * `availability_zone` - (Optional, ForceNew) Indicates which availability zone will be used.
@@ -69,6 +68,7 @@ The following arguments are supported:
 * `period` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `prepaid_period` instead. Period of instance. NOTES: Only supported prepaid instance.
 * `prepaid_period` - (Optional) Period of instance. NOTES: Only supported prepaid instance.
 * `project_id` - (Optional) Project ID, default value is 0.
+* `root_password` - (Optional) Password of root account. This parameter can be specified when you purchase master instances, but it should be ignored when you purchase read-only instances or disaster recovery instances.
 * `second_slave_zone` - (Optional, ForceNew) Zone information about second slave instance.
 * `security_groups` - (Optional) Security groups to use.
 * `slave_deploy_mode` - (Optional, ForceNew) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.