From fb9b1e228ebd98dab51cb22dfcbcf81bef9d72da Mon Sep 17 00:00:00 2001 From: Gireesh Naidu Date: Thu, 22 Feb 2024 12:26:50 +0530 Subject: [PATCH 1/2] common-lib version upgrade --- go.mod | 2 +- go.sum | 4 ++-- .../common-lib/pubsub-lib/NatsClient.go | 2 +- .../common-lib/pubsub-lib/PubSubClientService.go | 16 +++++++++------- vendor/modules.txt | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 92f757156c..9363ef44e8 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.35-0.20240216091211-80e10a80ce7b - github.com/devtron-labs/common-lib v0.0.15 + github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1 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 56d63c1e17..239dca4351 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,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.35-0.20240216091211-80e10a80ce7b h1:aHKsdB4ghsp+x8167W8MZyF3WQOixTSJFyARrU+qR6s= github.com/devtron-labs/authenticator v0.4.35-0.20240216091211-80e10a80ce7b/go.mod h1:a5gxST+HNmJReXE2TkCicFQFWtlhp8eqBRwS23GydNE= -github.com/devtron-labs/common-lib v0.0.15 h1:/t+x0G4oT1WWZfBtwYOp34EdbIx5rELZkI4N6vJ0uQc= -github.com/devtron-labs/common-lib v0.0.15/go.mod h1:95/DizzVXu1kHap/VwEvdxwgd+BvPVYc0bJzt8yqGDU= +github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1 h1:w6adFVEnB7d6ifScrjVfOsdlNV6OHYdqWxCXGiK7qoM= +github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1/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/pubsub-lib/NatsClient.go b/vendor/github.com/devtron-labs/common-lib/pubsub-lib/NatsClient.go index 27a5b367c2..a25eb3dbac 100644 --- a/vendor/github.com/devtron-labs/common-lib/pubsub-lib/NatsClient.go +++ b/vendor/github.com/devtron-labs/common-lib/pubsub-lib/NatsClient.go @@ -46,7 +46,7 @@ type NatsClientConfig struct { // Note: always get this value by calling GetNatsMsgBufferSize method NatsMsgBufferSize int `env:"NATS_MSG_BUFFER_SIZE" envDefault:"-1"` NatsMsgMaxAge int `env:"NATS_MSG_MAX_AGE" envDefault:"86400"` - NatsMsgAckWaitInSecs int `env:"NATS_MSG_ACK_WAIT_IN_SECS" envDefault:"300"` + NatsMsgAckWaitInSecs int `env:"NATS_MSG_ACK_WAIT_IN_SECS" envDefault:"120"` } func (ncc NatsClientConfig) GetNatsMsgBufferSize() int { diff --git a/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go b/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go index 57a84ef932..6ccca33afa 100644 --- a/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go +++ b/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go @@ -196,13 +196,6 @@ func (impl PubSubClientServiceImpl) TryCatchCallBack(msg *nats.Msg, callback fun // call loggersFunc impl.Log(loggerFunc, msg.Subject, *subMsg) - // run validations - for _, validation := range validations { - if !validation(*subMsg) { - impl.Logger.Warnw("nats: message validation failed, not processing the message...", "subject", msg.Subject, "msg", string(msg.Data)) - return - } - } defer func() { // Acknowledge the message delivery err := msg.Ack() @@ -227,6 +220,15 @@ func (impl PubSubClientServiceImpl) TryCatchCallBack(msg *nats.Msg, callback fun return } }() + + // run validations + for _, validation := range validations { + if !validation(*subMsg) { + impl.Logger.Warnw("nats: message validation failed, not processing the message...", "subject", msg.Subject, "msg", string(msg.Data)) + return + } + } + // Process the event message callback(subMsg) } diff --git a/vendor/modules.txt b/vendor/modules.txt index f5646f739b..154d74b700 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.15 +# github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1 ## explicit; go 1.20 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/cloud-provider-identifier From e22ad95739f11ebe1a39886c495c3fd9ca6750b0 Mon Sep 17 00:00:00 2001 From: Gireesh Naidu Date: Thu, 22 Feb 2024 13:10:01 +0530 Subject: [PATCH 2/2] common-lib version upgrade --- go.mod | 2 +- go.sum | 4 +- .../pubsub-lib/PubSubClientService.go | 3 +- .../common-lib/utils/k8s/commonBean/bean.go | 60 +++++++++---------- vendor/modules.txt | 2 +- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 9363ef44e8..bb78e16150 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.35-0.20240216091211-80e10a80ce7b - github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1 + github.com/devtron-labs/common-lib v0.0.16-0.20240222073522-5e5933407116 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 239dca4351..f7a1be9a96 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,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.35-0.20240216091211-80e10a80ce7b h1:aHKsdB4ghsp+x8167W8MZyF3WQOixTSJFyARrU+qR6s= github.com/devtron-labs/authenticator v0.4.35-0.20240216091211-80e10a80ce7b/go.mod h1:a5gxST+HNmJReXE2TkCicFQFWtlhp8eqBRwS23GydNE= -github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1 h1:w6adFVEnB7d6ifScrjVfOsdlNV6OHYdqWxCXGiK7qoM= -github.com/devtron-labs/common-lib v0.0.16-0.20240220125323-1893b822a2d1/go.mod h1:95/DizzVXu1kHap/VwEvdxwgd+BvPVYc0bJzt8yqGDU= +github.com/devtron-labs/common-lib v0.0.16-0.20240222073522-5e5933407116 h1:j0Qv1UE7zuk3gL9hVuY2UtrjwDECj/YClejnIirATLw= +github.com/devtron-labs/common-lib v0.0.16-0.20240222073522-5e5933407116/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/pubsub-lib/PubSubClientService.go b/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go index 6ccca33afa..413d87310b 100644 --- a/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go +++ b/vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go @@ -15,6 +15,7 @@ import ( ) const NATS_MSG_LOG_PREFIX = "NATS_LOG" +const NATS_PANIC_MSG_LOG_PREFIX = "NATS_PANIC_LOG" type ValidateMsg func(msg model.PubSubMsg) bool @@ -210,7 +211,7 @@ func (impl PubSubClientServiceImpl) TryCatchCallBack(msg *nats.Msg, callback fun // Panic recovery handling if panicInfo := recover(); panicInfo != nil { - impl.Logger.Warnw("nats: found panic error", "subject", msg.Subject, "payload", string(msg.Data), "logs", string(debug.Stack())) + impl.Logger.Warnw(fmt.Sprintf("%s: found panic error", NATS_PANIC_MSG_LOG_PREFIX), "subject", msg.Subject, "payload", string(msg.Data), "logs", string(debug.Stack())) err = fmt.Errorf("%v\nPanic Logs:\n%s", panicInfo, string(debug.Stack())) // Publish the panic info to PANIC_ON_PROCESSING_TOPIC publishErr := impl.publishPanicError(msg, err) diff --git a/vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go b/vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go index 87e6124e10..cea57955fa 100644 --- a/vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go +++ b/vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go @@ -117,35 +117,35 @@ const ( ) // constants starts -var podsGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}, Scope: meta.RESTScopeNameNamespace} -var replicaSetGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "replicasets"}, Scope: meta.RESTScopeNameNamespace} -var jobGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "batch", Version: "v1", Resource: "jobs"}, Scope: meta.RESTScopeNameNamespace} -var endpointsGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "endpoints"}, Scope: meta.RESTScopeNameNamespace} -var endpointSliceV1Beta1GvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "discovery.k8s.io", Version: "v1beta1", Resource: "endpointslices"}, Scope: meta.RESTScopeNameNamespace} -var endpointSliceV1GvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "discovery.k8s.io", Version: "v1", Resource: "endpointslices"}, Scope: meta.RESTScopeNameNamespace} -var pvGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"}, Scope: meta.RESTScopeNameRoot} -var pvcGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumeclaims"}, Scope: meta.RESTScopeNameNamespace} -var stsGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "statefulsets"}, Scope: meta.RESTScopeNameNamespace} -var configGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}, Scope: meta.RESTScopeNameNamespace} -var hpaGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "autoscaling", Version: "v2", Resource: "horizontalpodautoscalers"}, Scope: meta.RESTScopeNameNamespace} -var deployGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}, Scope: meta.RESTScopeNameNamespace} -var serviceGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "services"}, Scope: meta.RESTScopeNameNamespace} -var daemonGvrAndScope = GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "daemonsets"}, Scope: meta.RESTScopeNameNamespace} - -var gvkVsChildGvrAndScope = map[schema.GroupVersionKind][]GvrAndScope{ - schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}: append(make([]GvrAndScope, 0), replicaSetGvrAndScope), - schema.GroupVersionKind{Group: "argoproj.io", Version: "v1alpha1", Kind: "Rollout"}: append(make([]GvrAndScope, 0), replicaSetGvrAndScope), - schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "ReplicaSet"}: append(make([]GvrAndScope, 0), podsGvrAndScope), - schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "CronJob"}: append(make([]GvrAndScope, 0), jobGvrAndScope), - schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"}: append(make([]GvrAndScope, 0), podsGvrAndScope), - schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "StatefulSet"}: append(make([]GvrAndScope, 0), podsGvrAndScope, pvcGvrAndScope, stsGvrAndScope), - schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "DaemonSet"}: append(make([]GvrAndScope, 0), podsGvrAndScope), - schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Service"}: append(make([]GvrAndScope, 0), endpointsGvrAndScope, endpointSliceV1Beta1GvrAndScope, endpointSliceV1GvrAndScope), - schema.GroupVersionKind{Group: "monitoring.coreos.com", Version: "v1", Kind: "Prometheus"}: append(make([]GvrAndScope, 0), stsGvrAndScope, configGvrAndScope), - schema.GroupVersionKind{Group: "monitoring.coreos.com", Version: "v1", Kind: "Alertmanager"}: append(make([]GvrAndScope, 0), stsGvrAndScope, configGvrAndScope), - schema.GroupVersionKind{Group: "keda.sh", Version: "v1alpha1", Kind: "ScaledObject"}: append(make([]GvrAndScope, 0), hpaGvrAndScope), - schema.GroupVersionKind{Group: "autoscaling", Version: "v2", Kind: "HorizontalPodAutoscaler"}: append(make([]GvrAndScope, 0), podsGvrAndScope), - schema.GroupVersionKind{Group: "flagger.app", Version: "v1beta1", Kind: "Canary"}: append(make([]GvrAndScope, 0), deployGvrAndScope, serviceGvrAndScope, daemonGvrAndScope), +var podsGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}, Scope: meta.RESTScopeNameNamespace} +var replicaSetGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "replicasets"}, Scope: meta.RESTScopeNameNamespace} +var jobGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "batch", Version: "v1", Resource: "jobs"}, Scope: meta.RESTScopeNameNamespace} +var endpointsGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "endpoints"}, Scope: meta.RESTScopeNameNamespace} +var endpointSliceV1Beta1GvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "discovery.k8s.io", Version: "v1beta1", Resource: "endpointslices"}, Scope: meta.RESTScopeNameNamespace} +var endpointSliceV1GvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "discovery.k8s.io", Version: "v1", Resource: "endpointslices"}, Scope: meta.RESTScopeNameNamespace} +var pvGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"}, Scope: meta.RESTScopeNameRoot} +var pvcGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumeclaims"}, Scope: meta.RESTScopeNameNamespace} +var stsGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "statefulsets"}, Scope: meta.RESTScopeNameNamespace} +var configGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}, Scope: meta.RESTScopeNameNamespace} +var hpaGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "autoscaling", Version: "v2", Resource: "horizontalpodautoscalers"}, Scope: meta.RESTScopeNameNamespace} +var deployGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}, Scope: meta.RESTScopeNameNamespace} +var serviceGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "services"}, Scope: meta.RESTScopeNameNamespace} +var daemonGvrAndScope = &GvrAndScope{Gvr: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "daemonsets"}, Scope: meta.RESTScopeNameNamespace} + +var gvkVsChildGvrAndScope = map[schema.GroupVersionKind][]*GvrAndScope{ + schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}: append(make([]*GvrAndScope, 0), replicaSetGvrAndScope), + schema.GroupVersionKind{Group: "argoproj.io", Version: "v1alpha1", Kind: "Rollout"}: append(make([]*GvrAndScope, 0), replicaSetGvrAndScope), + schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "ReplicaSet"}: append(make([]*GvrAndScope, 0), podsGvrAndScope), + schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "CronJob"}: append(make([]*GvrAndScope, 0), jobGvrAndScope), + schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"}: append(make([]*GvrAndScope, 0), podsGvrAndScope), + schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "StatefulSet"}: append(make([]*GvrAndScope, 0), podsGvrAndScope, pvcGvrAndScope, stsGvrAndScope), + schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "DaemonSet"}: append(make([]*GvrAndScope, 0), podsGvrAndScope), + schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Service"}: append(make([]*GvrAndScope, 0), endpointsGvrAndScope, endpointSliceV1Beta1GvrAndScope, endpointSliceV1GvrAndScope), + schema.GroupVersionKind{Group: "monitoring.coreos.com", Version: "v1", Kind: "Prometheus"}: append(make([]*GvrAndScope, 0), stsGvrAndScope, configGvrAndScope), + schema.GroupVersionKind{Group: "monitoring.coreos.com", Version: "v1", Kind: "Alertmanager"}: append(make([]*GvrAndScope, 0), stsGvrAndScope, configGvrAndScope), + schema.GroupVersionKind{Group: "keda.sh", Version: "v1alpha1", Kind: "ScaledObject"}: append(make([]*GvrAndScope, 0), hpaGvrAndScope), + schema.GroupVersionKind{Group: "autoscaling", Version: "v2", Kind: "HorizontalPodAutoscaler"}: append(make([]*GvrAndScope, 0), podsGvrAndScope), + schema.GroupVersionKind{Group: "flagger.app", Version: "v1beta1", Kind: "Canary"}: append(make([]*GvrAndScope, 0), deployGvrAndScope, serviceGvrAndScope, daemonGvrAndScope), } // constants end @@ -159,6 +159,6 @@ type GvrAndScope struct { // "autoscaling", "batch", "certificates.k8s.io", "coordination.k8s.io", "core", "discovery.k8s.io", "events.k8s.io", "flowcontrol.apiserver.k8s.io", "argoproj.io", // "internal.apiserver.k8s.io", "networking.k8s.io", "node.k8s.io", "policy", "rbac.authorization.k8s.io", "resource.k8s.io", "scheduling.k8s.io", "storage.k8s.io"} -func GetGvkVsChildGvrAndScope() map[schema.GroupVersionKind][]GvrAndScope { +func GetGvkVsChildGvrAndScope() map[schema.GroupVersionKind][]*GvrAndScope { return gvkVsChildGvrAndScope } diff --git a/vendor/modules.txt b/vendor/modules.txt index 154d74b700..4291d03cdb 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.16-0.20240220125323-1893b822a2d1 +# github.com/devtron-labs/common-lib v0.0.16-0.20240222073522-5e5933407116 ## explicit; go 1.20 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/cloud-provider-identifier