resource/alicloud_drds_instance: set required attributes; resource/alicloud_lindorm_instance: update validation; resource/alicloud_ocean_base_instance: update validation

Author: shanye997

alicloud/resource_alicloud_drds_instance.go

@@ -216,6 +216,7 @@ func resourceAliCloudDRDSInstanceRead(d *schema.ResourceData, meta interface{})
 	d.Set("zone_id", data.ZoneId)
 	d.Set("description", data.Description)
 	d.Set("vpc_id", data.Vips.Vip[0].VpcId)
+	d.Set("vswitch_id", data.Vips.Vip[0].VswitchId)
 	var connectionString, port string
 	for _, vip := range data.Vips.Vip {
 		if vip.Type == "intranet" {
@@ -227,6 +228,8 @@ func resourceAliCloudDRDSInstanceRead(d *schema.ResourceData, meta interface{})
 	d.Set("connection_string", connectionString)
 	d.Set("port", port)
 	d.Set("mysql_version", data.MysqlVersion)
+	d.Set("specification", data.InstanceSpec)
+	d.Set("instance_series", data.InstanceSeries)
 	return nil
 }
 

alicloud/resource_alicloud_lindorm_instance.go

@@ -136,7 +136,7 @@ func resourceAliCloudLindormInstance() *schema.Resource {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				Computed:     true,
-				ValidateFunc: IntAtLeast(2),
+				ValidateFunc: IntBetween(0, 60),
 			},
 			"search_engine_specification": {
 				Type:         schema.TypeString,
@@ -148,7 +148,7 @@ func resourceAliCloudLindormInstance() *schema.Resource {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				Computed:     true,
-				ValidateFunc: IntAtLeast(2),
+				ValidateFunc: IntBetween(0, 400),
 			},
 			"table_engine_specification": {
 				Type:     schema.TypeString,
@@ -159,7 +159,7 @@ func resourceAliCloudLindormInstance() *schema.Resource {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				Computed:     true,
-				ValidateFunc: IntAtLeast(2),
+				ValidateFunc: IntBetween(0, 32),
 			},
 			"time_serires_engine_specification": {
 				Type:          schema.TypeString,

alicloud/resource_alicloud_ocean_base_instance.go

@@ -65,7 +65,7 @@ func resourceAliCloudOceanBaseInstance() *schema.Resource {
 			"disk_size": {
 				Type:         schema.TypeInt,
 				Required:     true,
-				ValidateFunc: IntBetween(100, 10000),
+				ValidateFunc: IntBetween(50, 10000),
 			},
 			"disk_type": {
 				Type:         schema.TypeString,