Skip to content

refactor: replace isStringInSlice with slices.Contains #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2024
Merged

refactor: replace isStringInSlice with slices.Contains #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion equinix/data_source_network_device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package equinix
import (
"context"
"fmt"
"slices"
"strings"

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

if isStringInSlice(ne.StringValue(primary.Status), []string{ne.DeviceStateDeprovisioning, ne.DeviceStateDeprovisioned}) {
if slices.Contains([]string{ne.DeviceStateDeprovisioning, ne.DeviceStateDeprovisioned}, ne.StringValue(primary.Status)) {
d.SetId("")
return diags
}
Expand Down
14 changes: 3 additions & 11 deletions equinix/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package equinix
import (
"context"
"fmt"
"slices"
"strings"
"time"

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

func stringsFound(source []string, target []string) bool {
for i := range source {
if !isStringInSlice(source[i], target) {
if !slices.Contains(target, source[i]) {
return false
}
}
Expand All @@ -204,16 +205,7 @@ func stringsFound(source []string, target []string) bool {

func atLeastOneStringFound(source []string, target []string) bool {
for i := range source {
if isStringInSlice(source[i], target) {
return true
}
}
return false
}

func isStringInSlice(needle string, hay []string) bool {
for i := range hay {
if needle == hay[i] {
if slices.Contains(target, source[i]) {
return true
}
}
Expand Down
5 changes: 3 additions & 2 deletions equinix/resource_ecx_l2_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"
"slices"
"strings"
"time"

Expand Down Expand Up @@ -714,12 +715,12 @@ func resourceECXL2ConnectionRead(ctx context.Context, d *schema.ResourceData, m
if err != nil {
return diag.Errorf("cannot fetch primary connection due to %v", err)
}
if isStringInSlice(ecx.StringValue(primary.Status), []string{
if slices.Contains([]string{
ecx.ConnectionStatusPendingDelete,
ecx.ConnectionStatusDeprovisioning,
ecx.ConnectionStatusDeprovisioned,
ecx.ConnectionStatusDeleted,
}) {
}, ecx.StringValue(primary.Status)) {
d.SetId("")
return diags
}
Expand Down
3 changes: 2 additions & 1 deletion equinix/resource_network_device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"log"
"os"
"path/filepath"
"slices"
"time"

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