Merge pull request #172 from yunify/err-check

map & set error check , instance password forcenew
yunify · Nov 6, 2018 · aa527f0 · aa527f0
2 parents 6e8e123 + 294075c
commit aa527f0
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 15 deletions.
diff --git a/qingcloud/resource_qingcloud_eip.go b/qingcloud/resource_qingcloud_eip.go
@@ -119,7 +119,9 @@ func resourceQingcloudEipRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set(resourceEipResource, getEIPResourceMap(ip)); err != nil {
 		return fmt.Errorf("Error set eip resource %v", err)
 	}
-	resourceSetTag(d, ip.Tags)
+	if err := resourceSetTag(d, ip.Tags); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/qingcloud/resource_qingcloud_instance.go b/qingcloud/resource_qingcloud_instance.go
@@ -119,8 +119,10 @@ func resourceQingcloudInstance() *schema.Resource {
 			resourceTagIds:   tagIdsSchema(),
 			resourceTagNames: tagNamesSchema(),
 			resourceInstanceLoginPassword: &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:      schema.TypeString,
+				Optional:  true,
+				ForceNew:  true,
+				Sensitive: true,
 			},
 		},
 	}
@@ -223,9 +225,13 @@ func resourceQingcloudInstanceRead(d *schema.ResourceData, meta interface{}) err
 		for _, volume := range instance.Volumes {
 			volumeIDs = append(volumeIDs, qc.StringValue(volume.VolumeID))
 		}
-		d.Set(resourceInstanceVolumeIDs, volumeIDs)
+		if err := d.Set(resourceInstanceVolumeIDs, volumeIDs); err != nil {
+			return err
+		}
+	}
+	if err := resourceSetTag(d, instance.Tags); err != nil {
+		return err
 	}
-	resourceSetTag(d, instance.Tags)
 	return nil
 }
 

diff --git a/qingcloud/resource_qingcloud_keypair.go b/qingcloud/resource_qingcloud_keypair.go
@@ -97,7 +97,9 @@ func resourceQingcloudKeypairRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set(resourceName, qc.StringValue(kp.KeyPairName))
 	d.Set(resourceDescription, qc.StringValue(kp.Description))
 	d.Set(resourceKeyPairPublicKey, qc.StringValue(kp.EncryptMethod)+" "+qc.StringValue(kp.PubKey))
-	resourceSetTag(d, kp.Tags)
+	if err := resourceSetTag(d, kp.Tags); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/qingcloud/resource_qingcloud_loadbalancer.go b/qingcloud/resource_qingcloud_loadbalancer.go
@@ -174,7 +174,9 @@ func resourceQingcloudLoadBalancerRead(d *schema.ResourceData, meta interface{})
 	d.Set(resourceDescription, qc.StringValue(lb.Description))
 	d.Set(resourceLoadBalancerType, qc.IntValue(lb.LoadBalancerType))
 	d.Set(resourceLoadBalancerVxnetID, qc.StringValue(lb.VxNetID))
-	d.Set(resourceLoadBalancerPrivateIPs, qc.StringValueSlice(lb.PrivateIPs))
+	if err := d.Set(resourceLoadBalancerPrivateIPs, qc.StringValueSlice(lb.PrivateIPs)); err != nil {
+		return err
+	}
 	d.Set(resourceLoadBalancerSecurityGroupID, qc.StringValue(lb.SecurityGroupID))
 	d.Set(resourceLoadBalancerNodeCount, qc.IntValue(lb.NodeCount))
 	var eipIDs []string
@@ -188,7 +190,9 @@ func resourceQingcloudLoadBalancerRead(d *schema.ResourceData, meta interface{})
 		}
 	}
 	d.Set(resourceLoadBalancerEipIDs, eipIDs)
-	resourceSetTag(d, lb.Tags)
+	if err := resourceSetTag(d, lb.Tags); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/qingcloud/resource_qingcloud_loadbalancer_listener.go b/qingcloud/resource_qingcloud_loadbalancer_listener.go
@@ -155,7 +155,9 @@ func resourceQingcloudLoadBalancerListenerRead(d *schema.ResourceData, meta inte
 	d.Set(resourceLoadBalancerListenerPort, qc.IntValue(output.LoadBalancerListenerSet[0].ListenerPort))
 	d.Set(resourceLoadBalancerListenerProtocol, qc.StringValue(output.LoadBalancerListenerSet[0].ListenerProtocol))
 	d.Set(resourceLoadBalancerListenerBalancerMode, qc.StringValue(output.LoadBalancerListenerSet[0].BalanceMode))
-	d.Set(resourceLoadBalancerListenerServerCertificateId, qc.StringValueSlice(output.LoadBalancerListenerSet[0].ServerCertificateID))
+	if err := d.Set(resourceLoadBalancerListenerServerCertificateId, qc.StringValueSlice(output.LoadBalancerListenerSet[0].ServerCertificateID)); err != nil {
+		return err
+	}
 	d.Set(resourceLoadBalancerListenerSessionSticky, qc.StringValue(output.LoadBalancerListenerSet[0].SessionSticky))
 	d.Set(resourceLoadBalancerListenerForwardfor, qc.IntValue(output.LoadBalancerListenerSet[0].Forwardfor))
 	d.Set(resourceLoadBalancerListenerHealthCheckMethod, qc.StringValue(output.LoadBalancerListenerSet[0].HealthyCheckMethod))

diff --git a/qingcloud/resource_qingcloud_security_group.go b/qingcloud/resource_qingcloud_security_group.go
@@ -63,7 +63,9 @@ func resourceQingcloudSecurityGroupRead(d *schema.ResourceData, meta interface{}
 	sg := output.SecurityGroupSet[0]
 	d.Set(resourceName, qc.StringValue(sg.SecurityGroupName))
 	d.Set(resourceDescription, qc.StringValue(sg.Description))
-	resourceSetTag(d, sg.Tags)
+	if err := resourceSetTag(d, sg.Tags); err != nil {
+		return err
+	}
 	return nil
 }
 func resourceQingcloudSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) error {

diff --git a/qingcloud/resource_qingcloud_tag_help.go b/qingcloud/resource_qingcloud_tag_help.go
@@ -30,15 +30,19 @@ func modifyTagAttributes(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func resourceSetTag(d *schema.ResourceData, tags []*qc.Tag) {
+func resourceSetTag(d *schema.ResourceData, tags []*qc.Tag) error {
 	tagIDs := make([]string, 0, len(tags))
 	tagNames := make([]string, 0, len(tags))
 	for _, tag := range tags {
 		tagIDs = append(tagIDs, qc.StringValue(tag.TagID))
 		tagNames = append(tagNames, qc.StringValue(tag.TagName))
 	}
-	d.Set(resourceTagIds, tagIDs)
+
+	if err := d.Set(resourceTagIds, tagIDs); err != nil {
+		return err
+	}
 	d.Set(resourceTagNames, tagNames)
+	return nil
 }
 
 func resourceUpdateTag(d *schema.ResourceData, meta interface{}, resourceType string) error {

diff --git a/qingcloud/resource_qingcloud_volume.go b/qingcloud/resource_qingcloud_volume.go
@@ -94,7 +94,9 @@ func resourceQingcloudVolumeRead(d *schema.ResourceData, meta interface{}) error
 	d.Set(resourceDescription, qc.StringValue(volume.Description))
 	d.Set(resourceVolumeSize, qc.IntValue(volume.Size))
 	d.Set(resourceVolumeType, qc.IntValue(volume.VolumeType))
-	resourceSetTag(d, volume.Tags)
+	if err := resourceSetTag(d, volume.Tags); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/qingcloud/resource_qingcloud_vpc.go b/qingcloud/resource_qingcloud_vpc.go
@@ -120,7 +120,9 @@ func resourceQingcloudVpcRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set(resourceVpcPrivateIP, qc.StringValue(rtr.PrivateIP))
 	d.Set(resourceVpcEipID, qc.StringValue(rtr.EIP.EIPID))
 	d.Set(resourceVpcPublicIP, qc.StringValue(rtr.EIP.EIPAddr))
-	resourceSetTag(d, rtr.Tags)
+	if err := resourceSetTag(d, rtr.Tags); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/qingcloud/resource_qingcloud_vxnet.go b/qingcloud/resource_qingcloud_vxnet.go
@@ -101,7 +101,9 @@ func resourceQingcloudVxnetRead(d *schema.ResourceData, meta interface{}) error
 		d.Set(resourceVxnetVpcIPNetwork, "")
 	}
 	d.Set(resourceVxnetVpcID, qc.StringValue(vxnet.VpcRouterID))
-	resourceSetTag(d, vxnet.Tags)
+	if err := resourceSetTag(d, vxnet.Tags); err != nil {
+		return err
+	}
 	return nil
 }