Replaces use of sort.IsSorted

hashicorp · Oct 30, 2024 · ffd816a · ffd816a
1 parent 659b5f6
commit ffd816a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.ci/semgrep/stdlib/sort.yml b/.ci/semgrep/stdlib/sort.yml
@@ -44,3 +44,9 @@ rules:
             - pattern: StringsAreSorted
     fix: slices.IsSorted($X)
     severity: WARNING
+
+  - id: prefer-slices-issortedfunc
+    languages: [go]
+    message: Prefer slices.IsSortedFunc to sort.IsSorted
+    pattern: sort.IsSorted($X)
+    severity: WARNING
diff --git a/internal/service/meta/ip_ranges_data_source_test.go b/internal/service/meta/ip_ranges_data_source_test.go
@@ -6,7 +6,7 @@ package meta_test
 import (
 	"fmt"
 	"net"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -169,7 +169,6 @@ func testAccIPRangesCheckCIDRBlocksAttribute(name, attribute string) resource.Te
 
 		var (
 			cidrBlockSize int
-			cidrBlocks    sort.StringSlice
 			err           error
 		)
 
@@ -181,8 +180,7 @@ func testAccIPRangesCheckCIDRBlocksAttribute(name, attribute string) resource.Te
 			return fmt.Errorf("%s for eu-west-1 seem suspiciously low: %d", attribute, cidrBlockSize) // lintignore:AWSAT003
 		}
 
-		cidrBlocks = make([]string, cidrBlockSize)
-
+		cidrBlocks := make([]string, cidrBlockSize)
 		for i := range cidrBlocks {
 			cidrBlock := a[fmt.Sprintf("%s.%d", attribute, i)]
 
@@ -194,8 +192,8 @@ func testAccIPRangesCheckCIDRBlocksAttribute(name, attribute string) resource.Te
 			cidrBlocks[i] = cidrBlock
 		}
 
-		if !sort.IsSorted(cidrBlocks) {
-			return fmt.Errorf("unexpected order of %s: %s", attribute, cidrBlocks)
+		if !slices.IsSorted(cidrBlocks) {
+			return fmt.Errorf("expected %s to be sorted: %s", attribute, cidrBlocks)
 		}
 
 		return nil