From e428fabb945a0f50d5c4c3391d8c3b3ea06d03d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 06:18:48 +0000 Subject: [PATCH 1/4] Bump github.com/layer5io/meshkit from 0.2.11 to 0.2.14 Bumps [github.com/layer5io/meshkit](https://github.com/layer5io/meshkit) from 0.2.11 to 0.2.14. - [Release notes](https://github.com/layer5io/meshkit/releases) - [Commits](https://github.com/layer5io/meshkit/compare/v0.2.11...v0.2.14) --- updated-dependencies: - dependency-name: github.com/layer5io/meshkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9fb4009b..38d315ac 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( cloud.google.com/go v0.79.0 // indirect github.com/go-logr/logr v0.4.0 github.com/google/uuid v1.2.0 // indirect - github.com/layer5io/meshkit v0.2.11 + github.com/layer5io/meshkit v0.2.14 github.com/onsi/ginkgo v1.16.4 github.com/onsi/gomega v1.13.0 k8s.io/api v0.18.12 diff --git a/go.sum b/go.sum index 2ca57bff..1b45f652 100644 --- a/go.sum +++ b/go.sum @@ -524,8 +524,8 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/layer5io/meshkit v0.2.11 h1:hBsRmJnJFaWlMi0UJ5UPVzmLIVUFMViu4YmnQhBwZ7o= -github.com/layer5io/meshkit v0.2.11/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y= +github.com/layer5io/meshkit v0.2.14 h1:LWfTG0Xw5K+XkBVg26TOUuy/FTKh7mSWD2eh42SNeWk= +github.com/layer5io/meshkit v0.2.14/go.mod h1:QPtkxJOzaLMCEcb77+HJ4ig14rV7sVP2zK6LVVZG/Ng= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY= @@ -746,8 +746,9 @@ github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -757,6 +758,7 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= From cccf790973ea68dcedefeecca4be11f049379be4 Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Fri, 25 Jun 2021 18:09:58 +0530 Subject: [PATCH 2/4] Updated Meshkit errors Signed-off-by: dhruv0000 --- pkg/broker/error.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/broker/error.go b/pkg/broker/error.go index eb33aa2a..ebda9cb0 100644 --- a/pkg/broker/error.go +++ b/pkg/broker/error.go @@ -12,17 +12,17 @@ const ( ) func ErrGettingResource(err error) error { - return errors.NewDefault(ErrGettingResourceCode, "Unable to get requested resource", err.Error()) + return errors.New(ErrGettingResourceCode, errors.Alert, []string{"Unable to get requested resource" + err.Error()}, []string{"Unable to get requested resource while doing health check", err.Error()}, []string{}, []string{}) } func ErrGettingEndpoint(err error) error { - return errors.NewDefault(ErrGettingEndpointCode, "Unable to discovery endpoint", err.Error()) + return errors.New(ErrGettingEndpointCode, errors.Alert, []string{"Unable to discovery endpoint" + err.Error()}, []string{}, []string{}, []string{}) } func ErrReplicasNotReady(reason string) error { - return errors.NewDefault(ErrReplicasNotReadyCode, "Replicas not ready", reason) + return errors.New(ErrReplicasNotReadyCode, errors.Alert, []string{"Replicas not ready.", reason}, []string{}, []string{}, []string{}) } func ErrConditionFalse(reason string) error { - return errors.NewDefault(ErrConditionFalseCode, reason) + return errors.New(ErrConditionFalseCode, errors.Alert, []string{"Health check condition false.", reason}, []string{}, []string{}, []string{}) } From 031cbabc61c9430908cc44129bfae886ccef8caa Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Fri, 25 Jun 2021 18:28:52 +0530 Subject: [PATCH 3/4] Updated `meshkit` errors for `controllers` Signed-off-by: dhruv0000 --- controllers/error.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/controllers/error.go b/controllers/error.go index a089ddba..11dc4f2e 100644 --- a/controllers/error.go +++ b/controllers/error.go @@ -20,49 +20,49 @@ const ( ) func ErrGetMeshsync(err error) error { - return errors.NewDefault(ErrGetMeshsyncCode, "Meshsync resource not found", err.Error()) + return errors.New(ErrGetMeshsyncCode, errors.Alert, []string{"Meshsync resource not found", err.Error()}, []string{}, []string{}, []string{}) } func ErrCreateMeshsync(err error) error { - return errors.NewDefault(ErrCreateMeshsyncCode, "Unable to create meshsync controller", err.Error()) + return errors.New(ErrCreateMeshsyncCode, errors.Alert, []string{"Unable to create meshsync controller", err.Error()}, []string{}, []string{}, []string{}) } func ErrDeleteMeshsync(err error) error { - return errors.NewDefault(ErrDeleteMeshsyncCode, "Unable to delete meshsync controller", err.Error()) + return errors.New(ErrDeleteMeshsyncCode, errors.Alert, []string{"Unable to delete meshsync controller", err.Error()}, []string{}, []string{}, []string{}) } func ErrReconcileMeshsync(err error) error { - return errors.NewDefault(ErrReconcileMeshsyncCode, "Error during meshsync resource reconcillation", err.Error()) + return errors.New(ErrReconcileMeshsyncCode, errors.Alert, []string{"Error during meshsync resource reconcillation", err.Error()}, []string{}, []string{}, []string{}) } func ErrGetBroker(err error) error { - return errors.NewDefault(ErrGetBrokerCode, "Broker resource not found", err.Error()) + return errors.New(ErrGetBrokerCode, errors.Alert, []string{"Broker resource not found", err.Error()}, []string{}, []string{}, []string{}) } func ErrCreateBroker(err error) error { - return errors.NewDefault(ErrCreateBrokerCode, "Unable to create broker controller", err.Error()) + return errors.New(ErrCreateBrokerCode, errors.Alert, []string{"Unable to create broker controller", err.Error()}, []string{}, []string{}, []string{}) } func ErrDeleteBroker(err error) error { - return errors.NewDefault(ErrDeleteBrokerCode, "Unable to delete broker controller", err.Error()) + return errors.New(ErrDeleteBrokerCode, errors.Alert, []string{"Unable to delete broker controller", err.Error()}, []string{}, []string{}, []string{}) } func ErrReconcileBroker(err error) error { - return errors.NewDefault(ErrReconcileBrokerCode, "Error during broker resource reconcillation", err.Error()) + return errors.New(ErrReconcileBrokerCode, errors.Alert, []string{"Error during broker resource reconcillation", err.Error()}, []string{}, []string{}, []string{}) } func ErrReconcileCR(err error) error { - return errors.NewDefault(ErrReconcileCRCode, "Error during custom resource reconcillation", err.Error()) + return errors.New(ErrReconcileCRCode, errors.Alert, []string{"Error during custom resource resource reconcillation", err.Error()}, []string{}, []string{}, []string{}) } func ErrCheckHealth(err error) error { - return errors.NewDefault(ErrCheckHealthCode, "Error during health check", err.Error()) + return errors.New(ErrCheckHealthCode, errors.Alert, []string{"Error during health check", err.Error()}, []string{}, []string{}, []string{}) } func ErrGetEndpoint(err error) error { - return errors.NewDefault(ErrGetEndpointCode, "Error getting endpoint", err.Error()) + return errors.New(ErrGetEndpointCode, errors.Alert, []string{"Error gettting endpoint", err.Error()}, []string{}, []string{}, []string{}) } func ErrUpdateResource(err error) error { - return errors.NewDefault(ErrUpdateResourceCode, "Error updating resource", err.Error()) + return errors.New(ErrUpdateResourceCode, errors.Alert, []string{"Error updating Resource", err.Error()}, []string{}, []string{}, []string{}) } From b64ef97e1fbff3139e272956b5e065b411e87f4b Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Fri, 25 Jun 2021 18:53:54 +0530 Subject: [PATCH 4/4] Added Long description Signed-off-by: dhruv0000 --- controllers/error.go | 24 ++++++++++++------------ pkg/broker/error.go | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/controllers/error.go b/controllers/error.go index 11dc4f2e..c46fcf8b 100644 --- a/controllers/error.go +++ b/controllers/error.go @@ -20,49 +20,49 @@ const ( ) func ErrGetMeshsync(err error) error { - return errors.New(ErrGetMeshsyncCode, errors.Alert, []string{"Meshsync resource not found", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrGetMeshsyncCode, errors.Alert, []string{"Meshsync resource not found"}, []string{err.Error()}, []string{}, []string{}) } func ErrCreateMeshsync(err error) error { - return errors.New(ErrCreateMeshsyncCode, errors.Alert, []string{"Unable to create meshsync controller", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrCreateMeshsyncCode, errors.Alert, []string{"Unable to create meshsync controller"}, []string{err.Error()}, []string{}, []string{}) } func ErrDeleteMeshsync(err error) error { - return errors.New(ErrDeleteMeshsyncCode, errors.Alert, []string{"Unable to delete meshsync controller", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrDeleteMeshsyncCode, errors.Alert, []string{"Unable to delete meshsync controller"}, []string{err.Error()}, []string{}, []string{}) } func ErrReconcileMeshsync(err error) error { - return errors.New(ErrReconcileMeshsyncCode, errors.Alert, []string{"Error during meshsync resource reconcillation", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrReconcileMeshsyncCode, errors.Alert, []string{"Error during meshsync resource reconcillation"}, []string{err.Error()}, []string{}, []string{}) } func ErrGetBroker(err error) error { - return errors.New(ErrGetBrokerCode, errors.Alert, []string{"Broker resource not found", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrGetBrokerCode, errors.Alert, []string{"Broker resource not found"}, []string{err.Error()}, []string{}, []string{}) } func ErrCreateBroker(err error) error { - return errors.New(ErrCreateBrokerCode, errors.Alert, []string{"Unable to create broker controller", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrCreateBrokerCode, errors.Alert, []string{"Unable to create broker controller"}, []string{err.Error()}, []string{}, []string{}) } func ErrDeleteBroker(err error) error { - return errors.New(ErrDeleteBrokerCode, errors.Alert, []string{"Unable to delete broker controller", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrDeleteBrokerCode, errors.Alert, []string{"Unable to delete broker controller"}, []string{err.Error()}, []string{}, []string{}) } func ErrReconcileBroker(err error) error { - return errors.New(ErrReconcileBrokerCode, errors.Alert, []string{"Error during broker resource reconcillation", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrReconcileBrokerCode, errors.Alert, []string{"Error during broker resource reconcillation"}, []string{err.Error()}, []string{}, []string{}) } func ErrReconcileCR(err error) error { - return errors.New(ErrReconcileCRCode, errors.Alert, []string{"Error during custom resource resource reconcillation", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrReconcileCRCode, errors.Alert, []string{"Error during custom resource resource reconcillation"}, []string{err.Error()}, []string{}, []string{}) } func ErrCheckHealth(err error) error { - return errors.New(ErrCheckHealthCode, errors.Alert, []string{"Error during health check", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrCheckHealthCode, errors.Alert, []string{"Error during health check"}, []string{err.Error()}, []string{}, []string{}) } func ErrGetEndpoint(err error) error { - return errors.New(ErrGetEndpointCode, errors.Alert, []string{"Error gettting endpoint", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrGetEndpointCode, errors.Alert, []string{"Error gettting endpoint"}, []string{err.Error()}, []string{}, []string{}) } func ErrUpdateResource(err error) error { - return errors.New(ErrUpdateResourceCode, errors.Alert, []string{"Error updating Resource", err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrUpdateResourceCode, errors.Alert, []string{"Error updating Resource"}, []string{err.Error()}, []string{}, []string{}) } diff --git a/pkg/broker/error.go b/pkg/broker/error.go index ebda9cb0..12b5b683 100644 --- a/pkg/broker/error.go +++ b/pkg/broker/error.go @@ -12,17 +12,17 @@ const ( ) func ErrGettingResource(err error) error { - return errors.New(ErrGettingResourceCode, errors.Alert, []string{"Unable to get requested resource" + err.Error()}, []string{"Unable to get requested resource while doing health check", err.Error()}, []string{}, []string{}) + return errors.New(ErrGettingResourceCode, errors.Alert, []string{"Unable to get requested resource"}, []string{"Unable to get requested resource while doing health check", err.Error()}, []string{}, []string{}) } func ErrGettingEndpoint(err error) error { - return errors.New(ErrGettingEndpointCode, errors.Alert, []string{"Unable to discovery endpoint" + err.Error()}, []string{}, []string{}, []string{}) + return errors.New(ErrGettingEndpointCode, errors.Alert, []string{"Unable to discovery endpoint"}, []string{err.Error()}, []string{}, []string{}) } func ErrReplicasNotReady(reason string) error { - return errors.New(ErrReplicasNotReadyCode, errors.Alert, []string{"Replicas not ready.", reason}, []string{}, []string{}, []string{}) + return errors.New(ErrReplicasNotReadyCode, errors.Alert, []string{"Replicas not ready."}, []string{reason}, []string{}, []string{}) } func ErrConditionFalse(reason string) error { - return errors.New(ErrConditionFalseCode, errors.Alert, []string{"Health check condition false.", reason}, []string{}, []string{}, []string{}) + return errors.New(ErrConditionFalseCode, errors.Alert, []string{"Health check condition false."}, []string{reason}, []string{}, []string{}) }