From 9842ec07f1ce743f592825e0c85d670e0f6d67f4 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 2 Aug 2021 19:30:09 +0200 Subject: [PATCH] use only github.com/google/uuid for uuid generation (#1604) --- CHANGELOG.md | 2 ++ go.mod | 2 +- internal/mgrutils/reports.go | 7 ++----- internal/proxy/clientgo_cached_proxy_resolver_test.go | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d57de5ef4..7ccfd92ee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,8 @@ flag has been deprecated and will no longer have any effect, it will be removed in a later release. [#1304](https://github.com/Kong/kubernetes-ingress-controller/issues/1304) +- The uuid generation is now done by the same library in the whole project +[#1604](https://github.com/Kong/kubernetes-ingress-controller/issues/1604) ## [2.0.0-alpha.2] - 2021/07/07 diff --git a/go.mod b/go.mod index ed19bb2162..ad877eb59b 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v0.4.0 github.com/google/uuid v1.3.0 - github.com/hashicorp/go-uuid v1.0.2 + github.com/hashicorp/go-uuid v1.0.2 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/kong/deck v1.7.0 github.com/kong/go-kong v0.20.0 diff --git a/internal/mgrutils/reports.go b/internal/mgrutils/reports.go index dc2df89c41..9cd89a384d 100644 --- a/internal/mgrutils/reports.go +++ b/internal/mgrutils/reports.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/go-uuid" + "github.com/google/uuid" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" @@ -28,10 +28,7 @@ func RunReport(ctx context.Context, kubeCfg *rest.Config, kongCfg sendconfig.Kon } // create a universal unique identifier for this system - uuid, err := uuid.GenerateUUID() - if err != nil { - return fmt.Errorf("failed to generate a random uuid: %w", err) - } + uuid := uuid.NewString() // record the current Kubernetes server version kc, err := kubernetes.NewForConfig(kubeCfg) diff --git a/internal/proxy/clientgo_cached_proxy_resolver_test.go b/internal/proxy/clientgo_cached_proxy_resolver_test.go index b2c60e80ea..b28d27a5ee 100644 --- a/internal/proxy/clientgo_cached_proxy_resolver_test.go +++ b/internal/proxy/clientgo_cached_proxy_resolver_test.go @@ -119,7 +119,7 @@ func TestCaching(t *testing.T) { t.Log("generating 10 new objects to the proxy cache server") testObjects := make([]client.Object, 10) for i := 0; i < 10; i++ { - name := uuid.New().String() + name := uuid.NewString() deployment := generators.NewDeploymentForContainer(generators.NewContainer(name, name, 8080)) service := generators.NewServiceForDeployment(deployment, corev1.ServiceTypeClusterIP) ingress := generators.NewIngressForService("/testing", nil, service)