From 0d4adff8e519200755e70b96eedd21d0994e3f54 Mon Sep 17 00:00:00 2001 From: ashish sonam Date: Wed, 7 Feb 2024 23:44:07 +0530 Subject: [PATCH 1/2] common-lib version upgrade --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go | 4 +--- vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go | 2 +- vendor/modules.txt | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 55d5e292f4..db52506420 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/deckarep/golang-set v1.8.0 github.com/devtron-labs/authenticator v0.4.33 - github.com/devtron-labs/common-lib v0.0.12 + github.com/devtron-labs/common-lib v0.0.14-beta3 github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb github.com/evanphx/json-patch v5.6.0+incompatible github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 diff --git a/go.sum b/go.sum index 0c8c76b200..c333b69370 100644 --- a/go.sum +++ b/go.sum @@ -224,8 +224,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADG github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/devtron-labs/authenticator v0.4.33 h1:FpAV3ZgFluaRFcMwPpwxr/mwSipJ16XRvgABq3BzP5Y= github.com/devtron-labs/authenticator v0.4.33/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU= -github.com/devtron-labs/common-lib v0.0.12 h1:HirqTWtaXWPbfGeqQurjtn26b2Az7sMFZ1JAAz2koNM= -github.com/devtron-labs/common-lib v0.0.12/go.mod h1:95/DizzVXu1kHap/VwEvdxwgd+BvPVYc0bJzt8yqGDU= +github.com/devtron-labs/common-lib v0.0.14-beta3 h1:AGLe3wC2IzfRLxyP0OzFIsgeo3TyrhmkFFWEXCB5iPI= +github.com/devtron-labs/common-lib v0.0.14-beta3/go.mod h1:95/DizzVXu1kHap/VwEvdxwgd+BvPVYc0bJzt8yqGDU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb h1:CkfQQgZc950/hTPqtQSiHV2RmZgkBLGCzwR02FZYjAU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb/go.mod h1:pjLjgoa1GzbkOkvbMyP4SAKsaiK7eG6GoQCNauG03JA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= diff --git a/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go b/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go index cb183b6608..1900c5452a 100644 --- a/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go +++ b/vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go @@ -130,7 +130,7 @@ type K8sService interface { PatchResourceRequest(ctx context.Context, restConfig *rest.Config, pt types.PatchType, manifest string, name string, namespace string, gvk schema.GroupVersionKind) (*ManifestResponse, error) GetResourceList(ctx context.Context, restConfig *rest.Config, gvk schema.GroupVersionKind, namespace string) (*ResourceListResponse, bool, error) GetResourceIfWithAcceptHeader(restConfig *rest.Config, groupVersionKind schema.GroupVersionKind) (resourceIf dynamic.NamespaceableResourceInterface, namespaced bool, err error) - GetPodLogs(ctx context.Context, restConfig *rest.Config, name string, namespace string, sinceTime *metav1.Time, tailLines int, follow bool, containerName string, isPrevContainerLogsEnabled bool) (io.ReadCloser, error) + GetPodLogs(ctx context.Context, restConfig *rest.Config, name string, namespace string, sinceTime *metav1.Time, tailLines int, sinceSeconds int, follow bool, containerName string, isPrevContainerLogsEnabled bool) (io.ReadCloser, error) ListEvents(restConfig *rest.Config, namespace string, groupVersionKind schema.GroupVersionKind, ctx context.Context, name string) (*v1.EventList, error) GetResourceIf(restConfig *rest.Config, groupVersionKind schema.GroupVersionKind) (resourceIf dynamic.NamespaceableResourceInterface, namespaced bool, err error) FetchConnectionStatusForCluster(k8sClientSet *kubernetes.Clientset) error @@ -1490,7 +1490,6 @@ func (impl *K8sServiceImpl) DeleteResource(ctx context.Context, restConfig *rest if len(namespace) > 0 && namespaced { obj, err = resourceIf.Namespace(namespace).Get(ctx, name, metav1.GetOptions{}) if err != nil { - err = &utils.ApiError{Code: "404", HttpStatusCode: 404, UserMessage: "error on getting resource"} impl.logger.Errorw("error in getting resource", "err", err, "resource", name, "namespace", namespace) return nil, err } @@ -1498,7 +1497,6 @@ func (impl *K8sServiceImpl) DeleteResource(ctx context.Context, restConfig *rest } else { obj, err = resourceIf.Get(ctx, name, metav1.GetOptions{}) if err != nil { - err = &utils.ApiError{Code: "404", HttpStatusCode: 404, UserMessage: "error on getting resource"} impl.logger.Errorw("error in getting resource", "err", err, "resource", name, "namespace", namespace) return nil, err } diff --git a/vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go b/vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go index 8333cc92c0..75938f4ff7 100644 --- a/vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go +++ b/vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go @@ -77,7 +77,7 @@ type K8sRequestBean struct { ResourceIdentifier ResourceIdentifier `json:"resourceIdentifier"` Patch string `json:"patch,omitempty"` PodLogsRequest PodLogsRequest `json:"podLogsRequest,omitempty"` - ForceDelete bool `json:"-"` + ForceDelete bool `json:"forceDelete,omitempty"` } type GetAllApiResourcesResponse struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index b7677d4c39..bfb9699a5c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -373,7 +373,7 @@ github.com/devtron-labs/authenticator/jwt github.com/devtron-labs/authenticator/middleware github.com/devtron-labs/authenticator/oidc github.com/devtron-labs/authenticator/password -# github.com/devtron-labs/common-lib v0.0.12 +# github.com/devtron-labs/common-lib v0.0.14-beta3 ## explicit; go 1.20 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/cloud-provider-identifier From c9a374b3af26ee33ceecc953a96b03731d796702 Mon Sep 17 00:00:00 2001 From: ashish sonam Date: Mon, 4 Mar 2024 15:58:33 +0530 Subject: [PATCH 2/2] common-lib upgrade --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7bc30928fb..566c33b3d0 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/deckarep/golang-set v1.8.0 github.com/devtron-labs/authenticator v0.4.33 - github.com/devtron-labs/common-lib v0.0.14-beta3 + github.com/devtron-labs/common-lib v0.0.16-0.20240304102639-17132681584e github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb github.com/evanphx/json-patch v5.6.0+incompatible github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 diff --git a/go.sum b/go.sum index bd5852ceb2..21ee4a022c 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,8 @@ github.com/devtron-labs/authenticator v0.4.33 h1:FpAV3ZgFluaRFcMwPpwxr/mwSipJ16X github.com/devtron-labs/authenticator v0.4.33/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU= github.com/devtron-labs/common-lib v0.0.14-beta3 h1:AGLe3wC2IzfRLxyP0OzFIsgeo3TyrhmkFFWEXCB5iPI= github.com/devtron-labs/common-lib v0.0.14-beta3/go.mod h1:95/DizzVXu1kHap/VwEvdxwgd+BvPVYc0bJzt8yqGDU= +github.com/devtron-labs/common-lib v0.0.16-0.20240304102639-17132681584e h1:tUOhs588RN0TbWF2u5w4NbR7epqzMZ2/0doBXD80MzY= +github.com/devtron-labs/common-lib v0.0.16-0.20240304102639-17132681584e/go.mod h1:95/DizzVXu1kHap/VwEvdxwgd+BvPVYc0bJzt8yqGDU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb h1:CkfQQgZc950/hTPqtQSiHV2RmZgkBLGCzwR02FZYjAU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb/go.mod h1:pjLjgoa1GzbkOkvbMyP4SAKsaiK7eG6GoQCNauG03JA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=