Skip to content

Commit fa2f781

Browse files
MrWolongChenHanZhang
authored andcommitted
resource/alicloud_nlb_server_group_server_attachment: Fixed the update invalid error caused by weight; Improved alicloud_nlb_server_group_server_attachment testcase
1 parent 443f7c5 commit fa2f781

File tree

2 files changed

+143
-139
lines changed

2 files changed

+143
-139
lines changed

alicloud/resource_alicloud_nlb_server_group_server_attachment.go

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ func resourceAliCloudNlbServerGroupServerAttachmentCreate(d *schema.ResourceData
9595

9696
objectDataLocalMap := make(map[string]interface{})
9797

98-
if v, ok := d.GetOkExists("server_id"); ok {
98+
if v, ok := d.GetOk("server_id"); ok {
9999
objectDataLocalMap["ServerId"] = v
100100
}
101101

102-
if v, ok := d.GetOkExists("server_type"); ok {
102+
if v, ok := d.GetOk("server_type"); ok {
103103
objectDataLocalMap["ServerType"] = v
104104
}
105105

106-
if v, ok := d.GetOkExists("server_ip"); ok {
106+
if v, ok := d.GetOk("server_ip"); ok {
107107
objectDataLocalMap["ServerIp"] = v
108108
}
109109

@@ -115,7 +115,7 @@ func resourceAliCloudNlbServerGroupServerAttachmentCreate(d *schema.ResourceData
115115
objectDataLocalMap["Weight"] = v
116116
}
117117

118-
if v, ok := d.GetOkExists("description"); ok {
118+
if v, ok := d.GetOk("description"); ok {
119119
objectDataLocalMap["Description"] = v
120120
}
121121

@@ -160,7 +160,7 @@ func resourceAliCloudNlbServerGroupServerAttachmentCreate(d *schema.ResourceData
160160
return WrapErrorf(err, IdMsg, d.Id())
161161
}
162162

163-
return resourceAliCloudNlbServerGroupServerAttachmentUpdate(d, meta)
163+
return resourceAliCloudNlbServerGroupServerAttachmentRead(d, meta)
164164
}
165165

166166
func resourceAliCloudNlbServerGroupServerAttachmentRead(d *schema.ResourceData, meta interface{}) error {
@@ -207,31 +207,10 @@ func resourceAliCloudNlbServerGroupServerAttachmentUpdate(d *schema.ResourceData
207207
request["ClientToken"] = buildClientToken(action)
208208
objectDataLocalMap := make(map[string]interface{})
209209

210-
if d.HasChange("server_id") {
211-
update = true
212-
}
213-
if v, ok := d.GetOk("server_id"); ok {
214-
objectDataLocalMap["ServerId"] = v
215-
}
216-
217-
if d.HasChange("server_type") {
218-
update = true
219-
}
220-
if v, ok := d.GetOk("server_type"); ok {
221-
objectDataLocalMap["ServerType"] = v
222-
}
223-
224-
if d.HasChange("port") {
225-
update = true
226-
}
227-
if v, ok := d.GetOk("port"); ok {
228-
objectDataLocalMap["Port"] = v
229-
}
230-
231210
if d.HasChange("weight") {
232211
update = true
233212
}
234-
if v, ok := d.GetOk("weight"); ok {
213+
if v, ok := d.GetOkExists("weight"); ok {
235214
objectDataLocalMap["Weight"] = v
236215
}
237216

@@ -242,13 +221,6 @@ func resourceAliCloudNlbServerGroupServerAttachmentUpdate(d *schema.ResourceData
242221
objectDataLocalMap["Description"] = v
243222
}
244223

245-
if d.HasChange("server_ip") {
246-
update = true
247-
}
248-
if v, ok := d.GetOk("server_ip"); ok {
249-
objectDataLocalMap["ServerIp"] = v
250-
}
251-
252224
ServersMap := make([]interface{}, 0)
253225
ServersMap = append(ServersMap, objectDataLocalMap)
254226
request["Servers"] = ServersMap

0 commit comments

Comments
 (0)