From 43d1a9e5fc2a8cb073da8444d0e3672df8df6ac2 Mon Sep 17 00:00:00 2001 From: Kanika Rana Date: Mon, 22 Apr 2024 12:28:27 -0400 Subject: [PATCH] upgrade uuid to v5 --- go.mod | 1 + go.sum | 2 ++ pkg/notification/notification_builder.go | 2 +- pkg/notification/notification_builder_test.go | 2 +- pkg/template/nstemplatetiers/nstemplatetier_generator_test.go | 2 +- pkg/test/auth/tokenmanager.go | 2 +- pkg/test/auth/tokenmanager_test.go | 2 +- pkg/test/client_test.go | 2 +- pkg/test/env_test.go | 2 +- pkg/test/spacebindingrequest/spacebindingrequest.go | 2 +- pkg/test/usersignup/usersignup.go | 2 +- 11 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index ee0121e4..b4a54e35 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( require ( github.com/ghodss/yaml v1.0.0 + github.com/gofrs/uuid/v5 v5.1.0 github.com/google/go-cmp v0.5.9 github.com/google/go-github/v52 v52.0.0 github.com/migueleliasweb/go-github-mock v0.0.18 diff --git a/go.sum b/go.sum index 7bbee26e..cfc09d03 100644 --- a/go.sum +++ b/go.sum @@ -218,6 +218,8 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk= +github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= diff --git a/pkg/notification/notification_builder.go b/pkg/notification/notification_builder.go index 5cc9d440..ebd38e65 100644 --- a/pkg/notification/notification_builder.go +++ b/pkg/notification/notification_builder.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/pkg/notification/notification_builder_test.go b/pkg/notification/notification_builder_test.go index d617242c..7f18a087 100644 --- a/pkg/notification/notification_builder_test.go +++ b/pkg/notification/notification_builder_test.go @@ -10,7 +10,7 @@ import ( testusersignup "github.com/codeready-toolchain/toolchain-common/pkg/test/usersignup" runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/template/nstemplatetiers/nstemplatetier_generator_test.go b/pkg/template/nstemplatetiers/nstemplatetier_generator_test.go index efcc7f04..8ae996ae 100644 --- a/pkg/template/nstemplatetiers/nstemplatetier_generator_test.go +++ b/pkg/template/nstemplatetiers/nstemplatetier_generator_test.go @@ -21,7 +21,7 @@ import ( runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" "github.com/ghodss/yaml" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" templatev1 "github.com/openshift/api/template/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/test/auth/tokenmanager.go b/pkg/test/auth/tokenmanager.go index db0d8f07..62dc2215 100644 --- a/pkg/test/auth/tokenmanager.go +++ b/pkg/test/auth/tokenmanager.go @@ -13,7 +13,7 @@ import ( "strings" "time" - uuid "github.com/gofrs/uuid" + uuid "github.com/gofrs/uuid/v5" "github.com/golang-jwt/jwt/v5" "github.com/lestrrat-go/jwx/jwk" "github.com/pkg/errors" diff --git a/pkg/test/auth/tokenmanager_test.go b/pkg/test/auth/tokenmanager_test.go index 7037a94c..659d8eef 100644 --- a/pkg/test/auth/tokenmanager_test.go +++ b/pkg/test/auth/tokenmanager_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - uuid "github.com/gofrs/uuid" + uuid "github.com/gofrs/uuid/v5" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" jose "gopkg.in/square/go-jose.v2" diff --git a/pkg/test/client_test.go b/pkg/test/client_test.go index b42ca835..1b159bb7 100644 --- a/pkg/test/client_test.go +++ b/pkg/test/client_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/test/env_test.go b/pkg/test/env_test.go index e99bdf93..6a4f4638 100644 --- a/pkg/test/env_test.go +++ b/pkg/test/env_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/magiconair/properties/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/test/spacebindingrequest/spacebindingrequest.go b/pkg/test/spacebindingrequest/spacebindingrequest.go index cab78e27..e47f05ba 100644 --- a/pkg/test/spacebindingrequest/spacebindingrequest.go +++ b/pkg/test/spacebindingrequest/spacebindingrequest.go @@ -5,7 +5,7 @@ import ( toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1" "github.com/codeready-toolchain/toolchain-common/pkg/condition" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/pkg/test/usersignup/usersignup.go b/pkg/test/usersignup/usersignup.go index 61e41ddb..3c75e875 100644 --- a/pkg/test/usersignup/usersignup.go +++ b/pkg/test/usersignup/usersignup.go @@ -10,7 +10,7 @@ import ( "github.com/codeready-toolchain/toolchain-common/pkg/states" "github.com/codeready-toolchain/toolchain-common/pkg/test" "github.com/codeready-toolchain/toolchain-common/pkg/usersignup" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" )