Merge pull request #70 from xiaozhu36/error

remove diff for avoid error
aliyun · Jan 4, 2018 · 0e5a67e · 0e5a67e
2 parents 66e7bf9 + d10e96c
commit 0e5a67e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -65,5 +65,7 @@ $ make testacc
 ## Refer
 
 Alibaba Cloud Provider Development Repository [terraform-provider](https://github.com/alibaba/terraform-provider)
+
 Alibaba Cloud Provider [Official Docs](https://www.terraform.io/docs/providers/alicloud/index.html)
-Alibaba Cloud Provider [Development Docs](http://47.95.33.19:4567/docs/providers/alicloud/)
+
+Alibaba Cloud Provider [Development Docs](http://47.95.33.19:4567/docs/providers/alicloud/)
diff --git a/alicloud/resource_alicloud_instance.go b/alicloud/resource_alicloud_instance.go
@@ -24,10 +24,10 @@ func resourceAliyunInstance() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"availability_zone": &schema.Schema{
-				Type:             schema.TypeString,
-				Optional:         true,
-				ForceNew:         true,
-				DiffSuppressFunc: zoneIdDiffSuppressFunc,
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Computed: true,
 			},
 
 			"image_id": &schema.Schema{
@@ -68,23 +68,20 @@ func resourceAliyunInstance() *schema.Resource {
 			},
 
 			"internet_charge_type": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				//ForceNew:         true,
+				Type:             schema.TypeString,
+				Optional:         true,
 				Computed:         true,
 				ValidateFunc:     validateInternetChargeType,
 				DiffSuppressFunc: ecsInternetDiffSuppressFunc,
 			},
 			"internet_max_bandwidth_in": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				//ForceNew: true,
+				Type:             schema.TypeString,
+				Optional:         true,
 				DiffSuppressFunc: ecsInternetDiffSuppressFunc,
 			},
 			"internet_max_bandwidth_out": &schema.Schema{
-				Type:     schema.TypeInt,
-				Optional: true,
-				//ForceNew:     true,
+				Type:             schema.TypeInt,
+				Optional:         true,
 				ValidateFunc:     validateIntegerInRange(0, 100),
 				DiffSuppressFunc: ecsInternetDiffSuppressFunc,
 			},
@@ -135,10 +132,9 @@ func resourceAliyunInstance() *schema.Resource {
 			},
 
 			"private_ip": &schema.Schema{
-				Type:             schema.TypeString,
-				Optional:         true,
-				Computed:         true,
-				DiffSuppressFunc: ecsPrivateIpDiffSuppressFunc,
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
 			},
 
 			"instance_charge_type": &schema.Schema{