From d171630071ae5202f63ec783e3d30e5b3a4fc63c Mon Sep 17 00:00:00 2001 From: Kise Ryota Date: Sun, 12 Jul 2026 09:44:50 +0900 Subject: [PATCH] refactor: use stdlib maps and slices instead of golang.org/x/exp Signed-off-by: Kise Ryota --- go.mod | 2 +- internal/gatewayapi/resource/defaulter.go | 2 +- internal/gatewayapi/translator.go | 2 +- internal/infrastructure/kubernetes/proxy/resource_provider.go | 2 +- .../infrastructure/kubernetes/ratelimit/resource_provider.go | 2 +- internal/provider/kubernetes/kubernetes_test.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1912d72dc9..dcdec5d310 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,6 @@ require ( go.opentelemetry.io/otel/trace v1.44.0 go.opentelemetry.io/proto/otlp v1.10.0 go.uber.org/zap v1.28.0 - golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f golang.org/x/sync v0.21.0 gomodules.xyz/jsonpatch/v2 v2.5.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa @@ -263,6 +262,7 @@ require ( go.yaml.in/yaml/v2 v2.4.4 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.53.0 // indirect + golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect golang.org/x/mod v0.37.0 // indirect golang.org/x/net v0.56.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect diff --git a/internal/gatewayapi/resource/defaulter.go b/internal/gatewayapi/resource/defaulter.go index d5bbe1107b..813688ff3a 100644 --- a/internal/gatewayapi/resource/defaulter.go +++ b/internal/gatewayapi/resource/defaulter.go @@ -9,6 +9,7 @@ import ( "encoding/json" "errors" "fmt" + "maps" "path" "sort" "strings" @@ -18,7 +19,6 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/validate" "github.com/go-openapi/validate/post" - "golang.org/x/exp/maps" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go index b713dd1839..56ff519b83 100644 --- a/internal/gatewayapi/translator.go +++ b/internal/gatewayapi/translator.go @@ -9,8 +9,8 @@ import ( "encoding/json" "errors" "fmt" + "maps" - "golang.org/x/exp/maps" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" diff --git a/internal/infrastructure/kubernetes/proxy/resource_provider.go b/internal/infrastructure/kubernetes/proxy/resource_provider.go index f236de53c6..1c0fb9440c 100644 --- a/internal/infrastructure/kubernetes/proxy/resource_provider.go +++ b/internal/infrastructure/kubernetes/proxy/resource_provider.go @@ -8,10 +8,10 @@ package proxy import ( "context" "fmt" + "maps" "strconv" "time" - "golang.org/x/exp/maps" appsv1 "k8s.io/api/apps/v1" autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" diff --git a/internal/infrastructure/kubernetes/ratelimit/resource_provider.go b/internal/infrastructure/kubernetes/ratelimit/resource_provider.go index 7fea3d1a9f..e384ba8834 100644 --- a/internal/infrastructure/kubernetes/ratelimit/resource_provider.go +++ b/internal/infrastructure/kubernetes/ratelimit/resource_provider.go @@ -7,9 +7,9 @@ package ratelimit import ( _ "embed" + "maps" "strconv" - "golang.org/x/exp/maps" appsv1 "k8s.io/api/apps/v1" autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" diff --git a/internal/provider/kubernetes/kubernetes_test.go b/internal/provider/kubernetes/kubernetes_test.go index e7af934f8d..d09cc049ee 100644 --- a/internal/provider/kubernetes/kubernetes_test.go +++ b/internal/provider/kubernetes/kubernetes_test.go @@ -11,11 +11,11 @@ import ( "context" "os" "path/filepath" + "slices" "testing" "time" "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"