Skip to content

Commit 4a5c992

Browse files
authored
chore: use HasChanges instead of several HasChange (#627)
1 parent 21d3fb5 commit 4a5c992

6 files changed

+6
-6
lines changed

scaleway/resource_baremetal_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
246246
return diag.FromErr(err)
247247
}
248248

249-
if d.HasChange("os") || d.HasChange("ssh_key_ids") {
249+
if d.HasChanges("os", "ssh_key_ids") {
250250
installReq := &baremetal.InstallServerRequest{
251251
Zone: zonedID.Zone,
252252
ServerID: zonedID.ID,

scaleway/resource_instance_placement_group.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema
123123
PolicyType: instance.PlacementGroupPolicyType(d.Get("policy_type").(string)),
124124
}
125125

126-
hasChanged := d.HasChange("policy_mode") || d.HasChange("policy_type")
126+
hasChanged := d.HasChanges("policy_mode", "policy_type")
127127

128128
if d.HasChange("name") {
129129
req.Name = expandStringPtr(d.Get("name").(string))

scaleway/resource_instance_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
582582
////
583583
// Update server user data
584584
////
585-
if d.HasChange("cloud_init") || d.HasChange("user_data") {
585+
if d.HasChanges("cloud_init", "user_data") {
586586
userDataRequests := &instance.SetAllServerUserDataRequest{
587587
Zone: zone,
588588
ServerID: ID,

scaleway/resource_k8s_cluster_beta.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolUpdate(ctx context.Context, d *sch
709709

710710
forceNew := false
711711
oldPoolID := ""
712-
if d.HasChange("default_pool.0.container_runtime") || d.HasChange("default_pool.0.node_type") || d.HasChange("default_pool.0.placement_group_id") {
712+
if d.HasChanges("default_pool.0.container_runtime", "default_pool.0.node_type", "default_pool.0.placement_group_id") {
713713
forceNew = true
714714
oldPoolID = defaultPoolID
715715
} else {

scaleway/resource_lb_beta.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func resourceScalewayLbBetaUpdate(ctx context.Context, d *schema.ResourceData, m
138138
return diag.FromErr(err)
139139
}
140140

141-
if d.HasChange("name") || d.HasChange("tags") {
141+
if d.HasChanges("name", "tags") {
142142
req := &lb.UpdateLBRequest{
143143
Region: region,
144144
LBID: ID,

scaleway/resource_registry_namespace_beta.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func resourceScalewayRegistryNamespaceBetaUpdate(ctx context.Context, d *schema.
104104
return diag.FromErr(err)
105105
}
106106

107-
if d.HasChange("description") || d.HasChange("is_public") {
107+
if d.HasChanges("description", "is_public") {
108108
if _, err := api.UpdateNamespace(&registry.UpdateNamespaceRequest{
109109
Region: region,
110110
NamespaceID: id,

0 commit comments

Comments
 (0)