From 0f0d6dc51fe7a1a5f625ed03f402cb960acb98a6 Mon Sep 17 00:00:00 2001 From: Ryan Turner Date: Wed, 12 Apr 2023 17:59:52 -0700 Subject: [PATCH] Use latest version of github.com/gofrs/uuid (#4070) v5.0.0 has no changes since v4.4.0 except to support Go modules. Migrate to it so we can get PR bumps generated by dependabot since it is a major version bump. Signed-off-by: Ryan Turner --- go.mod | 2 +- go.sum | 4 ++-- pkg/server/api/agent/v1/service.go | 2 +- pkg/server/api/middleware/authorization.go | 2 +- pkg/server/datastore/sqlstore/sqlstore.go | 2 +- pkg/server/plugin/keymanager/awskms/awskms.go | 2 +- pkg/server/plugin/keymanager/gcpkms/gcpkms.go | 2 +- pkg/server/plugin/nodeattestor/k8ssat/sat.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f7c6d8d29c..5214e91dcd 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/docker/docker v23.0.3+incompatible github.com/envoyproxy/go-control-plane v0.11.0 github.com/go-sql-driver/mysql v1.7.0 - github.com/gofrs/uuid v4.4.0+incompatible + github.com/gofrs/uuid/v5 v5.0.0 github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.5.9 github.com/google/go-containerregistry v0.14.0 diff --git a/go.sum b/go.sum index db28770b5a..5081fda277 100644 --- a/go.sum +++ b/go.sum @@ -1164,8 +1164,8 @@ github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= -github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M= +github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= diff --git a/pkg/server/api/agent/v1/service.go b/pkg/server/api/agent/v1/service.go index c0794f1deb..7df3ddb4be 100644 --- a/pkg/server/api/agent/v1/service.go +++ b/pkg/server/api/agent/v1/service.go @@ -8,7 +8,7 @@ import ( "time" "github.com/andres-erbsen/clock" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffeid" agentv1 "github.com/spiffe/spire-api-sdk/proto/spire/api/server/agent/v1" diff --git a/pkg/server/api/middleware/authorization.go b/pkg/server/api/middleware/authorization.go index 1ceca253d9..2a6986b3f5 100644 --- a/pkg/server/api/middleware/authorization.go +++ b/pkg/server/api/middleware/authorization.go @@ -3,7 +3,7 @@ package middleware import ( "context" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffeid" "github.com/spiffe/spire-api-sdk/proto/spire/api/types" diff --git a/pkg/server/datastore/sqlstore/sqlstore.go b/pkg/server/datastore/sqlstore/sqlstore.go index 1be81635c9..6bb718a4bd 100644 --- a/pkg/server/datastore/sqlstore/sqlstore.go +++ b/pkg/server/datastore/sqlstore/sqlstore.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/hashicorp/hcl" "github.com/jinzhu/gorm" "github.com/sirupsen/logrus" diff --git a/pkg/server/plugin/keymanager/awskms/awskms.go b/pkg/server/plugin/keymanager/awskms/awskms.go index 612d82d83c..60b250dc51 100644 --- a/pkg/server/plugin/keymanager/awskms/awskms.go +++ b/pkg/server/plugin/keymanager/awskms/awskms.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" "github.com/aws/aws-sdk-go-v2/service/sts" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/hashicorp/go-hclog" "github.com/hashicorp/hcl" keymanagerv1 "github.com/spiffe/spire-plugin-sdk/proto/spire/plugin/server/keymanager/v1" diff --git a/pkg/server/plugin/keymanager/gcpkms/gcpkms.go b/pkg/server/plugin/keymanager/gcpkms/gcpkms.go index 39d7c55cdc..65b947ecdb 100644 --- a/pkg/server/plugin/keymanager/gcpkms/gcpkms.go +++ b/pkg/server/plugin/keymanager/gcpkms/gcpkms.go @@ -19,7 +19,7 @@ import ( "cloud.google.com/go/iam/apiv1/iampb" "cloud.google.com/go/kms/apiv1/kmspb" "github.com/andres-erbsen/clock" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/hashicorp/go-hclog" "github.com/hashicorp/hcl" keymanagerv1 "github.com/spiffe/spire-plugin-sdk/proto/spire/plugin/server/keymanager/v1" diff --git a/pkg/server/plugin/nodeattestor/k8ssat/sat.go b/pkg/server/plugin/nodeattestor/k8ssat/sat.go index e3496a8f69..1cc082c301 100644 --- a/pkg/server/plugin/nodeattestor/k8ssat/sat.go +++ b/pkg/server/plugin/nodeattestor/k8ssat/sat.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/hcl" nodeattestorv1 "github.com/spiffe/spire-plugin-sdk/proto/spire/plugin/server/nodeattestor/v1"