Skip to content

Commit

Permalink
Merge pull request #174 from dhruv0000/dependabot/go_modules/github.c…
Browse files Browse the repository at this point in the history
…om/layer5io/meshkit-0.2.14

Bump github.com/layer5io/meshkit from 0.2.11 to 0.2.14
  • Loading branch information
kumarabd authored Jun 25, 2021
2 parents 7cf8501 + b64ef97 commit 43a3ccc
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 20 deletions.
24 changes: 12 additions & 12 deletions controllers/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []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"}, []string{err.Error()}, []string{}, []string{})
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand Down
8 changes: 4 additions & 4 deletions pkg/broker/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}, []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"}, []string{err.Error()}, []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."}, []string{reason}, []string{}, []string{})
}

func ErrConditionFalse(reason string) error {
return errors.NewDefault(ErrConditionFalseCode, reason)
return errors.New(ErrConditionFalseCode, errors.Alert, []string{"Health check condition false."}, []string{reason}, []string{}, []string{})
}

0 comments on commit 43a3ccc

Please sign in to comment.