chore: Bump go to 1.21 (#2267)

* Bump go to 1.21.5

* Use x.y go version in go.mod

Makefile

@@ -10,7 +10,7 @@ export TERRAFORM_PLUGIN_LOCAL_INSTALL=$(TERRAFORM_PLUGINS_DIR)/$(BASE_BINARY_NAM
 default: help
 
 dev-setup: ## setup development dependencies
-	@which ./bin/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.53.3
+	@which ./bin/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.55.2
 	cd tools && mkdir -p bin/
 	cd tools && env GOBIN=$$PWD/bin go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
 	cd tools && env GOBIN=$$PWD/bin go install mvdan.cc/gofumpt
@@ -46,7 +46,7 @@ lint-fix: ## Run static code analysis, check formatting and try to fix findings
 	./bin/golangci-lint run ./... -v --fix
 
 mod: ## add missing and remove unused modules
-	go mod tidy -compat=1.20
+	go mod tidy -compat=1.21
 
 mod-check: mod ## check if there are any missing/unused modules
 	git diff --exit-code -- go.mod go.sum

go.mod

@@ -1,6 +1,6 @@
 module github.com/Snowflake-Labs/terraform-provider-snowflake
 
-go 1.20
+go 1.21
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
@@ -25,7 +25,6 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
 	golang.org/x/crypto v0.16.0
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
 	golang.org/x/text v0.14.0
 )
 
@@ -118,6 +117,7 @@ require (
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	github.com/zclconf/go-cty v1.14.1 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect

pkg/resources/database.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 var databaseSchema = map[string]*schema.Schema{

pkg/resources/failover_group.go

@@ -5,14 +5,12 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"golang.org/x/exp/slices"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 var failoverGroupSchema = map[string]*schema.Schema{

pkg/resources/grant_privileges_to_role.go

@@ -5,14 +5,14 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"slices"
 	"strings"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/logging"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"golang.org/x/exp/slices"
 )
 
 var grantPrivilegesToRoleSchema = map[string]*schema.Schema{

pkg/resources/helper_expansion.go

@@ -1,6 +1,6 @@
 package resources
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 // borrowed from https://github.com/terraform-providers/terraform-provider-aws/blob/master/aws/structure.go#L924:6
 

pkg/resources/helpers.go

@@ -126,7 +126,7 @@ func GetPropertyAsPointer[T any](d *schema.ResourceData, property string) *T {
 	return &typedValue
 }
 
-func IsDataType() schema.SchemaValidateFunc {
+func IsDataType() schema.SchemaValidateFunc { //nolint:staticcheck
 	return func(value any, key string) (warnings []string, errors []error) {
 		stringValue, ok := value.(string)
 		if !ok {

pkg/resources/procedure.go

@@ -5,13 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"slices"
 	"strings"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-
-	"golang.org/x/exp/slices"
 )
 
 var procedureLanguages = []string{"javascript", "java", "scala", "SQL", "python"}

pkg/resources/role_grants.go

@@ -6,16 +6,15 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"slices"
 	"strings"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/jmoiron/sqlx"
 	"github.com/snowflakedb/gosnowflake"
-	"golang.org/x/exp/slices"
 )
 
 func RoleGrants() *schema.Resource {

pkg/resources/table.go

@@ -7,13 +7,12 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"slices"
 	"strings"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-
-	"golang.org/x/exp/slices"
 )
 
 const (

pkg/resources/task.go

@@ -5,15 +5,14 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"slices"
 	"strconv"
 	"time"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-
-	"golang.org/x/exp/slices"
 )
 
 var taskSchema = map[string]*schema.Schema{

pkg/sdk/client.go

@@ -6,11 +6,10 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"slices"
 
 	"github.com/jmoiron/sqlx"
 	"github.com/luna-duclos/instrumentedsql"
-	"golang.org/x/exp/slices"
-
 	"github.com/snowflakedb/gosnowflake"
 )
 

pkg/sdk/data_types.go

@@ -2,9 +2,8 @@ package sdk
 
 import (
 	"fmt"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 // DataType is based on https://docs.snowflake.com/en/sql-reference/intro-summary-data-types.

pkg/sdk/failover_groups.go

@@ -4,10 +4,9 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"slices"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 var _ FailoverGroups = (*failoverGroups)(nil)

pkg/sdk/file_format.go

@@ -5,11 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 var (

pkg/sdk/grants_validations.go

@@ -3,9 +3,7 @@ package sdk
 import (
 	"errors"
 	"fmt"
-
-	// TODO: change to slices with go 1.21
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var (

pkg/sdk/object_types.go

@@ -1,9 +1,8 @@
 package sdk
 
 import (
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 // Object bundles together the object type and name. Its used for DDL statements.

pkg/sdk/poc/generator/field.go

@@ -2,9 +2,8 @@ package generator
 
 import (
 	"fmt"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 // Field defines properties of a single field or struct (by defining Fields)

pkg/sdk/poc/generator/field_transformers.go

@@ -1,6 +1,6 @@
 package generator
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 type FieldTransformer interface {
 	Transform(f *Field) *Field

pkg/sdk/poc/generator/template_executors.go

@@ -5,9 +5,8 @@ import (
 	"io"
 	"log"
 	"os"
+	"slices"
 	"text/template"
-
-	"golang.org/x/exp/slices"
 )
 
 var (

pkg/sdk/sweepers.go

@@ -3,9 +3,8 @@ package sdk
 import (
 	"context"
 	"log"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 func Sweep(client *Client, prefix string) error {

pkg/sdk/tasks_impl_gen.go

@@ -3,10 +3,10 @@ package sdk
 import (
 	"context"
 	"encoding/json"
+	"slices"
 	"strings"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/internal/collections"
-	"golang.org/x/exp/slices"
 )
 
 var _ Tasks = (*tasks)(nil)

pkg/sdk/testint/failover_groups_integration_test.go

@@ -3,14 +3,14 @@ package testint
 import (
 	"log"
 	"os"
+	"slices"
 	"testing"
 	"time"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/avast/retry-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 )
 
 func TestInt_FailoverGroupsCreate(t *testing.T) {

tools/go.mod

@@ -1,6 +1,6 @@
 module tools
 
-go 1.20
+go 1.21
 
 require (
 	github.com/golangci/golangci-lint v1.55.0