Skip to content

Commit d696231

Browse files
displaguectreatma
authored andcommitted
refactor: replace isStringInSlice with slices.Contains
Signed-off-by: Marques Johansson <[email protected]>
1 parent 5b70767 commit d696231

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

equinix/data_source_network_device.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package equinix
33
import (
44
"context"
55
"fmt"
6+
"slices"
67
"strings"
78

89
"github.com/equinix/terraform-provider-equinix/internal/config"
@@ -686,7 +687,7 @@ func dataSourceNetworkDeviceRead(ctx context.Context, d *schema.ResourceData, m
686687
return diag.Errorf("cannot fetch primary network device due to '%v'", err)
687688
}
688689

689-
if isStringInSlice(ne.StringValue(primary.Status), []string{ne.DeviceStateDeprovisioning, ne.DeviceStateDeprovisioned}) {
690+
if slices.Contains([]string{ne.DeviceStateDeprovisioning, ne.DeviceStateDeprovisioned}, ne.StringValue(primary.Status)) {
690691
d.SetId("")
691692
return diags
692693
}

equinix/provider.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package equinix
33
import (
44
"context"
55
"fmt"
6+
"slices"
67
"strings"
78
"time"
89

@@ -195,7 +196,7 @@ func configureProvider(ctx context.Context, d *schema.ResourceData, p *schema.Pr
195196

196197
func stringsFound(source []string, target []string) bool {
197198
for i := range source {
198-
if !isStringInSlice(source[i], target) {
199+
if !slices.Contains(target, source[i]) {
199200
return false
200201
}
201202
}
@@ -204,16 +205,7 @@ func stringsFound(source []string, target []string) bool {
204205

205206
func atLeastOneStringFound(source []string, target []string) bool {
206207
for i := range source {
207-
if isStringInSlice(source[i], target) {
208-
return true
209-
}
210-
}
211-
return false
212-
}
213-
214-
func isStringInSlice(needle string, hay []string) bool {
215-
for i := range hay {
216-
if needle == hay[i] {
208+
if slices.Contains(target, source[i]) {
217209
return true
218210
}
219211
}

equinix/resource_ecx_l2_connection.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"log"
7+
"slices"
78
"strings"
89
"time"
910

@@ -714,12 +715,12 @@ func resourceECXL2ConnectionRead(ctx context.Context, d *schema.ResourceData, m
714715
if err != nil {
715716
return diag.Errorf("cannot fetch primary connection due to %v", err)
716717
}
717-
if isStringInSlice(ecx.StringValue(primary.Status), []string{
718+
if slices.Contains([]string{
718719
ecx.ConnectionStatusPendingDelete,
719720
ecx.ConnectionStatusDeprovisioning,
720721
ecx.ConnectionStatusDeprovisioned,
721722
ecx.ConnectionStatusDeleted,
722-
}) {
723+
}, ecx.StringValue(primary.Status)) {
723724
d.SetId("")
724725
return diags
725726
}

equinix/resource_network_device.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"log"
88
"os"
99
"path/filepath"
10+
"slices"
1011
"time"
1112

1213
"github.com/equinix/terraform-provider-equinix/internal/config"
@@ -972,7 +973,7 @@ func resourceNetworkDeviceRead(ctx context.Context, d *schema.ResourceData, m in
972973
if err != nil {
973974
return diag.Errorf("cannot fetch primary network device due to %v", err)
974975
}
975-
if isStringInSlice(ne.StringValue(primary.Status), []string{ne.DeviceStateDeprovisioning, ne.DeviceStateDeprovisioned}) {
976+
if slices.Contains([]string{ne.DeviceStateDeprovisioning, ne.DeviceStateDeprovisioned}, ne.StringValue(primary.Status)) {
976977
d.SetId("")
977978
return diags
978979
}

0 commit comments

Comments
 (0)