diff --git a/go.mod b/go.mod index 1ae3db508..dce1253a2 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,6 @@ require ( go.opentelemetry.io/otel/sdk v1.32.0 go.opentelemetry.io/otel/sdk/metric v1.32.0 go.opentelemetry.io/otel/trace v1.32.0 - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 golang.org/x/net v0.31.0 golang.org/x/sync v0.9.0 google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 @@ -104,6 +103,7 @@ require ( github.com/shirou/gopsutil/v4 v4.24.10 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/time v0.7.0 // indirect google.golang.org/api v0.203.0 // indirect diff --git a/internal/engines/subjectFilter.go b/internal/engines/subjectFilter.go index e814807b6..7f879d263 100644 --- a/internal/engines/subjectFilter.go +++ b/internal/engines/subjectFilter.go @@ -4,13 +4,12 @@ import ( "context" "errors" "fmt" + "slices" "strings" "sync" "github.com/google/cel-go/cel" - "golang.org/x/exp/slices" - "github.com/Permify/permify/internal/schema" "github.com/Permify/permify/internal/storage" storageContext "github.com/Permify/permify/internal/storage/context" diff --git a/internal/engines/subjectPermission.go b/internal/engines/subjectPermission.go index c33b89615..065298c22 100644 --- a/internal/engines/subjectPermission.go +++ b/internal/engines/subjectPermission.go @@ -3,10 +3,9 @@ package engines import ( "context" "errors" + "slices" "sync" - "golang.org/x/exp/slices" - "github.com/Permify/permify/internal/invoke" "github.com/Permify/permify/internal/storage" base "github.com/Permify/permify/pkg/pb/base/v1" diff --git a/internal/storage/context/attributes.go b/internal/storage/context/attributes.go index 37ed9dd10..428471ddb 100644 --- a/internal/storage/context/attributes.go +++ b/internal/storage/context/attributes.go @@ -1,10 +1,9 @@ package context import ( + "slices" "sort" - "golang.org/x/exp/slices" - "github.com/Permify/permify/internal/storage/context/utils" "github.com/Permify/permify/pkg/database" base "github.com/Permify/permify/pkg/pb/base/v1" diff --git a/internal/storage/context/tuples.go b/internal/storage/context/tuples.go index b50b613e2..6438663fd 100644 --- a/internal/storage/context/tuples.go +++ b/internal/storage/context/tuples.go @@ -1,10 +1,9 @@ package context import ( + "slices" "sort" - "golang.org/x/exp/slices" - "github.com/Permify/permify/internal/storage/context/utils" "github.com/Permify/permify/pkg/database" base "github.com/Permify/permify/pkg/pb/base/v1" diff --git a/internal/storage/context/tuples_test.go b/internal/storage/context/tuples_test.go index 7d4b17bc2..c3c3ca811 100644 --- a/internal/storage/context/tuples_test.go +++ b/internal/storage/context/tuples_test.go @@ -1,10 +1,9 @@ package context import ( + "slices" "testing" - "golang.org/x/exp/slices" - "github.com/Permify/permify/pkg/database" base "github.com/Permify/permify/pkg/pb/base/v1" "github.com/Permify/permify/pkg/tuple" diff --git a/internal/storage/memory/dataReader.go b/internal/storage/memory/dataReader.go index 826d98bf8..67429b791 100644 --- a/internal/storage/memory/dataReader.go +++ b/internal/storage/memory/dataReader.go @@ -3,12 +3,11 @@ package memory import ( "context" "errors" + "slices" "sort" "strconv" "time" - "golang.org/x/exp/slices" - "github.com/hashicorp/go-memdb" "github.com/Permify/permify/internal/storage/memory/constants" diff --git a/internal/storage/memory/utils/filter.go b/internal/storage/memory/utils/filter.go index a885c8f71..e0559c9ca 100644 --- a/internal/storage/memory/utils/filter.go +++ b/internal/storage/memory/utils/filter.go @@ -1,8 +1,9 @@ package utils import ( + "slices" + "github.com/hashicorp/go-memdb" - "golang.org/x/exp/slices" "github.com/Permify/permify/internal/storage" base "github.com/Permify/permify/pkg/pb/base/v1" diff --git a/internal/storage/postgres/utils/common.go b/internal/storage/postgres/utils/common.go index af3737937..92446ae1c 100644 --- a/internal/storage/postgres/utils/common.go +++ b/internal/storage/postgres/utils/common.go @@ -6,11 +6,11 @@ import ( "fmt" "log/slog" "math" + "math/rand/v2" "strings" "time" "go.opentelemetry.io/otel/codes" - "golang.org/x/exp/rand" "go.opentelemetry.io/otel/trace" diff --git a/pkg/database/postgres/postgres.go b/pkg/database/postgres/postgres.go index 7cd4ff53d..174802353 100644 --- a/pkg/database/postgres/postgres.go +++ b/pkg/database/postgres/postgres.go @@ -3,6 +3,7 @@ package postgres import ( "context" "fmt" + "log/slog" "strings" "time" @@ -10,8 +11,6 @@ import ( "github.com/exaring/otelpgx" - "golang.org/x/exp/slog" - "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" diff --git a/pkg/development/coverage/coverage.go b/pkg/development/coverage/coverage.go index 56d17485c..f9efc86c5 100644 --- a/pkg/development/coverage/coverage.go +++ b/pkg/development/coverage/coverage.go @@ -2,8 +2,7 @@ package coverage import ( "fmt" - - "golang.org/x/exp/slices" + "slices" "github.com/Permify/permify/pkg/attribute" "github.com/Permify/permify/pkg/development/file" diff --git a/pkg/tuple/tuple.go b/pkg/tuple/tuple.go index ddc84404b..26ede9ff6 100644 --- a/pkg/tuple/tuple.go +++ b/pkg/tuple/tuple.go @@ -3,10 +3,9 @@ package tuple import ( "errors" "fmt" + "slices" "strings" - "golang.org/x/exp/slices" - base "github.com/Permify/permify/pkg/pb/base/v1" )