From 27687ca42a46cae83556eeca9a2300719db86a45 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 18 Dec 2024 17:06:38 +0530 Subject: [PATCH 01/70] label propagate in buildx --- ci-runner/helper/DockerHelper.go | 15 +++++++++++---- ci-runner/helper/EventHelper.go | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index de4081849..be59ac6d9 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -344,7 +344,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } useBuildxK8sDriver, eligibleK8sDriverNodes = dockerBuildConfig.CheckForBuildXK8sDriver() if useBuildxK8sDriver { - err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) + err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, ciRequest.AppLabels, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) if err != nil { log.Println(util.DEVTRON, " error in creating buildxDriver , err : ", err.Error()) return err @@ -938,14 +938,14 @@ func (impl *DockerHelperImpl) createBuildxBuilderForMultiArchBuild(ciContext cic return nil } -func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { +func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection string, appLabels map[string]string, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { if len(builderNodes) == 0 { return errors.New("atleast one node is expected for builder with kubernetes driver") } deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, appLabels, ciPipelineId, ciWorkflowId) deploymentNames = append(deploymentNames, deploymentName) // first node is used as default node, we create builder with --use flag, then we append other nodes if i == 0 { @@ -1017,7 +1017,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { +func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts, labels map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1030,6 +1030,13 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate = fmt.Sprintf(buildxCreate, platforms) } driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) + // add driver options for app labels + if len(labels) > 0 { + driverOpts["driverOptions"] += ",labels=" + for k, v := range labels { + driverOpts["driverOptions"] += fmt.Sprintf("%s=%s,", k, v) + } + } if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " buildxCreate = fmt.Sprintf(buildxCreate, driverOpts["driverOptions"]) diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index d492a100b..2879c6690 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -137,6 +137,7 @@ type CommonWorkflowRequest struct { PostCiSteps []*StepObject `json:"postCiSteps"` RefPlugins []*RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` + AppLabels map[string]string `json:"appLabels"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` CiBuildDockerMtuValue int `json:"ciBuildDockerMtuValue"` From 6a3665f16cddf7c3e3423fbf40572f8bb0eafb55 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 18 Dec 2024 18:57:43 +0530 Subject: [PATCH 02/70] fix --- ci-runner/helper/DockerHelper.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index be59ac6d9..326ffcba2 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1029,14 +1029,16 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate += " --platform=%s " buildxCreate = fmt.Sprintf(buildxCreate, platforms) } - driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) // add driver options for app labels if len(labels) > 0 { - driverOpts["driverOptions"] += ",labels=" + driverOpts["driverOptions"] += "\"labels=" for k, v := range labels { driverOpts["driverOptions"] += fmt.Sprintf("%s=%s,", k, v) } + driverOpts["driverOptions"] = strings.TrimSuffix(driverOpts["driverOptions"], ",") + driverOpts["driverOptions"] += "\"" } + driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " buildxCreate = fmt.Sprintf(buildxCreate, driverOpts["driverOptions"]) From ce4a8eaf762e2a905a7ae1766ef389bb1601c742 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 18 Dec 2024 19:51:07 +0530 Subject: [PATCH 03/70] fix --- ci-runner/helper/DockerHelper.go | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 326ffcba2..17f43ae83 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1030,14 +1030,7 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate = fmt.Sprintf(buildxCreate, platforms) } // add driver options for app labels - if len(labels) > 0 { - driverOpts["driverOptions"] += "\"labels=" - for k, v := range labels { - driverOpts["driverOptions"] += fmt.Sprintf("%s=%s,", k, v) - } - driverOpts["driverOptions"] = strings.TrimSuffix(driverOpts["driverOptions"], ",") - driverOpts["driverOptions"] += "\"" - } + driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabels(labels, driverOpts["driverOptions"]) driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " @@ -1063,6 +1056,27 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st return driverOptions } +func getBuildXDriverOptionsWithLabels(labels map[string]string, driverOptions string) string { + if len(labels) > 0 { + // creating label options + labelOptions := "" + labelOptions += "\"labels=" + for k, v := range labels { + labelOptions += fmt.Sprintf("%s=%s,", k, v) + } + labelOptions = strings.TrimSuffix(labelOptions, ",") + labelOptions += "\"" + + if len(driverOptions) > 0 { + driverOptions += fmt.Sprintf(",%s", labelOptions) + } else { + driverOptions = labelOptions + } + } + return driverOptions + +} + func (impl *DockerHelperImpl) StopDocker(ciContext cicxt.CiContext) error { cmd := exec.Command("docker", "ps", "-a", "-q") out, err := cmd.Output() From d399bafd810faa2030b27080130969441d4afb3f Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 19 Dec 2024 20:14:34 +0530 Subject: [PATCH 04/70] fix --- ci-runner/helper/DockerHelper.go | 76 ++++++++++++++++++++++++-------- ci-runner/helper/EventHelper.go | 1 - 2 files changed, 58 insertions(+), 19 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 17f43ae83..75eecec4f 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -344,7 +344,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } useBuildxK8sDriver, eligibleK8sDriverNodes = dockerBuildConfig.CheckForBuildXK8sDriver() if useBuildxK8sDriver { - err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, ciRequest.AppLabels, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) + err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) if err != nil { log.Println(util.DEVTRON, " error in creating buildxDriver , err : ", err.Error()) return err @@ -938,14 +938,14 @@ func (impl *DockerHelperImpl) createBuildxBuilderForMultiArchBuild(ciContext cic return nil } -func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection string, appLabels map[string]string, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { +func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { if len(builderNodes) == 0 { return errors.New("atleast one node is expected for builder with kubernetes driver") } deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, appLabels, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) deploymentNames = append(deploymentNames, deploymentName) // first node is used as default node, we create builder with --use flag, then we append other nodes if i == 0 { @@ -1017,7 +1017,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts, labels map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { +func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1029,8 +1029,9 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate += " --platform=%s " buildxCreate = fmt.Sprintf(buildxCreate, platforms) } - // add driver options for app labels - driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabels(labels, driverOpts["driverOptions"]) + // add driver options for app labels and annotations + driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { buildxCreate += " '--driver-opt=%s' " @@ -1056,25 +1057,64 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st return driverOptions } -func getBuildXDriverOptionsWithLabels(labels map[string]string, driverOptions string) string { - if len(labels) > 0 { - // creating label options - labelOptions := "" - labelOptions += "\"labels=" - for k, v := range labels { - labelOptions += fmt.Sprintf("%s=%s,", k, v) +func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string { + labels := make(map[string]string) + annotations := make(map[string]string) + + // Read labels and annotations from files + labelsOut, err := os.ReadFile("/etc/podinfo/labels") + if err != nil { + log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) + } + annotationsOut, err := os.ReadFile("/etc/podinfo/annotations") + if err != nil { + log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) + } + + // Parse labels and annotations + if len(labelsOut) > 0 { + labels = parseKeyValuePairs(string(labelsOut)) + } + if len(annotationsOut) > 0 { + annotations = parseKeyValuePairs(string(annotationsOut)) + } + + // Combine driver options + driverOptions = getBuildXDriverOptions("labels", labels, driverOptions) + driverOptions = getBuildXDriverOptions("annotations", annotations, driverOptions) + return driverOptions +} + +func parseKeyValuePairs(input string) map[string]string { + keyValuePairs := make(map[string]string) + lines := strings.Split(input, "\n") + for _, line := range lines { + if len(line) > 0 { + kv := strings.SplitN(line, "=", 2) + if len(kv) == 2 { + keyValuePairs[kv[0]] = kv[1] + } } - labelOptions = strings.TrimSuffix(labelOptions, ",") - labelOptions += "\"" + } + return keyValuePairs +} + +func getBuildXDriverOptions(optionType string, options map[string]string, driverOptions string) string { + if len(options) > 0 { + optionStr := fmt.Sprintf("\"%s=", optionType) + for k, v := range options { + optionStr += fmt.Sprintf("%s=%s,", k, v) + } + optionStr = strings.TrimSuffix(optionStr, ",") + optionStr += "\"" if len(driverOptions) > 0 { - driverOptions += fmt.Sprintf(",%s", labelOptions) + driverOptions += fmt.Sprintf(",%s", optionStr) } else { - driverOptions = labelOptions + driverOptions = optionStr } } return driverOptions - } func (impl *DockerHelperImpl) StopDocker(ciContext cicxt.CiContext) error { diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 2879c6690..d492a100b 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -137,7 +137,6 @@ type CommonWorkflowRequest struct { PostCiSteps []*StepObject `json:"postCiSteps"` RefPlugins []*RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` - AppLabels map[string]string `json:"appLabels"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` CiBuildDockerMtuValue int `json:"ciBuildDockerMtuValue"` From 129348cb2332ff82da3bcff36c0afffcba3bc879 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 19 Dec 2024 20:40:01 +0530 Subject: [PATCH 05/70] fix --- ci-runner/helper/DockerHelper.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 75eecec4f..35e142cbb 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1092,7 +1092,9 @@ func parseKeyValuePairs(input string) map[string]string { if len(line) > 0 { kv := strings.SplitN(line, "=", 2) if len(kv) == 2 { - keyValuePairs[kv[0]] = kv[1] + key := kv[0] + value := strings.Trim(kv[1], `"`) + keyValuePairs[key] = value } } } From 9025eb41c6f980d5e13ade8c71571747f439a3f3 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 20 Dec 2024 15:57:50 +0530 Subject: [PATCH 06/70] fixDEVTRON_SELF_DOWNWARD_API_VOLUME_PATH added --- common-lib/utils/CommonUtils.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common-lib/utils/CommonUtils.go b/common-lib/utils/CommonUtils.go index 1a6c8307c..e65290e3a 100644 --- a/common-lib/utils/CommonUtils.go +++ b/common-lib/utils/CommonUtils.go @@ -32,9 +32,11 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" ) // Generates random string From f61a1734c0f4f7dc35c70915c2cf3745f18fa728 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 20 Dec 2024 16:03:39 +0530 Subject: [PATCH 07/70] path in constant --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/helper/DockerHelper.go | 6 ++++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 8 +++++--- ci-runner/vendor/modules.txt | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 6621f093d..63c9937f2 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241216105957-d5a37695c2b2 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 27090f5a6..2f944ba01 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241216105957-d5a37695c2b2 h1:WuQfIhux7jEQpJZ6I6JbRbsn7j9R3FANedWNhmetirM= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241216105957-d5a37695c2b2/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 h1:17fKsPL2gpSu1EoHkfFM5sluuQa2BpmtrzwX/0vq504= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 35e142cbb..57ae03b67 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1062,11 +1062,13 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string annotations := make(map[string]string) // Read labels and annotations from files - labelsOut, err := os.ReadFile("/etc/podinfo/labels") + labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/labels" + labelsOut, err := os.ReadFile(labelsPath) if err != nil { log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) } - annotationsOut, err := os.ReadFile("/etc/podinfo/annotations") + annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/annotations" + annotationsOut, err := os.ReadFile(annotationsPath) if err != nil { log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) } diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 1a6c8307c..e65290e3a 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -32,9 +32,11 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" ) // Generates random string diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 0d1e82ceb..2ba927476 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241216105957-d5a37695c2b2 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -842,4 +842,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241216105957-d5a37695c2b2 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241220102750-9025eb41c6f9 From 65f20886ca10b7aa326f428bb9121ec09434327d Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 13 Jan 2025 17:58:23 +0530 Subject: [PATCH 08/70] initial commit - move scan payload and ImageScanOutputObject to common lib(incomplete pr) --- common-lib/imageScan/bean/bean.go | 19 ++++ image-scanner/api/RestHandler.go | 32 ++++-- image-scanner/api/Router.go | 2 + .../pkg/security/ImageScanService.go | 102 +++++++++++------- image-scanner/pkg/sql/adaptor/adaptor.go | 37 +++++++ image-scanner/pkg/sql/bean/bean.go | 11 -- 6 files changed, 144 insertions(+), 59 deletions(-) create mode 100644 image-scanner/pkg/sql/adaptor/adaptor.go diff --git a/common-lib/imageScan/bean/bean.go b/common-lib/imageScan/bean/bean.go index b18d694ea..9288dcf99 100644 --- a/common-lib/imageScan/bean/bean.go +++ b/common-lib/imageScan/bean/bean.go @@ -62,3 +62,22 @@ func (r *ImageScanEvent) IsImageFromManifest() bool { func (r *ImageScanEvent) IsBuiltImage() bool { return r.SourceType == constants.SourceTypeImage && r.SourceSubType == constants.SourceSubTypeCi } + +type ScanResultPayload struct { + ImageScanEvent *ImageScanEvent + ScanToolId int `json:"scanToolId"` + SourceScanningResult string `json:"sourceScanningResult"` + Sbom string `json:"sbom"` + ImageScanOutput []ImageScanOutputObject `json:"imageScanOutput"` +} + +type ImageScanOutputObject struct { + TargetName string `json:"targetName"` + Class string `json:"class"` + Type string `json:"type"` + Name string `json:"name"` + Package string `json:"package"` + PackageVersion string `json:"packageVersion"` + FixedInVersion string `json:"fixedInVersion"` + Severity string `json:"severity"` +} diff --git a/image-scanner/api/RestHandler.go b/image-scanner/api/RestHandler.go index 045dd3e76..6906dbbb4 100644 --- a/image-scanner/api/RestHandler.go +++ b/image-scanner/api/RestHandler.go @@ -24,6 +24,7 @@ import ( "github.com/devtron-labs/image-scanner/pkg/grafeasService" "github.com/devtron-labs/image-scanner/pkg/klarService" "github.com/devtron-labs/image-scanner/pkg/security" + "github.com/devtron-labs/image-scanner/pkg/sql/adaptor" "github.com/devtron-labs/image-scanner/pkg/sql/bean" "github.com/devtron-labs/image-scanner/pkg/sql/repository" "github.com/devtron-labs/image-scanner/pkg/user" @@ -36,6 +37,7 @@ import ( type RestHandler interface { ScanForVulnerability(w http.ResponseWriter, r *http.Request) ScanForVulnerabilityEvent(scanConfig *bean2.ImageScanEvent) (*common.ScanEventResponse, error) + RegisterAndSaveScannedResult(w http.ResponseWriter, r *http.Request) } func NewRestHandlerImpl(logger *zap.SugaredLogger, @@ -119,14 +121,9 @@ func (impl *RestHandlerImpl) ScanForVulnerabilityEvent(scanConfig *bean2.ImageSc impl.Logger.Errorw("error in marshalling scanEvent", "event", scanConfig, "err", err) return nil, err } - executionHistoryModel := &repository.ImageScanExecutionHistory{ - Image: scanConfig.Image, - ImageHash: scanConfig.ImageDigest, - ExecutionTime: time.Now(), - ExecutedBy: scanConfig.UserId, - SourceMetadataJson: string(scanEventJson), - } - executionHistory, executionHistoryDirPath, err := impl.ImageScanService.RegisterScanExecutionHistoryAndState(executionHistoryModel, tool) + executionHistoryModel := adaptor.GetImageScanExecutionHistory(scanConfig, scanEventJson, time.Now()) + + executionHistory, executionHistoryDirPath, err := impl.ImageScanService.RegisterScanExecutionHistoryAndState(executionHistoryModel, tool.Id) if err != nil { impl.Logger.Errorw("service err, RegisterScanExecutionHistoryAndState", "err", err) return nil, err @@ -175,3 +172,22 @@ func (impl *RestHandlerImpl) ScanImageAsPerTool(scanConfig *bean2.ImageScanEvent } return result, nil } + +func (impl *RestHandlerImpl) RegisterAndSaveScannedResult(w http.ResponseWriter, r *http.Request) { + decoder := json.NewDecoder(r.Body) + var scanResultPayload bean2.ScanResultPayload + err := decoder.Decode(&scanResultPayload) + if err != nil { + impl.Logger.Errorw("error in decoding scanResultPayload", "error", err) + WriteJsonResp(w, err, nil, http.StatusBadRequest) + return + } + impl.Logger.Infow("register and save scan result payload", "saveScanResultPayload", scanResultPayload) + err = impl.ImageScanService.RegisterAndSaveScannedResult(&scanResultPayload) + if err != nil { + impl.Logger.Errorw("service err, RegisterAndSaveScannedResult", "err", err) + WriteJsonResp(w, err, nil, http.StatusInternalServerError) + return + } + WriteJsonResp(w, nil, nil, http.StatusOK) +} diff --git a/image-scanner/api/Router.go b/image-scanner/api/Router.go index b311f51b7..55fb94bbb 100644 --- a/image-scanner/api/Router.go +++ b/image-scanner/api/Router.go @@ -57,4 +57,6 @@ func (r Router) Init() { }) r.Router.Path("/scanner/image").HandlerFunc(r.restHandler.ScanForVulnerability).Methods("POST") + r.Router.Path("/scanner/save-result").HandlerFunc(r.restHandler.RegisterAndSaveScannedResult).Methods("POST") + } diff --git a/image-scanner/pkg/security/ImageScanService.go b/image-scanner/pkg/security/ImageScanService.go index bff7f78c7..928c8e0c5 100644 --- a/image-scanner/pkg/security/ImageScanService.go +++ b/image-scanner/pkg/security/ImageScanService.go @@ -31,6 +31,7 @@ import ( httpUtil "github.com/devtron-labs/image-scanner/internals/step-lib/util/http-util" "github.com/devtron-labs/image-scanner/internals/util" "github.com/devtron-labs/image-scanner/pkg/helper" + "github.com/devtron-labs/image-scanner/pkg/sql/adaptor" "github.com/devtron-labs/image-scanner/pkg/sql/bean" "github.com/devtron-labs/image-scanner/pkg/sql/repository" "github.com/go-pg/pg" @@ -58,11 +59,12 @@ type ImageScanService interface { CreateFolderForOutputData(executionHistoryModelId int) string HandleProgressingScans() GetActiveTool() (*repository.ScanToolMetadata, error) - RegisterScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, tool *repository.ScanToolMetadata) (*repository.ImageScanExecutionHistory, string, error) + RegisterScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, toolId int) (*repository.ImageScanExecutionHistory, string, error) GetImageScanRenderDto(registryId string, scanEvent *bean2.ImageScanEvent) (*common.ImageScanRenderDto, error) GetImageToBeScannedAndFetchCliEnv(scanEvent *bean2.ImageScanEvent) (string, error) FetchProxyUrl(scanEvent *bean2.ImageScanEvent) (string, []name.Option, error) - SaveCvesAndImageScanExecutionResults(vulnerabilities []*bean.ImageScanOutputObject, executionHistoryId int, toolId int, userId int32) error + SaveCvesAndImageScanExecutionResults(vulnerabilities []*bean2.ImageScanOutputObject, executionHistoryId int, toolId int, userId int32) error + RegisterAndSaveScannedResult(scanResultPayload *bean2.ScanResultPayload) error } type ImageScanServiceImpl struct { @@ -113,6 +115,22 @@ func NewImageScanServiceImpl(logger *zap.SugaredLogger, scanHistoryRepository re return imageScanService } +func GetImageScannerConfig() (*ImageScanConfig, error) { + scannerConfig := &ImageScanConfig{} + err := env.Parse(scannerConfig) + if err != nil { + return nil, errors.New(fmt.Sprintf("could not get scanner config from environment :%v", err)) + } + return scannerConfig, err +} + +type ImageScanConfig struct { + ScannerType string `env:"SCANNER_TYPE" envDefault:""` + ScanTryCount int `env:"IMAGE_SCAN_TRY_COUNT" envDefault:"1"` + ScanImageTimeout int `env:"IMAGE_SCAN_TIMEOUT" envDefault:"10"` // Time is considered in minutes + ScanImageAsyncTimeout int `env:"IMAGE_SCAN_ASYNC_TIMEOUT" envDefault:"3"` // Time is considered in minutes +} + func (impl *ImageScanServiceImpl) GetImageToBeScannedAndFetchCliEnv(scanEvent *bean2.ImageScanEvent) (string, error) { impl.CliCommandEnv = append(os.Environ(), impl.CliCommandEnv...) return scanEvent.Image, nil @@ -252,23 +270,42 @@ func (impl *ImageScanServiceImpl) CreateFolderForOutputData(executionHistoryMode return executionHistoryDirPath } -func (impl *ImageScanServiceImpl) RegisterScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, - tool *repository.ScanToolMetadata) (*repository.ImageScanExecutionHistory, string, error) { - executionHistoryDirPath := "" +func (impl *ImageScanServiceImpl) saveImageScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, toolId int) error { //creating execution history tx, err := impl.ScanHistoryRepository.GetConnection().Begin() if err != nil { impl.Logger.Errorw("error in initiating db transaction", "err", err) - return nil, executionHistoryDirPath, err + return err } // Rollback tx on error. defer tx.Rollback() err = impl.ScanHistoryRepository.Save(tx, executionHistoryModel) if err != nil { impl.Logger.Errorw("Failed to save executionHistory", "model", executionHistoryModel, "err", err) - return nil, executionHistoryDirPath, err + return err } + executionHistoryMappingModel := adaptor.GetScanToolExecutionHistoryMapping(executionHistoryModel, bean.ScanExecutionProcessStateRunning, "", toolId) + err = impl.ScanToolExecutionHistoryMappingRepository.Save(tx, executionHistoryMappingModel) + if err != nil { + impl.Logger.Errorw("Failed to save executionHistoryMappingModel", "err", err) + return err + } + err = tx.Commit() + if err != nil { + impl.Logger.Errorw("error in committing transaction", "err", err) + return err + } + return nil +} +func (impl *ImageScanServiceImpl) RegisterScanExecutionHistoryAndState(executionHistoryModel *repository.ImageScanExecutionHistory, + toolId int) (*repository.ImageScanExecutionHistory, string, error) { + executionHistoryDirPath := "" + err := impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, toolId) + if err != nil { + impl.Logger.Errorw("error in saving image scan exec history and it's state", "executionHistoryModel", executionHistoryModel, "err", err) + return nil, executionHistoryDirPath, err + } // creating folder for storing all details if not exist isExist, err := helper.DoesFileExist(bean.ScanOutputDirectory) if err != nil { @@ -278,7 +315,7 @@ func (impl *ImageScanServiceImpl) RegisterScanExecutionHistoryAndState(execution if !isExist { err = os.Mkdir(bean.ScanOutputDirectory, commonUtil.DefaultFileCreatePermission) if err != nil && !os.IsExist(err) { - impl.Logger.Errorw("error in creating Output directory", "toolId", tool.Id, "executionHistoryDir", executionHistoryDirPath, "err", err) + impl.Logger.Errorw("error in creating Output directory", "toolId", toolId, "executionHistoryDir", executionHistoryDirPath, "err", err) return nil, executionHistoryDirPath, err } } @@ -289,28 +326,6 @@ func (impl *ImageScanServiceImpl) RegisterScanExecutionHistoryAndState(execution impl.Logger.Errorw("error in creating executionHistory directory", "executionHistoryId", executionHistoryModel.Id, "err", err) return nil, executionHistoryDirPath, err } - executionHistoryMappingModel := &repository.ScanToolExecutionHistoryMapping{ - ImageScanExecutionHistoryId: executionHistoryModel.Id, - ScanToolId: tool.Id, - ExecutionStartTime: executionHistoryModel.ExecutionTime, - State: bean.ScanExecutionProcessStateRunning, - AuditLog: repository.AuditLog{ - CreatedOn: executionHistoryModel.ExecutionTime, - CreatedBy: int32(executionHistoryModel.ExecutedBy), - UpdatedOn: executionHistoryModel.ExecutionTime, - UpdatedBy: int32(executionHistoryModel.ExecutedBy), - }, - } - err = impl.ScanToolExecutionHistoryMappingRepository.Save(tx, executionHistoryMappingModel) - if err != nil { - impl.Logger.Errorw("Failed to save executionHistoryMappingModel", "err", err) - return nil, executionHistoryDirPath, err - } - err = tx.Commit() - if err != nil { - impl.Logger.Errorw("error in committing transaction", "err", err) - return nil, executionHistoryDirPath, err - } return executionHistoryModel, executionHistoryDirPath, nil } @@ -1008,18 +1023,25 @@ func (impl *ImageScanServiceImpl) FetchProxyUrl(scanEvent *bean2.ImageScanEvent) return "", []name.Option{}, nil } -func GetImageScannerConfig() (*ImageScanConfig, error) { - scannerConfig := &ImageScanConfig{} - err := env.Parse(scannerConfig) +func (impl *ImageScanServiceImpl) RegisterAndSaveScannedResult(scanResultPayload *bean2.ScanResultPayload) error { + scanEventJson, err := json.Marshal(scanResultPayload.ImageScanEvent) if err != nil { - return nil, errors.New(fmt.Sprintf("could not get scanner config from environment :%v", err)) + impl.Logger.Errorw("error in marshalling scanEvent", "imageScanEvent", scanResultPayload.ImageScanEvent, "err", err) + return err + } + executionHistoryModel := adaptor.GetImageScanExecutionHistory(scanResultPayload.ImageScanEvent, scanEventJson, time.Now()) + err = impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, scanResultPayload.ScanToolId) + if err != nil { + impl.Logger.Errorw("error in saving scan execution history and state mapping", "executionHistoryModel", executionHistoryModel, "toolId", scanResultPayload.ScanToolId, "err", err) + return err + } + err = impl.saveSbomAndSourceScanningResult(scanResultPayload.Sbom, scanResultPayload.SourceScanningResult) + if err != nil { + impl.Logger.Errorw("error in saving sbom and actual scanning result", "executionHistoryId", executionHistoryModel.Id, "toolId", scanResultPayload.ScanToolId, "err", err) + return err } - return scannerConfig, err } -type ImageScanConfig struct { - ScannerType string `env:"SCANNER_TYPE" envDefault:""` - ScanTryCount int `env:"IMAGE_SCAN_TRY_COUNT" envDefault:"1"` - ScanImageTimeout int `env:"IMAGE_SCAN_TIMEOUT" envDefault:"10"` // Time is considered in minutes - ScanImageAsyncTimeout int `env:"IMAGE_SCAN_ASYNC_TIMEOUT" envDefault:"3"` // Time is considered in minutes +func (impl *ImageScanServiceImpl) saveSbomAndSourceScanningResult(sbomOutput string, sourceScanningResult string) error { + } diff --git a/image-scanner/pkg/sql/adaptor/adaptor.go b/image-scanner/pkg/sql/adaptor/adaptor.go new file mode 100644 index 000000000..5e373bb34 --- /dev/null +++ b/image-scanner/pkg/sql/adaptor/adaptor.go @@ -0,0 +1,37 @@ +package adaptor + +import ( + "github.com/devtron-labs/common-lib/imageScan/bean" + bean2 "github.com/devtron-labs/image-scanner/pkg/sql/bean" + "github.com/devtron-labs/image-scanner/pkg/sql/repository" + "time" +) + +func GetImageScanExecutionHistory(imageScanEvent *bean.ImageScanEvent, scanEventJson []byte, time time.Time) *repository.ImageScanExecutionHistory { + return &repository.ImageScanExecutionHistory{ + Image: imageScanEvent.Image, + ImageHash: imageScanEvent.ImageDigest, + ExecutionTime: time, + ExecutedBy: imageScanEvent.UserId, + SourceMetadataJson: string(scanEventJson), + SourceType: imageScanEvent.SourceType, + SourceSubType: imageScanEvent.SourceSubType, + } +} + +func GetScanToolExecutionHistoryMapping(executionHistoryModel *repository.ImageScanExecutionHistory, state bean2.ScanExecutionProcessState, + errorMsg string, toolId int) *repository.ScanToolExecutionHistoryMapping { + return &repository.ScanToolExecutionHistoryMapping{ + ImageScanExecutionHistoryId: executionHistoryModel.Id, + ScanToolId: toolId, + ExecutionStartTime: executionHistoryModel.ExecutionTime, + State: state, + ErrorMessage: errorMsg, + AuditLog: repository.AuditLog{ + CreatedOn: executionHistoryModel.ExecutionTime, + CreatedBy: int32(executionHistoryModel.ExecutedBy), + UpdatedOn: executionHistoryModel.ExecutionTime, + UpdatedBy: int32(executionHistoryModel.ExecutedBy), + }, + } +} diff --git a/image-scanner/pkg/sql/bean/bean.go b/image-scanner/pkg/sql/bean/bean.go index ff89d2365..a5b2a9901 100644 --- a/image-scanner/pkg/sql/bean/bean.go +++ b/image-scanner/pkg/sql/bean/bean.go @@ -52,17 +52,6 @@ const ( ScanExecutionProcessStateCompleted //resolved value = 1 ) -type ImageScanOutputObject struct { - TargetName string `json:"targetName"` - Class string `json:"class"` - Type string `json:"type"` - Name string `json:"name"` - Package string `json:"package"` - PackageVersion string `json:"packageVersion"` - FixedInVersion string `json:"fixedInVersion"` - Severity string `json:"severity"` -} - // Mapping is the used to store mappings of fields in ImageScanOutputObject and the path at which they are present in stepOutput type Mapping map[string]string From e0c01d44242c6515fc3ff77355c46883e63ea041 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 13 Jan 2025 18:18:11 +0530 Subject: [PATCH 09/70] some common lib fixes(incomplete) --- common-lib/imageScan/bean/bean.go | 8 +++---- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../pkg/security/ImageScanService.go | 24 +++++++++++-------- .../ResourceScanExecutionResultRepository.go | 7 +++--- .../common-lib/imageScan/bean/bean.go | 19 +++++++++++++++ image-scanner/vendor/modules.txt | 4 ++-- 7 files changed, 46 insertions(+), 22 deletions(-) diff --git a/common-lib/imageScan/bean/bean.go b/common-lib/imageScan/bean/bean.go index 9288dcf99..79decb1db 100644 --- a/common-lib/imageScan/bean/bean.go +++ b/common-lib/imageScan/bean/bean.go @@ -65,10 +65,10 @@ func (r *ImageScanEvent) IsBuiltImage() bool { type ScanResultPayload struct { ImageScanEvent *ImageScanEvent - ScanToolId int `json:"scanToolId"` - SourceScanningResult string `json:"sourceScanningResult"` - Sbom string `json:"sbom"` - ImageScanOutput []ImageScanOutputObject `json:"imageScanOutput"` + ScanToolId int `json:"scanToolId"` + SourceScanningResult string `json:"sourceScanningResult"` + Sbom string `json:"sbom"` + ImageScanOutput []*ImageScanOutputObject `json:"imageScanOutput"` } type ImageScanOutputObject struct { diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 751c8fca6..b02717fef 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index ee1dcf711..f283bfc30 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 h1:BRLI+xGBEHUaPy13MGOyse7a/WTm0K2wsf12PMz5zz0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/pkg/security/ImageScanService.go b/image-scanner/pkg/security/ImageScanService.go index 928c8e0c5..db8de1e1b 100644 --- a/image-scanner/pkg/security/ImageScanService.go +++ b/image-scanner/pkg/security/ImageScanService.go @@ -470,9 +470,9 @@ func (impl *ImageScanServiceImpl) ProcessScanStep(step repository.ScanToolStep, return output, nil } -func (impl *ImageScanServiceImpl) SaveCvesAndImageScanExecutionResults(vulnerabilities []*bean.ImageScanOutputObject, executionHistoryId int, toolId int, userId int32) error { +func (impl *ImageScanServiceImpl) SaveCvesAndImageScanExecutionResults(vulnerabilities []*bean2.ImageScanOutputObject, executionHistoryId int, toolId int, userId int32) error { cvesToBeSaved := make([]*repository.CveStore, 0, len(vulnerabilities)) - uniqueVulnerabilityMap := make(map[string]*bean.ImageScanOutputObject) + uniqueVulnerabilityMap := make(map[string]*bean2.ImageScanOutputObject) allCvesNames := make([]string, 0, len(vulnerabilities)) for _, vul := range vulnerabilities { if _, ok := uniqueVulnerabilityMap[vul.Name]; !ok { @@ -554,7 +554,7 @@ func (impl *ImageScanServiceImpl) SaveCvesAndImageScanExecutionResults(vulnerabi } func (impl *ImageScanServiceImpl) ConvertEndStepOutputAndSaveVulnerabilities(stepOutput []byte, executionHistoryId int, tool repository.ScanToolMetadata, step repository.ScanToolStep, userId int32) error { - var vulnerabilities []*bean.ImageScanOutputObject + var vulnerabilities []*bean2.ImageScanOutputObject var err error if isV1Template(tool.ResultDescriptorTemplate) { // result descriptor template is go template, go with v1 logic vulnerabilities, err = impl.getImageScanOutputObjectsV1(stepOutput, tool.ResultDescriptorTemplate) @@ -590,7 +590,7 @@ func isValidGoTemplate(templateStr string) bool { return err == nil } -func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV1(stepOutput []byte, resultDescriptorTemplate string) ([]*bean.ImageScanOutputObject, error) { +func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV1(stepOutput []byte, resultDescriptorTemplate string) ([]*bean2.ImageScanOutputObject, error) { //rendering image descriptor template with output json to get vulnerabilities updated renderedTemplate, err := commonUtil.ParseJsonTemplate(resultDescriptorTemplate, stepOutput) if err != nil { @@ -598,7 +598,7 @@ func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV1(stepOutput []byte, return nil, err } renderedTemplate = common.RemoveTrailingComma(renderedTemplate) - var vulnerabilities []*bean.ImageScanOutputObject + var vulnerabilities []*bean2.ImageScanOutputObject err = json.Unmarshal([]byte(renderedTemplate), &vulnerabilities) if err != nil { impl.Logger.Errorw("error in unmarshalling rendered template", "err", err) @@ -607,8 +607,8 @@ func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV1(stepOutput []byte, return vulnerabilities, nil } -func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV2(stepOutput []byte, resultDescriptorTemplate string) ([]*bean.ImageScanOutputObject, error) { - var vulnerabilities []*bean.ImageScanOutputObject +func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV2(stepOutput []byte, resultDescriptorTemplate string) ([]*bean2.ImageScanOutputObject, error) { + var vulnerabilities []*bean2.ImageScanOutputObject var mappings []map[string]interface{} err := json.Unmarshal([]byte(resultDescriptorTemplate), &mappings) if err != nil { @@ -628,7 +628,7 @@ func (impl *ImageScanServiceImpl) getImageScanOutputObjectsV2(stepOutput []byte, if nestedValue.Get(vulnerabilitiesPath).IsArray() { nestedValue.Get(vulnerabilitiesPath).ForEach(func(_, vul gjson.Result) bool { - vulnerability := &bean.ImageScanOutputObject{ + vulnerability := &bean2.ImageScanOutputObject{ Name: vul.Get(vulnerabilityDataKeyPathsMap[bean.MappingKeyName].(string)).String(), Package: vul.Get(vulnerabilityDataKeyPathsMap[bean.MappingKeyPackage].(string)).String(), PackageVersion: vul.Get(vulnerabilityDataKeyPathsMap[bean.MappingKeyPackageVersion].(string)).String(), @@ -1035,13 +1035,17 @@ func (impl *ImageScanServiceImpl) RegisterAndSaveScannedResult(scanResultPayload impl.Logger.Errorw("error in saving scan execution history and state mapping", "executionHistoryModel", executionHistoryModel, "toolId", scanResultPayload.ScanToolId, "err", err) return err } - err = impl.saveSbomAndSourceScanningResult(scanResultPayload.Sbom, scanResultPayload.SourceScanningResult) + + err = impl.saveSourceScanningResult(scanResultPayload.ImageScanOutput) if err != nil { impl.Logger.Errorw("error in saving sbom and actual scanning result", "executionHistoryId", executionHistoryModel.Id, "toolId", scanResultPayload.ScanToolId, "err", err) return err } + return nil } -func (impl *ImageScanServiceImpl) saveSbomAndSourceScanningResult(sbomOutput string, sourceScanningResult string) error { +func (impl *ImageScanServiceImpl) saveSourceScanningResult(imageScanOutput []*bean2.ImageScanOutputObject) error { + // + return nil } diff --git a/image-scanner/pkg/sql/repository/ResourceScanExecutionResultRepository.go b/image-scanner/pkg/sql/repository/ResourceScanExecutionResultRepository.go index c79adadbc..4d3ea8c73 100644 --- a/image-scanner/pkg/sql/repository/ResourceScanExecutionResultRepository.go +++ b/image-scanner/pkg/sql/repository/ResourceScanExecutionResultRepository.go @@ -34,9 +34,10 @@ type ResourceScanResult struct { type ResourceScanFormat int const ( - CycloneDxSbom ResourceScanFormat = 1 //SBOM - TrivyJson = 2 - Json = 3 + CycloneDxSbom ResourceScanFormat = 1 //SBOM + TrivyJson = 2 + Json = 3 + SbomResultSource = 4 ) type ResourceScanType int diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go index b18d694ea..9288dcf99 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go @@ -62,3 +62,22 @@ func (r *ImageScanEvent) IsImageFromManifest() bool { func (r *ImageScanEvent) IsBuiltImage() bool { return r.SourceType == constants.SourceTypeImage && r.SourceSubType == constants.SourceSubTypeCi } + +type ScanResultPayload struct { + ImageScanEvent *ImageScanEvent + ScanToolId int `json:"scanToolId"` + SourceScanningResult string `json:"sourceScanningResult"` + Sbom string `json:"sbom"` + ImageScanOutput []ImageScanOutputObject `json:"imageScanOutput"` +} + +type ImageScanOutputObject struct { + TargetName string `json:"targetName"` + Class string `json:"class"` + Type string `json:"type"` + Name string `json:"name"` + Package string `json:"package"` + PackageVersion string `json:"packageVersion"` + FixedInVersion string `json:"fixedInVersion"` + Severity string `json:"severity"` +} diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 832a6055c..1e6147492 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 From 0d2d172318367c4c1e93ab11f9d4c1df23cefea8 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 13 Jan 2025 18:26:57 +0530 Subject: [PATCH 10/70] final oss changes --- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/pkg/security/ImageScanService.go | 11 ++--------- .../devtron-labs/common-lib/imageScan/bean/bean.go | 8 ++++---- image-scanner/vendor/modules.txt | 4 ++-- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/image-scanner/go.mod b/image-scanner/go.mod index b02717fef..19045cf28 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c diff --git a/image-scanner/go.sum b/image-scanner/go.sum index f283bfc30..c475cbf29 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 h1:BRLI+xGBEHUaPy13MGOyse7a/WTm0K2wsf12PMz5zz0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c h1:0GBiAbpvnb2+ADQMdkmOxZDnwrW4FNrGqtpEcyFow2Q= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/pkg/security/ImageScanService.go b/image-scanner/pkg/security/ImageScanService.go index db8de1e1b..05c8aee06 100644 --- a/image-scanner/pkg/security/ImageScanService.go +++ b/image-scanner/pkg/security/ImageScanService.go @@ -1035,17 +1035,10 @@ func (impl *ImageScanServiceImpl) RegisterAndSaveScannedResult(scanResultPayload impl.Logger.Errorw("error in saving scan execution history and state mapping", "executionHistoryModel", executionHistoryModel, "toolId", scanResultPayload.ScanToolId, "err", err) return err } - - err = impl.saveSourceScanningResult(scanResultPayload.ImageScanOutput) + err = impl.SaveCvesAndImageScanExecutionResults(scanResultPayload.ImageScanOutput, executionHistoryModel.Id, scanResultPayload.ScanToolId, int32(scanResultPayload.ImageScanEvent.UserId)) if err != nil { - impl.Logger.Errorw("error in saving sbom and actual scanning result", "executionHistoryId", executionHistoryModel.Id, "toolId", scanResultPayload.ScanToolId, "err", err) + impl.Logger.Errorw("error in saving cves and image scan exec result ", "executionHistoryId", executionHistoryModel.Id, "err", err) return err } return nil } - -func (impl *ImageScanServiceImpl) saveSourceScanningResult(imageScanOutput []*bean2.ImageScanOutputObject) error { - // - - return nil -} diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go index 9288dcf99..79decb1db 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go @@ -65,10 +65,10 @@ func (r *ImageScanEvent) IsBuiltImage() bool { type ScanResultPayload struct { ImageScanEvent *ImageScanEvent - ScanToolId int `json:"scanToolId"` - SourceScanningResult string `json:"sourceScanningResult"` - Sbom string `json:"sbom"` - ImageScanOutput []ImageScanOutputObject `json:"imageScanOutput"` + ScanToolId int `json:"scanToolId"` + SourceScanningResult string `json:"sourceScanningResult"` + Sbom string `json:"sbom"` + ImageScanOutput []*ImageScanOutputObject `json:"imageScanOutput"` } type ImageScanOutputObject struct { diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 1e6147492..8eab68ba2 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113122823-65f20886ca10 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c From 478d9c9bff52fec98501c38644ad72a9f2b2d8c8 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Tue, 14 Jan 2025 14:16:43 +0530 Subject: [PATCH 11/70] remove unused variable --- image-scanner/pkg/middleware/instrument.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/image-scanner/pkg/middleware/instrument.go b/image-scanner/pkg/middleware/instrument.go index 7c11c9d5c..a643f230e 100644 --- a/image-scanner/pkg/middleware/instrument.go +++ b/image-scanner/pkg/middleware/instrument.go @@ -39,11 +39,6 @@ var requestCounter = promauto.NewCounterVec( }, []string{"path", "method", "status"}) -var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ - Name: "pg_query_duration_seconds", - Help: "Duration of PG queries", -}, []string{"label"}) - var currentRequestGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "image_scanner_http_requests_current", Help: "no of request being served currently", From 8f5933de0ef1dbc49ff2fd6c08e54842f0134578 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Tue, 14 Jan 2025 14:29:32 +0530 Subject: [PATCH 12/70] return history id in register and save result --- image-scanner/api/RestHandler.go | 2 +- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/pkg/security/ImageScanService.go | 12 ++++++------ image-scanner/vendor/modules.txt | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/image-scanner/api/RestHandler.go b/image-scanner/api/RestHandler.go index 6906dbbb4..88891d509 100644 --- a/image-scanner/api/RestHandler.go +++ b/image-scanner/api/RestHandler.go @@ -183,7 +183,7 @@ func (impl *RestHandlerImpl) RegisterAndSaveScannedResult(w http.ResponseWriter, return } impl.Logger.Infow("register and save scan result payload", "saveScanResultPayload", scanResultPayload) - err = impl.ImageScanService.RegisterAndSaveScannedResult(&scanResultPayload) + _, err = impl.ImageScanService.RegisterAndSaveScannedResult(&scanResultPayload) if err != nil { impl.Logger.Errorw("service err, RegisterAndSaveScannedResult", "err", err) WriteJsonResp(w, err, nil, http.StatusInternalServerError) diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 19045cf28..f613b7f7d 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index c475cbf29..7ea660dcf 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c h1:0GBiAbpvnb2+ADQMdkmOxZDnwrW4FNrGqtpEcyFow2Q= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 h1:SEUNvbPg8c+s95p+SUevebFTbQ/cLSVoA+JPFTGwc6I= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/pkg/security/ImageScanService.go b/image-scanner/pkg/security/ImageScanService.go index 05c8aee06..9e01b6100 100644 --- a/image-scanner/pkg/security/ImageScanService.go +++ b/image-scanner/pkg/security/ImageScanService.go @@ -64,7 +64,7 @@ type ImageScanService interface { GetImageToBeScannedAndFetchCliEnv(scanEvent *bean2.ImageScanEvent) (string, error) FetchProxyUrl(scanEvent *bean2.ImageScanEvent) (string, []name.Option, error) SaveCvesAndImageScanExecutionResults(vulnerabilities []*bean2.ImageScanOutputObject, executionHistoryId int, toolId int, userId int32) error - RegisterAndSaveScannedResult(scanResultPayload *bean2.ScanResultPayload) error + RegisterAndSaveScannedResult(scanResultPayload *bean2.ScanResultPayload) (int, error) } type ImageScanServiceImpl struct { @@ -1023,22 +1023,22 @@ func (impl *ImageScanServiceImpl) FetchProxyUrl(scanEvent *bean2.ImageScanEvent) return "", []name.Option{}, nil } -func (impl *ImageScanServiceImpl) RegisterAndSaveScannedResult(scanResultPayload *bean2.ScanResultPayload) error { +func (impl *ImageScanServiceImpl) RegisterAndSaveScannedResult(scanResultPayload *bean2.ScanResultPayload) (int, error) { scanEventJson, err := json.Marshal(scanResultPayload.ImageScanEvent) if err != nil { impl.Logger.Errorw("error in marshalling scanEvent", "imageScanEvent", scanResultPayload.ImageScanEvent, "err", err) - return err + return 0, err } executionHistoryModel := adaptor.GetImageScanExecutionHistory(scanResultPayload.ImageScanEvent, scanEventJson, time.Now()) err = impl.saveImageScanExecutionHistoryAndState(executionHistoryModel, scanResultPayload.ScanToolId) if err != nil { impl.Logger.Errorw("error in saving scan execution history and state mapping", "executionHistoryModel", executionHistoryModel, "toolId", scanResultPayload.ScanToolId, "err", err) - return err + return 0, err } err = impl.SaveCvesAndImageScanExecutionResults(scanResultPayload.ImageScanOutput, executionHistoryModel.Id, scanResultPayload.ScanToolId, int32(scanResultPayload.ImageScanEvent.UserId)) if err != nil { impl.Logger.Errorw("error in saving cves and image scan exec result ", "executionHistoryId", executionHistoryModel.Id, "err", err) - return err + return 0, err } - return nil + return executionHistoryModel.Id, nil } diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 8eab68ba2..2fc38f301 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113124811-e0c01d44242c +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 From 7188743c617cf7b6981efe842cea735003f07113 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Tue, 14 Jan 2025 14:35:36 +0530 Subject: [PATCH 13/70] GetResourceScanExecutionResult adaptor --- image-scanner/pkg/sql/adaptor/adaptor.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/image-scanner/pkg/sql/adaptor/adaptor.go b/image-scanner/pkg/sql/adaptor/adaptor.go index 5e373bb34..8bd0aa4d2 100644 --- a/image-scanner/pkg/sql/adaptor/adaptor.go +++ b/image-scanner/pkg/sql/adaptor/adaptor.go @@ -35,3 +35,13 @@ func GetScanToolExecutionHistoryMapping(executionHistoryModel *repository.ImageS }, } } + +func GetResourceScanExecutionResult(executionHistoryId, scanToolId int, scanDataJson string, format repository.ResourceScanFormat, types []int) *repository.ResourceScanResult { + return &repository.ResourceScanResult{ + ImageScanExecutionHistoryId: executionHistoryId, + ScanDataJson: scanDataJson, + Format: format, + Types: types, + ScanToolId: scanToolId, + } +} From fd5be7710d46cc0e9e96d7f3686aaa1d95a997de Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Wed, 15 Jan 2025 12:29:11 +0530 Subject: [PATCH 14/70] ci runner steps execution --- ci-runner/executor/StageExecutor.go | 3 +++ ci-runner/executor/stage/ciStages.go | 30 +++++++++++++++++++++++++--- ci-runner/helper/EventHelper.go | 14 +++++++++++++ ci-runner/helper/pluginBean.go | 1 + 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ci-runner/executor/StageExecutor.go b/ci-runner/executor/StageExecutor.go index 3b959e4e0..572d11dee 100644 --- a/ci-runner/executor/StageExecutor.go +++ b/ci-runner/executor/StageExecutor.go @@ -144,6 +144,9 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest var vars []*commonBean.VariableObject if stepType == helper.STEP_TYPE_REF_PLUGIN { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, nil, nil, stageVariable) + } else if stepType == helper.STEP_TYPE_SCANNING { + // only global variables are supported here in image scanning step + vars, err = deduceVariables(step.InputVars, scriptEnvVariables, nil, nil, nil) } else { log.Printf("running step : %s\n", step.Name) if stepType == helper.STEP_TYPE_PRE { diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 324fee828..3a094bbcc 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -299,7 +299,7 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. // scan only if ci scan enabled if helper.IsEventTypeEligibleToScanImage(ciCdRequest.Type) && ciCdRequest.CommonWorkflowRequest.ScanEnabled { - err = runImageScanning(dest, digest, ciCdRequest, metrics, artifactUploaded) + err = impl.runImageScanning(ciCdRequest, scriptEnvs, refStageMap, metrics, artifactUploaded, dest, digest) if err != nil { return artifactUploaded, err } @@ -438,7 +438,7 @@ func (impl *CiStage) runPostCiSteps(ciCdRequest *helper.CiCdTriggerEvent, script return pluginArtifactsFromFile, resultsFromPlugin, nil } -func runImageScanning(dest string, digest string, ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, artifactUploaded bool) error { +func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) error { imageScanningStage := func() error { log.Println("Image Scanning Started for digest", digest) scanEvent := adaptor2.GetImageScanEvent(dest, digest, ciCdRequest.CommonWorkflowRequest) @@ -453,7 +453,31 @@ func runImageScanning(dest string, digest string, ciCdRequest *helper.CiCdTrigge log.Println("Image scanning completed with scanEvent", scanEvent) return nil } - + imageScanningTaskExecution := func() error { + log.Println("Image Scanning Started") + for _, allSteps := range ciCdRequest.CommonWorkflowRequest.ImageScanningSteps { + scanToolId := allSteps.ScanToolId + tasks := allSteps.Steps + //setting scan tool id in script env + scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = strconv.Itoa(scanToolId) + // run image scanning steps + _, _, step, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) + if err != nil { + log.Println("error in running pre Ci Steps", "err", err) + return helper.NewCiStageError(err). + WithMetrics(metrics). + WithFailureMessage(fmt.Sprintf(workFlow.ScanFailed.String(), step.Name)). + WithArtifactUploaded(artifactUploaded) + } + } + //unset scan tool id in script env + scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = "" + log.Println("Image scanning completed") + return nil + } + if ciCdRequest.CommonWorkflowRequest.ExecuteImageScanningVia == helper.Steps { + return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningTaskExecution) + } return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningStage) } diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 06c8ebfea..b128ed2cc 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -190,6 +190,8 @@ type CommonWorkflowRequest struct { AsyncBuildxCacheExport bool `json:"asyncBuildxCacheExport"` UseDockerApiToGetDigest bool `json:"useDockerApiToGetDigest"` HostUrl string `json:"hostUrl"` + ImageScanningSteps []*ImageScanningSteps `json:"imageScanningSteps,omitempty"` + ExecuteImageScanningVia ExecutionMedium `json:"executeImageScanningVia,omitempty"` } func (c *CommonWorkflowRequest) IsPreCdStage() bool { @@ -209,6 +211,13 @@ func (c *CommonWorkflowRequest) GetCdStageType() PipelineType { return "" } +type ExecutionMedium string + +const ( + Rest ExecutionMedium = "rest" + Steps ExecutionMedium = "steps" +) + func (c *CommonWorkflowRequest) GetCloudHelperBaseConfig(blobStorageObjectType string) *util.CloudHelperBaseConfig { return &util.CloudHelperBaseConfig{ StorageModuleConfigured: c.BlobStorageConfigured, @@ -764,3 +773,8 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent event.PipelineType = stage return event } + +type ImageScanningSteps struct { + Steps []*StepObject `json:"steps"` + ScanToolId int `json:"scanToolId"` +} diff --git a/ci-runner/helper/pluginBean.go b/ci-runner/helper/pluginBean.go index bbf151907..1d7aee0af 100644 --- a/ci-runner/helper/pluginBean.go +++ b/ci-runner/helper/pluginBean.go @@ -39,6 +39,7 @@ const ( STEP_TYPE_REF_PLUGIN StepType = "REF_PLUGIN" STEP_TYPE_PRE StepType = "PRE" STEP_TYPE_POST StepType = "POST" + STEP_TYPE_SCANNING StepType = "SCANNING" ) type StepObject struct { From 496abdf89842fff3aa32692ae08e6e3f874e8680 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 15 Jan 2025 12:38:40 +0530 Subject: [PATCH 15/70] save target platform in logs and event --- ci-runner/executor/stage/adapter/adapter.go | 19 +++++++++++++++++ ci-runner/executor/stage/bean/bean.go | 8 +++++++ ci-runner/executor/stage/ciStages.go | 14 ++++++++++++- ci-runner/helper/DockerHelper.go | 6 ++++-- ci-runner/helper/EventHelper.go | 6 ++++++ ci-runner/util/Util.go | 23 ++++++++++++++++----- 6 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 ci-runner/executor/stage/adapter/adapter.go diff --git a/ci-runner/executor/stage/adapter/adapter.go b/ci-runner/executor/stage/adapter/adapter.go new file mode 100644 index 000000000..ad475189e --- /dev/null +++ b/ci-runner/executor/stage/adapter/adapter.go @@ -0,0 +1,19 @@ +package adapter + +import ( + "github.com/devtron-labs/ci-runner/executor/stage/bean" + "strings" +) + +func GetTargetPlatformObjectForList(targetPlatform string) []bean.TargetPlatform { + targetPlatforms := GetTargetPlatformListFromString(targetPlatform) + var targetPlatformObject []bean.TargetPlatform + for _, targetPlatform := range targetPlatforms { + targetPlatformObject = append(targetPlatformObject, bean.TargetPlatform{Name: targetPlatform}) + } + return targetPlatformObject +} + +func GetTargetPlatformListFromString(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} diff --git a/ci-runner/executor/stage/bean/bean.go b/ci-runner/executor/stage/bean/bean.go index f66364d82..db8178655 100644 --- a/ci-runner/executor/stage/bean/bean.go +++ b/ci-runner/executor/stage/bean/bean.go @@ -22,3 +22,11 @@ const ( UseAppDockerConfig = "useAppDockerConfig" CiProjectDetails = "ciProjectDetails" ) + +type DockerBuildStageMetadata struct { + TargetPlatforms []TargetPlatform `json:"targetPlatforms"` +} + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 324fee828..d44fa7bdd 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -24,6 +24,7 @@ import ( "github.com/devtron-labs/ci-runner/executor" adaptor2 "github.com/devtron-labs/ci-runner/executor/adaptor" cicxt "github.com/devtron-labs/ci-runner/executor/context" + "github.com/devtron-labs/ci-runner/executor/stage/adapter" bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -310,7 +311,8 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. event := adaptor.NewCiCompleteEvent(ciCdRequest.CommonWorkflowRequest).WithMetrics(*metrics). WithDockerImage(dest).WithDigest(digest).WithIsArtifactUploaded(artifactUploaded). - WithImageDetailsFromCR(resultsFromPlugin).WithPluginArtifacts(pluginArtifacts) + WithImageDetailsFromCR(resultsFromPlugin).WithPluginArtifacts(pluginArtifacts). + WithTargetPlatforms(GetTargetPlatformFromCiBuildConfig(ciCdRequest.CommonWorkflowRequest.CiBuildConfig)) err = helper.SendCiCompleteEvent(ciCdRequest.CommonWorkflowRequest, event) if err != nil { log.Println(err) @@ -659,3 +661,13 @@ func (impl *CiStage) extractDigestForCiJob(workflowRequest *helper.CommonWorkflo log.Println(fmt.Sprintf("time since extract digest from image process:- %s", time.Since(startTime).String())) return imgDigest, nil } + +func GetTargetPlatformFromCiBuildConfig(ciBuildConfig *helper.CiBuildConfigBean) []string { + if ciBuildConfig == nil { + return []string{} + } else if ciBuildConfig.DockerBuildConfig == nil { + return []string{} + } else { + return adapter.GetTargetPlatformListFromString(ciBuildConfig.DockerBuildConfig.TargetPlatform) + } +} diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index de4081849..309d7ce5a 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -30,6 +30,8 @@ import ( "github.com/aws/aws-sdk-go/service/ecr" "github.com/caarlos0/env" cicxt "github.com/devtron-labs/ci-runner/executor/context" + "github.com/devtron-labs/ci-runner/executor/stage/adapter" + bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" "github.com/devtron-labs/ci-runner/util" "github.com/devtron-labs/common-lib/utils" "github.com/devtron-labs/common-lib/utils/bean" @@ -403,7 +405,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s return nil } - if err = util.ExecuteWithStageInfoLog(util.DOCKER_BUILD, buildImageStage); err != nil { + if err = util.ExecuteWithStageInfoLogWithMetadata(util.DOCKER_BUILD, bean2.DockerBuildStageMetadata{TargetPlatforms: adapter.GetTargetPlatformObjectForList(ciBuildConfig.DockerBuildConfig.TargetPlatform)}, buildImageStage); err != nil { return "", nil } @@ -557,7 +559,7 @@ func getExportCacheCmds(targetPlatforms, dockerBuild, localCachePath string, use } cacheCmd := "%s --platform=%s --cache-to=type=local,dest=%s,mode=" + cacheMode - platforms := strings.Split(targetPlatforms, ",") + platforms := adapter.GetTargetPlatformListFromString(targetPlatforms) exportCacheCmds := make(map[string]string) for _, platform := range platforms { diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 06c8ebfea..64695e544 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -373,6 +373,12 @@ type CiCompleteEvent struct { IsScanEnabled bool `json:"isScanEnabled"` PluginArtifacts *PluginArtifacts `json:"pluginArtifacts"` DockerRegistryId string `json:"dockerRegistryId"` + TargetPlatforms []string `json:"targetPlatforms"` +} + +func (event *CiCompleteEvent) WithTargetPlatforms(targetPlatforms []string) *CiCompleteEvent { + event.TargetPlatforms = targetPlatforms + return event } func (event *CiCompleteEvent) WithMetrics(metrics CIMetrics) *CiCompleteEvent { diff --git a/ci-runner/util/Util.go b/ci-runner/util/Util.go index fe65cf76d..42dfe1190 100644 --- a/ci-runner/util/Util.go +++ b/ci-runner/util/Util.go @@ -180,10 +180,11 @@ const ( type StageLogData struct { //eg : 'STAGE_INFO|{"stage":"Resource availability","startTime":"2021-01-01T00:00:00Z"}' - Stage string `json:"stage,omitempty"` - StartTime *time.Time `json:"startTime,omitempty"` - EndTime *time.Time `json:"endTime,omitempty"` - Status Status `json:"status,omitempty"` + Stage string `json:"stage,omitempty"` + StartTime *time.Time `json:"startTime,omitempty"` + EndTime *time.Time `json:"endTime,omitempty"` + Status Status `json:"status,omitempty"` + Metadata interface{} `json:"metadata,omitempty"` } func (stageLogData *StageLogData) withStatus(status Status) *StageLogData { @@ -203,6 +204,11 @@ func (stageLogData *StageLogData) withCurrentEndTime() *StageLogData { return stageLogData } +func (stageLogData *StageLogData) withMetadata(metadata interface{}) *StageLogData { + stageLogData.Metadata = metadata + return stageLogData +} + func (stageLogData *StageLogData) log() { infoLog := fmt.Sprintf("STAGE_INFO|%s\n", stageLogData.string()) log.SetFlags(0) @@ -219,7 +225,14 @@ func (stageLogData *StageLogData) string() string { // it will log info for pre stage execution and post the stage execution // return the error returned by the stageExecutor func func ExecuteWithStageInfoLog(stageName string, stageExecutor func() error) (err error) { - startDockerStageInfo := newStageInfo(stageName).withCurrentStartTime() + return ExecuteWithStageInfoLogWithMetadata(stageName, nil, stageExecutor) +} + +// ExecuteWithStageInfoLog logs the stage info. +// it will log info for pre stage execution and post the stage execution +// return the error returned by the stageExecutor func +func ExecuteWithStageInfoLogWithMetadata(stageName string, metadata interface{}, stageExecutor func() error) (err error) { + startDockerStageInfo := newStageInfo(stageName).withCurrentStartTime().withMetadata(metadata) startDockerStageInfo.log() defer func() { status := success From af284e08365f13aa8ebd8ffc05ea2fbe2a8160b3 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Wed, 15 Jan 2025 13:07:40 +0530 Subject: [PATCH 16/70] aws inspector config flag --- ci-runner/executor/util/envUtils.go | 1 + ci-runner/helper/EventHelper.go | 1 + 2 files changed, 2 insertions(+) diff --git a/ci-runner/executor/util/envUtils.go b/ci-runner/executor/util/envUtils.go index 753b6cb2a..d3e6ed10d 100644 --- a/ci-runner/executor/util/envUtils.go +++ b/ci-runner/executor/util/envUtils.go @@ -115,6 +115,7 @@ func GetGlobalEnvVariables(ciCdRequest *helper.CiCdTriggerEvent) (*ScriptEnvVari RegistryCredentials, _ := json.Marshal(ciCdRequest.CommonWorkflowRequest.RegistryCredentialMap) envs["REGISTRY_DESTINATION_IMAGE_MAP"] = string(RegistryDestinationImage) envs["REGISTRY_CREDENTIALS"] = string(RegistryCredentials) + envs["AWS_INSPECTOR_CONFIG"] = ciCdRequest.CommonWorkflowRequest.AwsInspectorConfig } else { envs["DOCKER_IMAGE"] = ciCdRequest.CommonWorkflowRequest.CiArtifactDTO.Image envs["DOCKER_IMAGE_TAG"] = ciCdRequest.CommonWorkflowRequest.DockerImageTag diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index b128ed2cc..4f21e1c00 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -192,6 +192,7 @@ type CommonWorkflowRequest struct { HostUrl string `json:"hostUrl"` ImageScanningSteps []*ImageScanningSteps `json:"imageScanningSteps,omitempty"` ExecuteImageScanningVia ExecutionMedium `json:"executeImageScanningVia,omitempty"` + AwsInspectorConfig string `json:"awsInspectorConfig,omitempty"` } func (c *CommonWorkflowRequest) IsPreCdStage() bool { From 6ced97274c7b5dacc7afe5a6178d350b78b42c82 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 15 Jan 2025 14:06:03 +0530 Subject: [PATCH 17/70] renaming stages --- ci-runner/executor/StageExecutor.go | 2 +- ci-runner/util/Util.go | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ci-runner/executor/StageExecutor.go b/ci-runner/executor/StageExecutor.go index 3b959e4e0..59bb1b924 100644 --- a/ci-runner/executor/StageExecutor.go +++ b/ci-runner/executor/StageExecutor.go @@ -75,7 +75,7 @@ func (impl *StageExecutorImpl) RunCiCdSteps(stepType helper.StepType, ciCdReques if stageInfoLoggingRequired { log.Println(util.DEVTRON, "stage logging required") - err = util.ExecuteWithStageInfoLog(step.Name, executeStep) + err = util.ExecuteWithStageInfoLog(util.GetPrePostStageDisplayName(step.Name, false), executeStep) } else { log.Println(util.DEVTRON, "stage logging not required") err = executeStep() diff --git a/ci-runner/util/Util.go b/ci-runner/util/Util.go index 42dfe1190..38cacc5e5 100644 --- a/ci-runner/util/Util.go +++ b/ci-runner/util/Util.go @@ -20,6 +20,7 @@ import ( "encoding/json" "errors" "fmt" + "github.com/devtron-labs/ci-runner/helper" "github.com/devtron-labs/common-lib/git-manager/util" "github.com/devtron-labs/common-lib/utils/workFlow" "io" @@ -51,7 +52,7 @@ const ( DOCKER_STOP = "Docker Stop" BUILD_ARTIFACT = "Build Artifact" UPLOAD_ARTIFACT = "Uploading Artifact" - PUSH_CACHE = "Pushing Cache" + PUSH_CACHE = "Pushing Cache (Cleanup)" DOCKER_PUSH_AND_EXTRACT_IMAGE_DIGEST = "Docker Push And Extract Image Digest" IMAGE_SCAN = "Image Scanning" SETUP_BUILDX_BUILDER = "Setting Up Buildx Builder" @@ -298,3 +299,13 @@ func PrintFileContent(filePath string) { // Print the file content log.Println(util.DEVTRON, string(content)) } + +func GetPrePostStageDisplayName(stageName string, stepType helper.StepType) string { + if stepType == helper.STEP_TYPE_PRE { + return fmt.Sprintf("%s (Pre-Build Task)", stageName) + } else if stepType == helper.STEP_TYPE_POST { + return fmt.Sprintf("%s (Post-Build Task)", stageName) + } else { + return fmt.Sprintf("%s", stageName) + } +} From 0ddd02c825ea224ac29310aeefa53084621f4777 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 15 Jan 2025 15:27:51 +0530 Subject: [PATCH 18/70] cyclic import resolve --- ci-runner/executor/StageExecutor.go | 2 +- ci-runner/helper/EventHelper.go | 10 ++++++++++ ci-runner/util/Util.go | 11 ----------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ci-runner/executor/StageExecutor.go b/ci-runner/executor/StageExecutor.go index 59bb1b924..15018d7a9 100644 --- a/ci-runner/executor/StageExecutor.go +++ b/ci-runner/executor/StageExecutor.go @@ -75,7 +75,7 @@ func (impl *StageExecutorImpl) RunCiCdSteps(stepType helper.StepType, ciCdReques if stageInfoLoggingRequired { log.Println(util.DEVTRON, "stage logging required") - err = util.ExecuteWithStageInfoLog(util.GetPrePostStageDisplayName(step.Name, false), executeStep) + err = util.ExecuteWithStageInfoLog(helper.GetPrePostStageDisplayName(step.Name, stepType), executeStep) } else { log.Println(util.DEVTRON, "stage logging not required") err = executeStep() diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 64695e544..195e3fae9 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -770,3 +770,13 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent event.PipelineType = stage return event } + +func GetPrePostStageDisplayName(stageName string, stepType StepType) string { + if stepType == STEP_TYPE_PRE { + return fmt.Sprintf("%s (Pre-Build Task)", stageName) + } else if stepType == STEP_TYPE_POST { + return fmt.Sprintf("%s (Post-Build Task)", stageName) + } else { + return fmt.Sprintf("%s", stageName) + } +} diff --git a/ci-runner/util/Util.go b/ci-runner/util/Util.go index 38cacc5e5..af08d3348 100644 --- a/ci-runner/util/Util.go +++ b/ci-runner/util/Util.go @@ -20,7 +20,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/devtron-labs/ci-runner/helper" "github.com/devtron-labs/common-lib/git-manager/util" "github.com/devtron-labs/common-lib/utils/workFlow" "io" @@ -299,13 +298,3 @@ func PrintFileContent(filePath string) { // Print the file content log.Println(util.DEVTRON, string(content)) } - -func GetPrePostStageDisplayName(stageName string, stepType helper.StepType) string { - if stepType == helper.STEP_TYPE_PRE { - return fmt.Sprintf("%s (Pre-Build Task)", stageName) - } else if stepType == helper.STEP_TYPE_POST { - return fmt.Sprintf("%s (Post-Build Task)", stageName) - } else { - return fmt.Sprintf("%s", stageName) - } -} From 098dbd2aee2ce8948283697e95e0f8882f532612 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 15 Jan 2025 16:03:48 +0530 Subject: [PATCH 19/70] added debug log --- ci-runner/helper/EventHelper.go | 3 +++ ci-runner/util/Util.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 195e3fae9..e3f0be7cd 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -772,11 +772,14 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent } func GetPrePostStageDisplayName(stageName string, stepType StepType) string { + log.Println("stageName-stepType", stageName, stepType) + if stepType == STEP_TYPE_PRE { return fmt.Sprintf("%s (Pre-Build Task)", stageName) } else if stepType == STEP_TYPE_POST { return fmt.Sprintf("%s (Post-Build Task)", stageName) } else { + return fmt.Sprintf("%s", stageName) } } diff --git a/ci-runner/util/Util.go b/ci-runner/util/Util.go index af08d3348..9f7fb06ed 100644 --- a/ci-runner/util/Util.go +++ b/ci-runner/util/Util.go @@ -228,7 +228,7 @@ func ExecuteWithStageInfoLog(stageName string, stageExecutor func() error) (err return ExecuteWithStageInfoLogWithMetadata(stageName, nil, stageExecutor) } -// ExecuteWithStageInfoLog logs the stage info. +// ExecuteWithStageInfoLogWithMetadata logs the stage info. // it will log info for pre stage execution and post the stage execution // return the error returned by the stageExecutor func func ExecuteWithStageInfoLogWithMetadata(stageName string, metadata interface{}, stageExecutor func() error) (err error) { From b7e52a475c98751827f4d3d332dbf4f33d2a34a0 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 15 Jan 2025 16:18:11 +0530 Subject: [PATCH 20/70] remove debug log --- ci-runner/helper/EventHelper.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index e3f0be7cd..e07aa0635 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -772,8 +772,6 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent } func GetPrePostStageDisplayName(stageName string, stepType StepType) string { - log.Println("stageName-stepType", stageName, stepType) - if stepType == STEP_TYPE_PRE { return fmt.Sprintf("%s (Pre-Build Task)", stageName) } else if stepType == STEP_TYPE_POST { From 898c4a5850a92db9335c60c8456a4cacda430202 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Wed, 15 Jan 2025 18:17:28 +0530 Subject: [PATCH 21/70] make dep update oss --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/helper/EventHelper.go | 10 +--------- ci-runner/vendor/modules.txt | 4 ++-- common-lib/imageScan/bean/executionBean.go | 16 ++++++++++++++++ git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 23 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 common-lib/imageScan/bean/executionBean.go diff --git a/chart-sync/go.mod b/chart-sync/go.mod index f9b83a5b9..0e97c893d 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 4dcd14198..1bc78d065 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 47ad2b34d..84cd0dcb7 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 41bb9b0ca..1bd3789cd 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 2ef26729e..530345b57 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 4f21e1c00..bef00d0ba 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -191,7 +191,7 @@ type CommonWorkflowRequest struct { UseDockerApiToGetDigest bool `json:"useDockerApiToGetDigest"` HostUrl string `json:"hostUrl"` ImageScanningSteps []*ImageScanningSteps `json:"imageScanningSteps,omitempty"` - ExecuteImageScanningVia ExecutionMedium `json:"executeImageScanningVia,omitempty"` + ExecuteImageScanningVia bean2.ExecutionMedium `json:"executeImageScanningVia,omitempty"` AwsInspectorConfig string `json:"awsInspectorConfig,omitempty"` } @@ -211,14 +211,6 @@ func (c *CommonWorkflowRequest) GetCdStageType() PipelineType { } return "" } - -type ExecutionMedium string - -const ( - Rest ExecutionMedium = "rest" - Steps ExecutionMedium = "steps" -) - func (c *CommonWorkflowRequest) GetCloudHelperBaseConfig(blobStorageObjectType string) *util.CloudHelperBaseConfig { return &util.CloudHelperBaseConfig{ StorageModuleConfigured: c.BlobStorageConfigured, diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index aa58e88ca..f9b5cc389 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/common-lib/imageScan/bean/executionBean.go b/common-lib/imageScan/bean/executionBean.go new file mode 100644 index 000000000..490345545 --- /dev/null +++ b/common-lib/imageScan/bean/executionBean.go @@ -0,0 +1,16 @@ +package bean + +type ExecutionMedium string + +const ( + Rest ExecutionMedium = "rest" + Steps ExecutionMedium = "steps" +) + +func (e ExecutionMedium) IsExecutionMediumRest() bool { + return e == Rest +} + +func (e ExecutionMedium) IsExecutionMediumSteps() bool { + return e == Steps +} diff --git a/git-sensor/go.mod b/git-sensor/go.mod index dc2f34d02..275991e93 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 04a749a58..d3859c58a 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index ad084e000..24a87d054 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 751c8fca6..002cdc3e1 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/image-scanner/go.sum b/image-scanner/go.sum index ee1dcf711..a618fbef9 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 832a6055c..91b50be09 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/kubelink/go.mod b/kubelink/go.mod index 2deca1de6..f50d15a9d 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index 0948c62d2..a1f88eb6e 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 144b28255..37a337ced 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 508f65348..747d8a95f 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 6dfb89b7f..8418d5554 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index e71176cf0..97105920b 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/lens/go.mod b/lens/go.mod index 4d149caa3..033d6a478 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f diff --git a/lens/go.sum b/lens/go.sum index fb31bda7e..802ae0457 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index aa5124cab..d4ea53130 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f From cdf8ab8dc6e0a3aebf524222ffa82d4c6d0df2c8 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Wed, 15 Jan 2025 18:20:24 +0530 Subject: [PATCH 22/70] common-lib changes --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- .../common-lib/imageScan/bean/executionBean.go | 16 ++++++++++++++++ ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../common-lib/imageScan/bean/executionBean.go | 16 ++++++++++++++++ image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 23 files changed, 67 insertions(+), 35 deletions(-) create mode 100644 ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go create mode 100644 image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 0e97c893d..2280e7cf2 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 1bc78d065..3631fb2cb 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 84cd0dcb7..8e56a55e2 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 1bd3789cd..864922d22 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 530345b57..f5fa92810 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go new file mode 100644 index 000000000..490345545 --- /dev/null +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go @@ -0,0 +1,16 @@ +package bean + +type ExecutionMedium string + +const ( + Rest ExecutionMedium = "rest" + Steps ExecutionMedium = "steps" +) + +func (e ExecutionMedium) IsExecutionMediumRest() bool { + return e == Rest +} + +func (e ExecutionMedium) IsExecutionMediumSteps() bool { + return e == Steps +} diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index f9b5cc389..90c055da9 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 275991e93..cc9541ce5 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index d3859c58a..c2134d8de 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 24a87d054..28ae3ac07 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 002cdc3e1..94706ac9e 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index a618fbef9..495ae1b64 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go new file mode 100644 index 000000000..490345545 --- /dev/null +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go @@ -0,0 +1,16 @@ +package bean + +type ExecutionMedium string + +const ( + Rest ExecutionMedium = "rest" + Steps ExecutionMedium = "steps" +) + +func (e ExecutionMedium) IsExecutionMediumRest() bool { + return e == Rest +} + +func (e ExecutionMedium) IsExecutionMediumSteps() bool { + return e == Steps +} diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 91b50be09..96e2eeb80 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/kubelink/go.mod b/kubelink/go.mod index f50d15a9d..c0287c527 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index a1f88eb6e..d36f4b34f 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 37a337ced..8aaa4c786 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 747d8a95f..18b7929d8 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 8418d5554..df6a4bb51 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 97105920b..072e0acdc 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/lens/go.mod b/lens/go.mod index 033d6a478..badeca5dc 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 diff --git a/lens/go.sum b/lens/go.sum index 802ae0457..5f2efba9e 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f h1:meL1AJCxGiILVS0z1zsRu2eo9u3fNV7h4DeV9D6IPyE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index d4ea53130..3c2da75f6 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115073740-af284e08365f +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 From dd8f717cc396cb66bcf1c111a8ee2d08284931f6 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Wed, 15 Jan 2025 18:22:15 +0530 Subject: [PATCH 23/70] method use --- ci-runner/executor/stage/ciStages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 3a094bbcc..efe5eb745 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -475,7 +475,7 @@ func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scri log.Println("Image scanning completed") return nil } - if ciCdRequest.CommonWorkflowRequest.ExecuteImageScanningVia == helper.Steps { + if ciCdRequest.CommonWorkflowRequest.ExecuteImageScanningVia.IsExecutionMediumSteps() { return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningTaskExecution) } return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningStage) From 76c0c2c0b2b13e6f500c16fdc13d6c43fc55d90f Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 15 Jan 2025 18:36:00 +0530 Subject: [PATCH 24/70] go mod common lib bump --- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 94706ac9e..e2c02d1e1 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 7ea660dcf..03fcf0a8f 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 h1:SEUNvbPg8c+s95p+SUevebFTbQ/cLSVoA+JPFTGwc6I= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 h1:3xP9DdX9WuA/9/hJqKDWx4Jwv5/SXQUghcEGgRmPB7A= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 2fc38f301..a0ad5de84 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113125657-0d2d17231836 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 From 33cda6744e2e92fc1ee528116f939210dbf1fe2d Mon Sep 17 00:00:00 2001 From: Pawan Kumar <85476803+pawan-59@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:25:44 +0530 Subject: [PATCH 25/70] misc: Optimize Dockerfile by Removing Extra Layers (#98) * Updated docker file to remove extra layers * Updated docker file to remove extra layers for ci-runner * updated ci-runner Dockerfile-v27 --- chart-sync/Dockerfile | 25 +++++++++++++----------- ci-runner/Dockerfile | 42 ++++++++++++++++++++++++---------------- ci-runner/Dockerfile-v27 | 33 +++++++++++++++++-------------- git-sensor/Dockerfile | 28 +++++++++++++++------------ image-scanner/Dockerfile | 31 ++++++++++++++++++----------- kubelink/Dockerfile | 20 +++++++++---------- kubewatch/Dockerfile | 17 +++++++--------- lens/Dockerfile | 23 +++++++++++++--------- 8 files changed, 124 insertions(+), 95 deletions(-) diff --git a/chart-sync/Dockerfile b/chart-sync/Dockerfile index af25043cf..cf447d61a 100644 --- a/chart-sync/Dockerfile +++ b/chart-sync/Dockerfile @@ -1,22 +1,25 @@ FROM golang:1.22 AS build-env -RUN apt update -RUN apt install git gcc musl-dev make -y -RUN go install github.com/google/wire/cmd/wire@latest +RUN apt update && \ + apt install git gcc musl-dev make -y && \ + go install github.com/google/wire/cmd/wire@latest WORKDIR /go/src/github.com/devtron-labs/chart-sync + ADD . /go/src/github.com/devtron-labs/chart-sync + RUN GOOS=linux make FROM ubuntu -RUN apt update -RUN apt install ca-certificates -y -RUN apt clean autoclean -RUN apt autoremove -y && rm -rf /var/lib/apt/lists/* -COPY --from=build-env /go/src/github.com/devtron-labs/chart-sync/chart-sync . - -RUN useradd -ms /bin/bash devtron -RUN chown -R devtron:devtron ./chart-sync + +RUN apt update && \ + apt install ca-certificates -y && \ + apt clean autoclean && \ + apt autoremove -y && rm -rf /var/lib/apt/lists/* && \ + useradd -ms /bin/bash devtron + +COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/chart-sync/chart-sync . + USER devtron CMD ["./chart-sync"] diff --git a/ci-runner/Dockerfile b/ci-runner/Dockerfile index 559d28da9..d516493ec 100644 --- a/ci-runner/Dockerfile +++ b/ci-runner/Dockerfile @@ -1,38 +1,46 @@ -####-------------- FROM golang:1.21-alpine3.18 AS build-env -RUN apk add --no-cache git gcc musl-dev -RUN apk add --update make +RUN apk add --no-cache git gcc musl-dev && \ + apk add --update make WORKDIR /go/src/github.com/devtron-labs/cirunner -ADD . /go/src/github.com/devtron-labs/cirunner/ + +# ADD . /go/src/github.com/devtron-labs/cirunner/ COPY . . + # Build the binary RUN CGO_ENABLED=0 GOOS=linux go build -buildvcs=false -a -installsuffix cgo -o /go/bin/cirunner FROM docker:20.10.24-dind # All these steps will be cached #RUN apk add --no-cache ca-certificates -RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -RUN apk -Uuv add groff less python3 py3-pip -RUN pip3 install awscli -RUN apk --purge -v del py-pip -RUN rm /var/cache/apk/* + +RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq && \ + ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \ + apk -Uuv add groff less python3 py3-pip && \ + pip3 install awscli && \ + apk --purge -v del py-pip && \ + rm /var/cache/apk/* + COPY --from=docker/compose:latest /usr/local/bin/docker-compose /usr/bin/docker-compose -COPY ./buildpack.json /buildpack.json -COPY ./git-ask-pass.sh /git-ask-pass.sh -RUN chmod +x /git-ask-pass.sh +COPY ./buildpack.json ./git-ask-pass.sh / +# COPY ./git-ask-pass.sh /git-ask-pass.sh -RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack) +RUN chmod +x /git-ask-pass.sh && \ + (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack) COPY --from=build-env /go/bin/cirunner . + COPY ./ssh-config /root/.ssh/config -RUN chmod 644 /root/.ssh/config -RUN mkdir -p /etc/docker + +RUN chmod 644 /root/.ssh/config && \ + mkdir -p /etc/docker && \ + mkdir -p /root/.docker/buildx + COPY docker-daemon.json /etc/docker/daemon.json -RUN mkdir -p /root/.docker/buildx + + COPY buildkitd.default.toml /root/.docker/buildx/buildkitd.default.toml # passing PARENT_MODE as argument to cirunner as default behavior diff --git a/ci-runner/Dockerfile-v27 b/ci-runner/Dockerfile-v27 index d7c49cfaf..7a337b48c 100644 --- a/ci-runner/Dockerfile-v27 +++ b/ci-runner/Dockerfile-v27 @@ -1,11 +1,12 @@ -####-------------- FROM golang:1.21-alpine3.18 AS build-env -RUN apk add --no-cache git gcc musl-dev -RUN apk add --update make +RUN apk add --no-cache git gcc musl-dev && \ + apk add --update make WORKDIR /go/src/github.com/devtron-labs/cirunner + ADD . /go/src/github.com/devtron-labs/cirunner/ + COPY . . # Build the binary RUN CGO_ENABLED=0 GOOS=linux go build -buildvcs=false -a -installsuffix cgo -o /go/bin/cirunner @@ -14,24 +15,26 @@ RUN CGO_ENABLED=0 GOOS=linux go build -buildvcs=false -a -installsuffix cgo -o / FROM docker:27.3-dind # All these steps will be cached #RUN apk add --no-cache ca-certificates -RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -RUN apk -Uuv add groff less python3 py3-pip pipx -RUN pipx ensurepath && pipx install awscli -RUN cp /root/.local/bin/aws* /usr/local/bin -RUN apk --purge -v del py-pip -RUN rm /var/cache/apk/* + +RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && apk add make && apk add curl && apk add git && apk add zip && apk add jq && \ + ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \ + apk -Uuv add groff less python3 py3-pip pipx && \ + pipx ensurepath && pipx install awscli && \ + cp /root/.local/bin/aws* /usr/local/bin && \ + apk --purge -v del py-pip && \ + rm /var/cache/apk/* + COPY --from=docker/compose:1.29.2 /usr/local/bin/docker-compose /usr/bin/docker-compose -COPY ./buildpack.json /buildpack.json -COPY ./git-ask-pass.sh /git-ask-pass.sh -RUN chmod +x /git-ask-pass.sh +COPY ./buildpack.json /git-ask-pass.sh / -RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack) +# COPY ./git-ask-pass.sh /git-ask-pass.sh +RUN chmod +x /git-ask-pass.sh && \ + (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack) COPY --from=build-env /go/bin/cirunner . COPY ./ssh-config /root/.ssh/config RUN chmod 644 /root/.ssh/config # passing PARENT_MODE as argument to cirunner as default behavior -ENTRYPOINT ["./cirunner", "PARENT_MODE"] \ No newline at end of file +ENTRYPOINT ["./cirunner", "PARENT_MODE"] diff --git a/git-sensor/Dockerfile b/git-sensor/Dockerfile index 9ddb1b7b2..5204dd0bb 100644 --- a/git-sensor/Dockerfile +++ b/git-sensor/Dockerfile @@ -1,23 +1,27 @@ FROM golang:1.21-alpine3.17 AS build-env -RUN apk add --no-cache git gcc musl-dev -RUN apk add --update make -RUN go install github.com/google/wire/cmd/wire@latest +RUN apk add --no-cache git gcc musl-dev && \ + apk add --update make && \ + go install github.com/google/wire/cmd/wire@latest + WORKDIR /go/src/github.com/devtron-labs/git-sensor + ADD . /go/src/github.com/devtron-labs/git-sensor/ + RUN GOOS=linux make FROM alpine:3.17 + COPY ./git-ask-pass.sh /git-ask-pass.sh -RUN chmod +x /git-ask-pass.sh -RUN apk add --no-cache ca-certificates -RUN apk add git --no-cache -RUN apk add openssh --no-cache -COPY --from=build-env /go/src/github.com/devtron-labs/git-sensor/git-sensor . -COPY --from=build-env /go/src/github.com/devtron-labs/git-sensor/scripts/ . - -RUN adduser -D devtron -RUN chown -R devtron:devtron ./git-sensor + +RUN chmod +x /git-ask-pass.sh && \ + apk add --no-cache ca-certificates && \ + apk add git --no-cache && \ + apk add openssh --no-cache && \ + adduser -D devtron + +COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/git-sensor/scripts/ /go/src/github.com/devtron-labs/git-sensor/git-sensor . + USER devtron CMD ["./git-sensor"] diff --git a/image-scanner/Dockerfile b/image-scanner/Dockerfile index 2d0e1fa3b..66c29078f 100644 --- a/image-scanner/Dockerfile +++ b/image-scanner/Dockerfile @@ -1,20 +1,29 @@ FROM golang:1.21-alpine3.18 AS build-env -RUN apk add --no-cache git gcc musl-dev -RUN apk add --update make -RUN go install github.com/google/wire/cmd/wire@latest + +RUN apk add --no-cache git gcc musl-dev && \ + apk add --update make && \ + go install github.com/google/wire/cmd/wire@latest + WORKDIR /go/src/github.com/devtron-labs/image-scanner + ADD . /go/src/github.com/devtron-labs/image-scanner + RUN GOOS=linux make FROM alpine:3.17 + COPY --from=aquasec/trivy:0.46.1 /usr/local/bin/trivy /usr/local/bin/trivy -RUN apk add --no-cache ca-certificates -RUN mkdir -p /security -RUN adduser -D devtron -COPY --from=build-env /go/src/github.com/devtron-labs/image-scanner/image-scanner . -RUN chown -R devtron:devtron ./image-scanner -RUN chmod +x ./image-scanner -RUN chown -R devtron:devtron ./security -RUN chmod +x ./security + +RUN apk add --no-cache ca-certificates && \ + mkdir -p /security && \ + adduser -D devtron + +COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/image-scanner/image-scanner . + +RUN chmod +x ./image-scanner && \ + chown -R devtron:devtron ./security && \ + chmod +x ./security + USER devtron + CMD ["./image-scanner"] diff --git a/kubelink/Dockerfile b/kubelink/Dockerfile index e049e081f..5da88236f 100644 --- a/kubelink/Dockerfile +++ b/kubelink/Dockerfile @@ -1,22 +1,22 @@ FROM golang:1.22 AS build-env -RUN apt update -RUN apt install git gcc musl-dev make -y -RUN go install github.com/google/wire/cmd/wire@latest +RUN apt update && \ + apt install git gcc musl-dev make -y && \ + go install github.com/google/wire/cmd/wire@latest WORKDIR /go/src/github.com/devtron-labs/kubelink ADD . /go/src/github.com/devtron-labs/kubelink/ RUN GOOS=linux make FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 -RUN apt update -RUN apt install ca-certificates -y -RUN apt clean autoclean -RUN apt autoremove -y && rm -rf /var/lib/apt/lists/* -COPY --from=build-env /go/src/github.com/devtron-labs/kubelink/kubelink . +RUN apt update && \ + apt install ca-certificates -y && \ + apt clean autoclean && \ + apt autoremove -y && rm -rf /var/lib/apt/lists/* && \ + useradd -ms /bin/bash devtron + +COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/kubelink/kubelink . -RUN useradd -ms /bin/bash devtron -RUN chown -R devtron:devtron ./kubelink USER devtron CMD ["./kubelink"] diff --git a/kubewatch/Dockerfile b/kubewatch/Dockerfile index b4a281f5a..e750188e1 100644 --- a/kubewatch/Dockerfile +++ b/kubewatch/Dockerfile @@ -1,25 +1,22 @@ FROM golang:1.21-alpine3.19 AS build-env -RUN echo $GOPATH +RUN echo $GOPATH && \ + apk add --no-cache git gcc musl-dev && \ + apk add --update make -RUN apk add --no-cache git gcc musl-dev -RUN apk add --update make WORKDIR /go/src/github.com/devtron-labs/kubewatch ADD . /go/src/github.com/devtron-labs/kubewatch RUN GOOS=linux make FROM alpine:3.19 -RUN apk add --update ca-certificates +RUN apk add --update ca-certificates && \ + adduser -D devtron -RUN adduser -D devtron - -COPY --from=build-env /go/src/github.com/devtron-labs/kubewatch/kubewatch . - -RUN chown devtron:devtron ./kubewatch +COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/kubewatch/kubewatch . RUN chmod +x ./kubewatch USER devtron -ENTRYPOINT ["./kubewatch"] \ No newline at end of file +ENTRYPOINT ["./kubewatch"] diff --git a/lens/Dockerfile b/lens/Dockerfile index 5d4c54a4a..90f74a7ad 100644 --- a/lens/Dockerfile +++ b/lens/Dockerfile @@ -1,17 +1,22 @@ FROM golang:1.21-alpine3.18 AS build-env -RUN apk add --no-cache git gcc musl-dev -RUN apk add --update make +RUN apk add --no-cache git gcc musl-dev && \ + apk add --update make + WORKDIR /go/src/github.com/devtron-labs/lens + ADD . /go/src/github.com/devtron-labs/lens -RUN go install github.com/google/wire/cmd/wire@latest -RUN GOOS=linux make + +RUN go install github.com/google/wire/cmd/wire@latest && \ + GOOS=linux make FROM alpine:3.17 -RUN apk add --no-cache ca-certificates -COPY --from=build-env /go/src/github.com/devtron-labs/lens/lens . -COPY --from=build-env /go/src/github.com/devtron-labs/lens/scripts/ . -RUN adduser -D devtron -RUN chown -R devtron:devtron ./lens + +RUN apk add --no-cache ca-certificates && \ + adduser -D devtron + +COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/lens/lens /go/src/github.com/devtron-labs/lens/scripts/ . + USER devtron + CMD ["./lens"] From 3b05ceb3da817c2c9160f425827dda940b18eb44 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Thu, 16 Jan 2025 16:46:17 +0530 Subject: [PATCH 26/70] set digest --- ci-runner/executor/stage/ciStages.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index efe5eb745..d8822b55f 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -257,6 +257,7 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. return artifactUploaded, err } } + setDigestInGlobalEnv(scriptEnvs, digest) var postCiDuration float64 start = time.Now() metrics.PostCiStartTime = start @@ -325,6 +326,9 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. } return artifactUploaded, nil } +func setDigestInGlobalEnv(scriptEnvs *util2.ScriptEnvVariables, digest string) { + scriptEnvs.SystemEnv["DIGEST"] = digest +} func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, buildSkipEnabled bool, refStageMap map[int][]*helper.StepObject, From 1f1df1cb43ca08141c16566fb5db44251f78c1aa Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Thu, 16 Jan 2025 17:29:30 +0530 Subject: [PATCH 27/70] bean.ScanExecutionProcessStateRunning -> bean.ScanExecutionProcessStateCompleted --- image-scanner/pkg/security/ImageScanService.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-scanner/pkg/security/ImageScanService.go b/image-scanner/pkg/security/ImageScanService.go index 9e01b6100..51c9dac08 100644 --- a/image-scanner/pkg/security/ImageScanService.go +++ b/image-scanner/pkg/security/ImageScanService.go @@ -284,7 +284,7 @@ func (impl *ImageScanServiceImpl) saveImageScanExecutionHistoryAndState(executio impl.Logger.Errorw("Failed to save executionHistory", "model", executionHistoryModel, "err", err) return err } - executionHistoryMappingModel := adaptor.GetScanToolExecutionHistoryMapping(executionHistoryModel, bean.ScanExecutionProcessStateRunning, "", toolId) + executionHistoryMappingModel := adaptor.GetScanToolExecutionHistoryMapping(executionHistoryModel, bean.ScanExecutionProcessStateCompleted, "", toolId) err = impl.ScanToolExecutionHistoryMappingRepository.Save(tx, executionHistoryMappingModel) if err != nil { impl.Logger.Errorw("Failed to save executionHistoryMappingModel", "err", err) From 54d6c72086affc5d72313a69d0450a8752365ee0 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Thu, 16 Jan 2025 18:11:21 +0530 Subject: [PATCH 28/70] error fix --- ci-runner/executor/stage/ciStages.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index d8822b55f..fa4fe16f3 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -465,12 +465,12 @@ func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scri //setting scan tool id in script env scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = strconv.Itoa(scanToolId) // run image scanning steps - _, _, step, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) + _, _, _, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) if err != nil { log.Println("error in running pre Ci Steps", "err", err) return helper.NewCiStageError(err). WithMetrics(metrics). - WithFailureMessage(fmt.Sprintf(workFlow.ScanFailed.String(), step.Name)). + WithFailureMessage(workFlow.ScanFailed.String()). WithArtifactUploaded(artifactUploaded) } } From 725b8ddcfdcd85229002c01618bd13c41c06bab4 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Thu, 16 Jan 2025 19:40:00 +0530 Subject: [PATCH 29/70] validation --- image-scanner/api/RestHandler.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/image-scanner/api/RestHandler.go b/image-scanner/api/RestHandler.go index 88891d509..894843aa7 100644 --- a/image-scanner/api/RestHandler.go +++ b/image-scanner/api/RestHandler.go @@ -18,6 +18,7 @@ package api import ( "encoding/json" + "fmt" bean2 "github.com/devtron-labs/common-lib/imageScan/bean" "github.com/devtron-labs/image-scanner/common" "github.com/devtron-labs/image-scanner/pkg/clairService" @@ -182,6 +183,14 @@ func (impl *RestHandlerImpl) RegisterAndSaveScannedResult(w http.ResponseWriter, WriteJsonResp(w, err, nil, http.StatusBadRequest) return } + + err = ValidateScanResultPayload(&scanResultPayload) + if err != nil { + impl.Logger.Errorw("validation failed", "error", err) + WriteJsonResp(w, err, nil, http.StatusBadRequest) + return + } + impl.Logger.Infow("register and save scan result payload", "saveScanResultPayload", scanResultPayload) _, err = impl.ImageScanService.RegisterAndSaveScannedResult(&scanResultPayload) if err != nil { @@ -191,3 +200,25 @@ func (impl *RestHandlerImpl) RegisterAndSaveScannedResult(w http.ResponseWriter, } WriteJsonResp(w, nil, nil, http.StatusOK) } + +func ValidateScanResultPayload(scanResultPayload *bean2.ScanResultPayload) error { + if scanResultPayload.ScanToolId == 0 { + return fmt.Errorf("scan tool id not found: required") + } + if scanResultPayload.ImageScanEvent == nil { + return fmt.Errorf("image and digest not found: required") + } + if scanResultPayload.ImageScanEvent != nil && len(scanResultPayload.ImageScanEvent.Image) == 0 { + return fmt.Errorf("image not found: required") + } + if scanResultPayload.ImageScanEvent != nil && len(scanResultPayload.ImageScanEvent.ImageDigest) == 0 { + return fmt.Errorf("image digest not found: required") + } + if len(scanResultPayload.Sbom) == 0 { + return fmt.Errorf("sbom not found: required") + } + if len(scanResultPayload.SourceScanningResult) == 0 { + return fmt.Errorf("source Scanning result not found: required") + } + return nil +} From caecad971809f2a2d581d42c4577a93c9aa9782e Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 09:56:57 +0530 Subject: [PATCH 30/70] constants --- ci-runner/helper/DockerHelper.go | 8 ++++---- common-lib/utils/CommonUtils.go | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 57ae03b67..5aad857a2 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1062,12 +1062,12 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string annotations := make(map[string]string) // Read labels and annotations from files - labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/labels" + labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_LABELS labelsOut, err := os.ReadFile(labelsPath) if err != nil { log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) } - annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/annotations" + annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS annotationsOut, err := os.ReadFile(annotationsPath) if err != nil { log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) @@ -1082,8 +1082,8 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string } // Combine driver options - driverOptions = getBuildXDriverOptions("labels", labels, driverOptions) - driverOptions = getBuildXDriverOptions("annotations", annotations, driverOptions) + driverOptions = getBuildXDriverOptions(utils.POD_LABELS, labels, driverOptions) + driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) return driverOptions } diff --git a/common-lib/utils/CommonUtils.go b/common-lib/utils/CommonUtils.go index b8e4084ef..433803400 100644 --- a/common-lib/utils/CommonUtils.go +++ b/common-lib/utils/CommonUtils.go @@ -41,6 +41,8 @@ const ( DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string From c8fd025211ca8d4a758225536af54cbaa5b38158 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 10:28:51 +0530 Subject: [PATCH 31/70] error handling in IO --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 +- ci-runner/helper/DockerHelper.go | 48 ++++++++++++++----- .../common-lib/utils/CommonUtils.go | 2 + ci-runner/vendor/modules.txt | 4 +- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 41bb9b0ca..39488a192 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 2ef26729e..3248b8fe5 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 h1:StPAZl4mjOlJ2Rhe00T+IUjfLvtJe6/0iDu77eJ5kfA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 5aad857a2..b7c0b4f84 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -945,7 +945,10 @@ func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.C deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName, err := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + if err != nil { + return err + } deploymentNames = append(deploymentNames, deploymentName) // first node is used as default node, we create builder with --use flag, then we append other nodes if i == 0 { @@ -957,7 +960,7 @@ func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.C fmt.Println(util.DEVTRON, " cmd : ", builderCmd) builderExecCmd := impl.GetCommandToExecute(builderCmd) - err := impl.cmdExecutor.RunCommand(ciContext, builderExecCmd) + err = impl.cmdExecutor.RunCommand(ciContext, builderExecCmd) if err != nil { fmt.Println(util.DEVTRON, " builderCmd : ", builderCmd, " err : ", err, " error : ") return err @@ -1017,7 +1020,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string) { +func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string, error) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1030,7 +1033,11 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildxCreate = fmt.Sprintf(buildxCreate, platforms) } // add driver options for app labels and annotations - driverOpts["driverOptions"] = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + var err error + driverOpts["driverOptions"], err = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + if err != nil { + return "", "", err + } driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) if len(driverOpts["driverOptions"]) > 0 { @@ -1042,7 +1049,7 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt buildkitToml = fmt.Sprintf("--config %s", BuildkitdConfigPath) } buildxCreate = fmt.Sprintf("%s %s", buildxCreate, buildkitToml) - return buildxCreate, nodeName + return buildxCreate, nodeName, nil } func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) string { @@ -1057,20 +1064,20 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st return driverOptions } -func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string { +func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) (string, error) { labels := make(map[string]string) annotations := make(map[string]string) // Read labels and annotations from files labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_LABELS - labelsOut, err := os.ReadFile(labelsPath) + labelsOut, err := readFileAndLogErrors(labelsPath) if err != nil { - log.Println(util.DEVTRON, "error in reading labels from podinfo, err:", err) + return "", err } annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS - annotationsOut, err := os.ReadFile(annotationsPath) + annotationsOut, err := readFileAndLogErrors(annotationsPath) if err != nil { - log.Println(util.DEVTRON, "error in reading annotations from podinfo, err:", err) + return "", err } // Parse labels and annotations @@ -1084,18 +1091,33 @@ func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) string // Combine driver options driverOptions = getBuildXDriverOptions(utils.POD_LABELS, labels, driverOptions) driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) - return driverOptions + return driverOptions, nil +} + +func readFileAndLogErrors(filePath string) ([]byte, error) { + content, err := os.ReadFile(filePath) + if err != nil { + if errors.Is(err, os.ErrNotExist) { + log.Println(util.DEVTRON, "file not found at path:", filePath) + return content, nil + } else { + log.Println(util.DEVTRON, "IO error while reading file at path:", filePath, "err:", err) + return nil, err + } + } + return content, nil } func parseKeyValuePairs(input string) map[string]string { keyValuePairs := make(map[string]string) lines := strings.Split(input, "\n") for _, line := range lines { + line = strings.TrimSpace(line) if len(line) > 0 { kv := strings.SplitN(line, "=", 2) if len(kv) == 2 { - key := kv[0] - value := strings.Trim(kv[1], `"`) + key := strings.TrimSpace(kv[0]) + value := strings.Trim(strings.TrimSpace(kv[1]), `"`) keyValuePairs[key] = value } } diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index b8e4084ef..433803400 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -41,6 +41,8 @@ const ( DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index aa58e88ca..07528fe12 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117042657-caecad971809 From 33230d68e81aba9ef9600eb3910df2d273e3b5dd Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Fri, 17 Jan 2025 12:01:55 +0530 Subject: [PATCH 32/70] main sync develop --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 + lens/vendor/modules.txt | 4 ++-- 28 files changed, 42 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index a8b2d51f2..c9d252c9f 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 0cb388190..41ed51b1b 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index abb084db4..36645d97a 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 771a78972..fac59db38 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 9af264b62..c8d9dedb8 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 68d0f0bcd..3e8b35333 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 383f34412..8cbe6bf7e 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index b322f63e2..838edbb65 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 701d92d5b..0e4979c61 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 0e6b095a8..d729187f0 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 927e48c6e..4e9867a26 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 7398cc306..0e3cf90f1 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/kubelink/go.mod b/kubelink/go.mod index c7f725391..cc4c75bbc 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index e35e6499f..c3a42f0ba 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index f7b830552..0794ceeb8 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index cb13f889d..25d5fa737 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/kubewatch/go.sum b/kubewatch/go.sum index eca9d24ae..61698300d 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 9b81f4fcf..7c77746a7 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/lens/go.mod b/lens/go.mod index 82d345f34..2255d42be 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e diff --git a/lens/go.sum b/lens/go.sum index 244a5515d..bcc344fb3 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 h1:j50+P6ljU+kf7F21i/xkZ1THvEtMuV30SkYWcpQlsrs= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 4f92471ed..aaebee868 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,6 +147,7 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } +// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index e6297de5a..e6d5d029e 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116080641-69137a4c16e9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e From 31a94799da160e3000f8741ba8dd142b2bc8ec03 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Fri, 17 Jan 2025 12:52:20 +0530 Subject: [PATCH 33/70] moved to common-lib extrations --- common-lib/utils/registry/bean.go | 26 ++++--- .../utils/registry/extractCredentials.go | 72 +++++++++++++++++++ 2 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 common-lib/utils/registry/extractCredentials.go diff --git a/common-lib/utils/registry/bean.go b/common-lib/utils/registry/bean.go index 457453268..d6796fe3b 100644 --- a/common-lib/utils/registry/bean.go +++ b/common-lib/utils/registry/bean.go @@ -1,18 +1,28 @@ package registry -type registry string +type Registry string -func (r registry) String() string { +func (r Registry) String() string { return string(r) } const ( - DOCKER_REGISTRY_TYPE_ECR registry = "ecr" - DOCKER_REGISTRY_TYPE_ACR registry = "acr" - DOCKER_REGISTRY_TYPE_DOCKERHUB registry = "docker-hub" - DOCKER_REGISTRY_TYPE_OTHER registry = "other" - REGISTRY_TYPE_ARTIFACT_REGISTRY registry = "artifact-registry" - REGISTRY_TYPE_GCR registry = "gcr" + DOCKER_REGISTRY_TYPE_ECR Registry = "ecr" + DOCKER_REGISTRY_TYPE_ACR Registry = "acr" + DOCKER_REGISTRY_TYPE_DOCKERHUB Registry = "docker-hub" + DOCKER_REGISTRY_TYPE_OTHER Registry = "other" + REGISTRY_TYPE_ARTIFACT_REGISTRY Registry = "artifact-registry" + REGISTRY_TYPE_GCR Registry = "gcr" ) const JSON_KEY_USERNAME = "_json_key" + +type RegistryCredential struct { + RegistryType Registry `json:"registryType"` + RegistryURL string `json:"registryURL"` + Username string `json:"username"` + Password string `json:"password"` + AWSAccessKeyId string `json:"awsAccessKeyId,omitempty"` + AWSSecretAccessKey string `json:"awsSecretAccessKey,omitempty"` + AWSRegion string `json:"awsRegion,omitempty"` +} diff --git a/common-lib/utils/registry/extractCredentials.go b/common-lib/utils/registry/extractCredentials.go new file mode 100644 index 000000000..b0017670f --- /dev/null +++ b/common-lib/utils/registry/extractCredentials.go @@ -0,0 +1,72 @@ +package registry + +import ( + "encoding/base64" + "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/ecr" + "strings" +) + +func ExtractCredentialsForRegistry(registryCredential *RegistryCredential) (string, string, error) { + username := registryCredential.Username + pwd := registryCredential.Password + if (registryCredential.RegistryType == REGISTRY_TYPE_GCR || registryCredential.RegistryType == REGISTRY_TYPE_ARTIFACT_REGISTRY) && username == JSON_KEY_USERNAME { + if strings.HasPrefix(pwd, "'") { + pwd = pwd[1:] + } + if strings.HasSuffix(pwd, "'") { + pwd = pwd[:len(pwd)-1] + } + } + if registryCredential.RegistryType == DOCKER_REGISTRY_TYPE_ECR { + accessKey, secretKey := registryCredential.AWSAccessKeyId, registryCredential.AWSSecretAccessKey + var creds *credentials.Credentials + + if len(registryCredential.AWSAccessKeyId) == 0 || len(registryCredential.AWSSecretAccessKey) == 0 { + sess, err := session.NewSession(&aws.Config{ + Region: ®istryCredential.AWSRegion, + }) + if err != nil { + fmt.Printf("Error in creating AWS client", "err", err) + return "", "", err + } + creds = ec2rolecreds.NewCredentials(sess) + } else { + creds = credentials.NewStaticCredentials(accessKey, secretKey, "") + } + sess, err := session.NewSession(&aws.Config{ + Region: ®istryCredential.AWSRegion, + Credentials: creds, + }) + if err != nil { + fmt.Println("Error in creating AWS client session", "err", err) + return "", "", err + } + svc := ecr.New(sess) + input := &ecr.GetAuthorizationTokenInput{} + authData, err := svc.GetAuthorizationToken(input) + if err != nil { + fmt.Println("Error fetching authData", "err", err) + return "", "", err + } + // decode token + token := authData.AuthorizationData[0].AuthorizationToken + decodedToken, err := base64.StdEncoding.DecodeString(*token) + if err != nil { + fmt.Println("Error in decoding auth token", "err", err) + return "", "", err + } + credsSlice := strings.Split(string(decodedToken), ":") + if len(credsSlice) < 2 { + fmt.Println("Error in decoding auth token", "err", err) + return "", "", fmt.Errorf("error in decoding auth token for docker Registry") + } + username = credsSlice[0] + pwd = credsSlice[1] + } + return username, pwd, nil +} From fefedf01262ec4d9d48049364197438ea9335221 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Fri, 17 Jan 2025 13:03:43 +0530 Subject: [PATCH 34/70] file utils --- common-lib/utils/FileUtil.go | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/common-lib/utils/FileUtil.go b/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/common-lib/utils/FileUtil.go +++ b/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} From 39e6eaf1e39378d785421ec487c497913d790beb Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Fri, 17 Jan 2025 13:40:06 +0530 Subject: [PATCH 35/70] make dep oss update --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 +- .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ chart-sync/vendor/modules.txt | 4 +- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 +- .../common-lib/imageScan/bean/bean.go | 19 ++++++++++ .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ ci-runner/vendor/modules.txt | 4 +- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 +- .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ git-sensor/vendor/modules.txt | 4 +- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 +- .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ image-scanner/vendor/modules.txt | 4 +- kubelink/go.mod | 2 +- kubelink/go.sum | 4 +- .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ kubelink/vendor/modules.txt | 4 +- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 +- .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ kubewatch/vendor/modules.txt | 4 +- lens/go.mod | 2 +- lens/go.sum | 4 +- .../devtron-labs/common-lib/utils/FileUtil.go | 38 +++++++++++++++++++ lens/vendor/modules.txt | 4 +- 29 files changed, 320 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 2280e7cf2..8eb81f427 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 3631fb2cb..9304bd3f0 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 8e56a55e2..c78fe127f 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 864922d22..2b96b5c91 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index f5fa92810..ba766b52e 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go index b18d694ea..79decb1db 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/bean.go @@ -62,3 +62,22 @@ func (r *ImageScanEvent) IsImageFromManifest() bool { func (r *ImageScanEvent) IsBuiltImage() bool { return r.SourceType == constants.SourceTypeImage && r.SourceSubType == constants.SourceSubTypeCi } + +type ScanResultPayload struct { + ImageScanEvent *ImageScanEvent + ScanToolId int `json:"scanToolId"` + SourceScanningResult string `json:"sourceScanningResult"` + Sbom string `json:"sbom"` + ImageScanOutput []*ImageScanOutputObject `json:"imageScanOutput"` +} + +type ImageScanOutputObject struct { + TargetName string `json:"targetName"` + Class string `json:"class"` + Type string `json:"type"` + Name string `json:"name"` + Package string `json:"package"` + PackageVersion string `json:"packageVersion"` + FixedInVersion string `json:"fixedInVersion"` + Severity string `json:"severity"` +} diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 90c055da9..3f29f39e6 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/git-sensor/go.mod b/git-sensor/go.mod index cc9541ce5..eca604c4d 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index c2134d8de..dc660c8ab 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 28ae3ac07..d26b4b380 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/image-scanner/go.mod b/image-scanner/go.mod index e2c02d1e1..bb3f5b6b6 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 03fcf0a8f..4f4c02ff7 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 h1:3xP9DdX9WuA/9/hJqKDWx4Jwv5/SXQUghcEGgRmPB7A= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index a0ad5de84..a1d26f9c8 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115125807-9bf14abaadc6 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/kubelink/go.mod b/kubelink/go.mod index c0287c527..60d050f87 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index d36f4b34f..adfe9a073 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 8aaa4c786..0eda16e36 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 18b7929d8..3f06a864e 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/kubewatch/go.sum b/kubewatch/go.sum index df6a4bb51..221d8d667 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 072e0acdc..6d0fd4815 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/lens/go.mod b/lens/go.mod index badeca5dc..443aadbc9 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e diff --git a/lens/go.sum b/lens/go.sum index 5f2efba9e..a7e6b3440 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 h1:/jTPIXwyc6z1AMEaW0VL/dZKMZbbk0lFBpULdigEjCU= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go b/lens/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go index a26977c6b..61d8c5fff 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/utils/FileUtil.go @@ -1,6 +1,8 @@ package utils import ( + "errors" + "fmt" "io/ioutil" "os" "path" @@ -34,3 +36,39 @@ func DeleteAFileIfExists(path string) error { } return nil } + +const ( + PermissionMode = 0644 +) + +func CreateDirectory(path string) error { + err := os.MkdirAll(path, PermissionMode) + if err != nil { + fmt.Println("error in creating directory", "err", err) + return err + } + return nil +} + +func CheckFileExists(filename string) (bool, error) { + if _, err := os.Stat(filename); err == nil { + // exists + return true, nil + + } else if errors.Is(err, os.ErrNotExist) { + // not exists + return false, nil + } else { + // Some other error + return false, err + } +} + +func WriteToFile(file string, fileName string) error { + err := os.WriteFile(fileName, []byte(file), PermissionMode) + if err != nil { + fmt.Println("error in writing results to json file", "err", err) + return err + } + return nil +} diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 3c2da75f6..88d2fbbba 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250115124728-898c4a5850a9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e From 3d6ac9f538600e322f2f2a18f5f71991ce397494 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 14:20:10 +0530 Subject: [PATCH 36/70] sync --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 - ci-runner/vendor/modules.txt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index fac59db38..fb85499ac 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index c8d9dedb8..a2a298100 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 h1:bEBayfPiDimFBnh16Sr5Ays7MkHnV7RmAhqVOix31gc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 433803400..24e05eb36 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -151,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 3e8b35333..57971261e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 From 7afad1ea96e92874eff53ef3b1c8b63d13bae590 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 17 Jan 2025 14:24:45 +0530 Subject: [PATCH 37/70] common-lib sync --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- .../devtron-labs/common-lib/utils/CommonUtils.go | 11 +++++++---- lens/vendor/modules.txt | 4 ++-- 27 files changed, 77 insertions(+), 59 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index c9d252c9f..c5fab584d 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 41ed51b1b..fe3500ed0 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 36645d97a..2de2f38b3 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index fb85499ac..69105bf2d 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index a2a298100..92843375d 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 h1:bEBayfPiDimFBnh16Sr5Ays7MkHnV7RmAhqVOix31gc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 57971261e..4f72a983e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117084842-3c1000d0c5f9 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 8cbe6bf7e..515894f71 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 838edbb65..4a4778065 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 0e4979c61..4a7f1a565 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index d729187f0..cd86a9b4b 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 4e9867a26..d7e8aad3b 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 0e3cf90f1..447cac4fc 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/kubelink/go.mod b/kubelink/go.mod index cc4c75bbc..76651ca16 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index c3a42f0ba..4b20b7e4e 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 0794ceeb8..32975b949 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 25d5fa737..79212cd75 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 61698300d..60c4f39cc 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 7c77746a7..92de57e06 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/lens/go.mod b/lens/go.mod index 2255d42be..64ad8fa28 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 diff --git a/lens/go.sum b/lens/go.sum index bcc344fb3..479da65d3 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e h1:VoqeZNqIWXGPhyNb8VMVJycOebYb96mGnIm3hejL/ro= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 h1:W3nZCHpacaVQHmYHqbbXw3azzunAzKkf6VYujCUprQA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..24e05eb36 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -36,9 +36,13 @@ import ( var chars = []rune("abcdefghijklmnopqrstuvwxyz0123456789") const ( - DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" - DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" - DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DOCKER_REGISTRY_TYPE_DOCKERHUB = "docker-hub" + DEVTRON_SELF_POD_UID = "DEVTRON_SELF_POD_UID" + DEVTRON_SELF_POD_NAME = "DEVTRON_SELF_POD_NAME" + DEVTRON_SELF_DOWNWARD_API_VOLUME = "devtron-pod-info" + DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH = "/etc/devtron-pod-info" + POD_LABELS = "labels" + POD_ANNOTATIONS = "annotations" ) // Generates random string @@ -147,7 +151,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index e6d5d029e..6cfcc2ca6 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250116095544-33cda6744e2e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117085010-3d6ac9f53860 From 146777490a604f084bfd6fcb44f7f327b10c042e Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Fri, 17 Jan 2025 15:48:33 +0530 Subject: [PATCH 38/70] tool checks --- image-scanner/api/RestHandler.go | 6 +++++- image-scanner/pkg/sql/bean/bean.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/image-scanner/api/RestHandler.go b/image-scanner/api/RestHandler.go index 894843aa7..139227cd9 100644 --- a/image-scanner/api/RestHandler.go +++ b/image-scanner/api/RestHandler.go @@ -164,12 +164,16 @@ func (impl *RestHandlerImpl) ScanImageAsPerTool(scanConfig *bean2.ImageScanEvent impl.Logger.Errorw("err in process msg", "err", err) return nil, err } - } else { + } else if tool.Name == bean.ScannerTypeTrivy && tool.Version == bean.ScanToolVersion1 { err = impl.ImageScanService.ScanImage(scanConfig, tool, executionHistory, executionHistoryDirPath) if err != nil { impl.Logger.Errorw("err in process msg", "err", err) return nil, err } + } else { + err = fmt.Errorf("no tool found for scanning") + impl.Logger.Errorw("err in process msg", "err", err) + return nil, err } return result, nil } diff --git a/image-scanner/pkg/sql/bean/bean.go b/image-scanner/pkg/sql/bean/bean.go index a5b2a9901..bbc3845a7 100644 --- a/image-scanner/pkg/sql/bean/bean.go +++ b/image-scanner/pkg/sql/bean/bean.go @@ -34,6 +34,7 @@ const ( ScanToolClair = "CLAIR" ScanToolVersion2 = "V2" ScanToolVersion4 = "V4" + ScanToolVersion1 = "V1" SbomOutputFileNameSuffix = "_out.json" ) From 38893ebbc11354732bd681c04d1b3ea6adb9344f Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Fri, 17 Jan 2025 15:56:52 +0530 Subject: [PATCH 39/70] aws inspector --- image-scanner/pkg/sql/bean/bean.go | 1 + 1 file changed, 1 insertion(+) diff --git a/image-scanner/pkg/sql/bean/bean.go b/image-scanner/pkg/sql/bean/bean.go index bbc3845a7..cae798985 100644 --- a/image-scanner/pkg/sql/bean/bean.go +++ b/image-scanner/pkg/sql/bean/bean.go @@ -32,6 +32,7 @@ const ( ScannerTypeClairV2 = "CLAIRV2" ScannerTypeTrivy = "TRIVY" ScanToolClair = "CLAIR" + ScanToolAwsInspector = "AWS INSPECTOR" ScanToolVersion2 = "V2" ScanToolVersion4 = "V4" ScanToolVersion1 = "V1" From 55f091f78d82bcbd511e1432d8b57a10640d30bd Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Mon, 20 Jan 2025 13:54:30 +0530 Subject: [PATCH 40/70] review comments --- .../{helper => bean}/pluginArtifactsBean.go | 2 +- ci-runner/{helper => bean}/pluginBean.go | 7 +- ci-runner/executor/StageExecutor.go | 47 ++++---- ci-runner/executor/StageExecutor_test.go | 3 +- .../executor/adaptor/ImageScanAdaptor.go | 14 +++ ci-runner/executor/scriptExecutor.go | 9 +- ci-runner/executor/scriptExecutor_test.go | 18 +-- ci-runner/executor/stage/bean/bean.go | 20 ++++ ci-runner/executor/stage/cdStages.go | 11 +- ci-runner/executor/stage/ciStages.go | 42 ++++--- ci-runner/helper/EventHelper.go | 109 +++++++++--------- ci-runner/helper/ExpressionEvaluater.go | 13 ++- ci-runner/helper/envVariableHelper.go | 7 ++ ci-runner/helper/pluginUtils.go | 5 +- 14 files changed, 180 insertions(+), 127 deletions(-) rename ci-runner/{helper => bean}/pluginArtifactsBean.go (98%) rename ci-runner/{helper => bean}/pluginBean.go (96%) create mode 100644 ci-runner/helper/envVariableHelper.go diff --git a/ci-runner/helper/pluginArtifactsBean.go b/ci-runner/bean/pluginArtifactsBean.go similarity index 98% rename from ci-runner/helper/pluginArtifactsBean.go rename to ci-runner/bean/pluginArtifactsBean.go index 6d417fee4..01dbd48b9 100644 --- a/ci-runner/helper/pluginArtifactsBean.go +++ b/ci-runner/bean/pluginArtifactsBean.go @@ -1,4 +1,4 @@ -package helper +package bean import "time" diff --git a/ci-runner/helper/pluginBean.go b/ci-runner/bean/pluginBean.go similarity index 96% rename from ci-runner/helper/pluginBean.go rename to ci-runner/bean/pluginBean.go index 1d7aee0af..a47b0bbc3 100644 --- a/ci-runner/helper/pluginBean.go +++ b/ci-runner/bean/pluginBean.go @@ -14,11 +14,12 @@ * limitations under the License. */ -package helper +package bean import ( "encoding/json" "fmt" + "github.com/devtron-labs/ci-runner/helper" commonBean "github.com/devtron-labs/common-lib/workflow" "strings" ) @@ -52,8 +53,8 @@ type StepObject struct { InputVars []*commonBean.VariableObject `json:"inputVars"` ExposedPorts map[int]int `json:"exposedPorts"` //map of host:container OutputVars []*commonBean.VariableObject `json:"outputVars"` - TriggerSkipConditions []*ConditionObject `json:"triggerSkipConditions"` - SuccessFailureConditions []*ConditionObject `json:"successFailureConditions"` + TriggerSkipConditions []*helper.ConditionObject `json:"triggerSkipConditions"` + SuccessFailureConditions []*helper.ConditionObject `json:"successFailureConditions"` DockerImage string `json:"dockerImage"` Command string `json:"command"` Args []string `json:"args"` diff --git a/ci-runner/executor/StageExecutor.go b/ci-runner/executor/StageExecutor.go index 572d11dee..a7f896b6a 100644 --- a/ci-runner/executor/StageExecutor.go +++ b/ci-runner/executor/StageExecutor.go @@ -19,6 +19,7 @@ package executor import ( "context" "fmt" + "github.com/devtron-labs/ci-runner/bean" cictx "github.com/devtron-labs/ci-runner/executor/context" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -37,7 +38,7 @@ type StageExecutorImpl struct { } type StageExecutor interface { - RunCiCdSteps(stepType helper.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*helper.StepObject, refStageMap map[int][]*helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (pluginArtifacts *helper.PluginArtifacts, outVars map[int]map[string]*commonBean.VariableObject, failedStep *helper.StepObject, err error) + RunCiCdSteps(stepType bean.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*bean.StepObject, refStageMap map[int][]*bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (pluginArtifacts *bean.PluginArtifacts, outVars map[int]map[string]*commonBean.VariableObject, failedStep *bean.StepObject, err error) RunCdStageTasks(ciContext cictx.CiContext, tasks []*helper.Task, scriptEnvVariables *util2.ScriptEnvVariables, stageType helper.PipelineType) error } @@ -48,20 +49,20 @@ func NewStageExecutorImpl(cmdExecutor helper.CommandExecutor, scriptExecutor Scr } } -func (impl *StageExecutorImpl) RunCiCdSteps(stepType helper.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*helper.StepObject, refStageMap map[int][]*helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (*helper.PluginArtifacts, map[int]map[string]*commonBean.VariableObject, *helper.StepObject, error) { +func (impl *StageExecutorImpl) RunCiCdSteps(stepType bean.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*bean.StepObject, refStageMap map[int][]*bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (*bean.PluginArtifacts, map[int]map[string]*commonBean.VariableObject, *bean.StepObject, error) { /*if stageType == STEP_TYPE_POST { postCiStageVariable = make(map[int]map[string]*VariableObject) // [stepId]name[]value }*/ stageVariable := make(map[int]map[string]*commonBean.VariableObject) - pluginArtifactsFromFile := helper.NewPluginArtifact() + pluginArtifactsFromFile := bean.NewPluginArtifact() for i, step := range steps { - stageInfoLoggingRequired := stepType != helper.STEP_TYPE_REF_PLUGIN + stageInfoLoggingRequired := stepType != bean.STEP_TYPE_REF_PLUGIN failedStep := step var ( err error - refPluginArtifacts *helper.PluginArtifacts + refPluginArtifacts *bean.PluginArtifacts ) executeStep := func() error { @@ -95,7 +96,7 @@ func (impl *StageExecutorImpl) RunCiCdSteps(stepType helper.StepType, ciCdReques return pluginArtifactsFromFile, stageVariable, nil, nil } -func getScriptVariables(step *helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables) (emptyVariableList []string, scriptEnvs map[string]string, variableFileMount map[string]string) { +func getScriptVariables(step *bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables) (emptyVariableList []string, scriptEnvs map[string]string, variableFileMount map[string]string) { //variables with empty value scriptEnvs = make(map[string]string) variableFileMount = make(map[string]string) @@ -138,20 +139,20 @@ func getScriptVariables(step *helper.StepObject, scriptEnvVariables *util2.Scrip return emptyVariableList, scriptEnvs, variableFileMount } -func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest helper.CommonWorkflowRequest, index int, step *helper.StepObject, - refStageMap map[int][]*helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, - stageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (artifacts *helper.PluginArtifacts, failedStep *helper.StepObject, err error) { +func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest helper.CommonWorkflowRequest, index int, step *bean.StepObject, + refStageMap map[int][]*bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, + stageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (artifacts *bean.PluginArtifacts, failedStep *bean.StepObject, err error) { var vars []*commonBean.VariableObject - if stepType == helper.STEP_TYPE_REF_PLUGIN { + if stepType == bean.STEP_TYPE_REF_PLUGIN { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, nil, nil, stageVariable) - } else if stepType == helper.STEP_TYPE_SCANNING { + } else if stepType == bean.STEP_TYPE_SCANNING { // only global variables are supported here in image scanning step vars, err = deduceVariables(step.InputVars, scriptEnvVariables, nil, nil, nil) } else { log.Printf("running step : %s\n", step.Name) - if stepType == helper.STEP_TYPE_PRE { + if stepType == bean.STEP_TYPE_PRE { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, stageVariable, nil, nil) - } else if stepType == helper.STEP_TYPE_POST { + } else if stepType == bean.STEP_TYPE_POST { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, preCiStageVariable, stageVariable, nil) } } @@ -164,7 +165,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest // this is required to pass the existing script env variables to the next recursive call scriptEnvVariables.ExistingScriptEnv = scriptEnvs - if stepType == helper.STEP_TYPE_PRE || stepType == helper.STEP_TYPE_POST { + if stepType == bean.STEP_TYPE_PRE || stepType == bean.STEP_TYPE_POST { log.Println(fmt.Sprintf("variables with empty value : %v", emptyVariableList)) } if len(step.TriggerSkipConditions) > 0 { @@ -198,9 +199,9 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest ciContext := cictx.BuildCiContext(context.Background(), ciCdRequest.EnableSecretMasking) stepOutputVarsFinal := make(map[string]string) - var pluginArtifacts *helper.PluginArtifacts + var pluginArtifacts *bean.PluginArtifacts //--------------------------------------------------------------------------------------------------- - if step.StepType == helper.STEP_TYPE_INLINE.String() { + if step.StepType == bean.STEP_TYPE_INLINE.String() { //add system env variable for k, v := range util2.GetSystemEnvVariables() { //add only when not overridden by user @@ -211,7 +212,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest // set the script env variables to the existing script env variables // this is required to pass the existing script env variables to the next recursive call scriptEnvVariables.ExistingScriptEnv = scriptEnvs - if step.ExecutorType == helper.SHELL { + if step.ExecutorType == bean.SHELL { stageOutputVars, err := impl.scriptExecutor.RunScripts(ciContext, util.Output_path, fmt.Sprintf("stage-%d", index), step.Script, scriptEnvs, outVars) if err != nil { return nil, step, err @@ -230,8 +231,8 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest } } } - } else if step.ExecutorType == helper.CONTAINER_IMAGE { - var outputDirMount []*helper.MountPath + } else if step.ExecutorType == bean.CONTAINER_IMAGE { + var outputDirMount []*bean.MountPath stepArtifact := filepath.Join(util.Output_path, "opt") for _, artifact := range step.ArtifactPaths { @@ -241,7 +242,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest log.Println(util.DEVTRON, err) return nil, step, err } - path := helper.NewMountPath(filepath.Join(stepArtifact, artifact), artifact) + path := bean.NewMountPath(filepath.Join(stepArtifact, artifact), artifact) outputDirMount = append(outputDirMount, path) } executionConf := &executionConf{ @@ -261,7 +262,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest } for fileSrc, fileDst := range variableFileMount { - fileMountPaths := helper.NewMountPath(fileSrc, fileDst) + fileMountPaths := bean.NewMountPath(fileSrc, fileDst) executionConf.ExtraVolumeMounts = append(executionConf.ExtraVolumeMounts, fileMountPaths) } if executionConf.SourceCodeMount != nil { @@ -282,7 +283,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest } } } - } else if step.StepType == helper.STEP_TYPE_REF_PLUGIN.String() { + } else if step.StepType == bean.STEP_TYPE_REF_PLUGIN.String() { steps := refStageMap[step.RefPluginId] stepIndexVarNameValueMap := make(map[int]map[string]string) stepIndexFileMountMap := make(map[int]map[string]*fileContentDto) @@ -320,7 +321,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest } } } - refPluginArtifacts, opt, _, err := impl.RunCiCdSteps(helper.STEP_TYPE_REF_PLUGIN, &ciCdRequest, steps, refStageMap, scriptEnvVariables, nil, false) + refPluginArtifacts, opt, _, err := impl.RunCiCdSteps(bean.STEP_TYPE_REF_PLUGIN, &ciCdRequest, steps, refStageMap, scriptEnvVariables, nil, false) if err != nil { fmt.Println(err) return nil, step, err diff --git a/ci-runner/executor/StageExecutor_test.go b/ci-runner/executor/StageExecutor_test.go index 53342553b..326c4b479 100644 --- a/ci-runner/executor/StageExecutor_test.go +++ b/ci-runner/executor/StageExecutor_test.go @@ -17,6 +17,7 @@ package executor import ( + "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/helper" commonBean "github.com/devtron-labs/common-lib/workflow" "reflect" @@ -114,7 +115,7 @@ func Test_deduceVariables(t *testing.T) { func TestRunCiSteps(t *testing.T) { type args struct { - stageType helper.StepType + stageType bean.StepType req *helper.CommonWorkflowRequest globalEnvironmentVariables map[string]string preeCiStageVariable map[int]map[string]*commonBean.VariableObject diff --git a/ci-runner/executor/adaptor/ImageScanAdaptor.go b/ci-runner/executor/adaptor/ImageScanAdaptor.go index e363e9ef9..aec45b2f0 100644 --- a/ci-runner/executor/adaptor/ImageScanAdaptor.go +++ b/ci-runner/executor/adaptor/ImageScanAdaptor.go @@ -17,6 +17,9 @@ package adaptor import ( + bean3 "github.com/devtron-labs/ci-runner/bean" + bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" + util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" "github.com/devtron-labs/common-lib/constants" "github.com/devtron-labs/common-lib/imageScan/bean" @@ -42,3 +45,14 @@ func GetImageScanEvent(dest, digest string, commonWorkflowRequest *helper.Common ImageScanRetryDelay: commonWorkflowRequest.ImageScanRetryDelay, } } +func GetImageScannerExecutorBean(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*bean3.StepObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) *bean2.ImageScanningExecutorBean { + return &bean2.ImageScanningExecutorBean{ + CiCdRequest: ciCdRequest, + ScriptEnvs: scriptEnvs, + RefStageMap: refStageMap, + Metrics: metrics, + ArtifactUploaded: artifactUploaded, + Dest: dest, + Digest: digest, + } +} diff --git a/ci-runner/executor/scriptExecutor.go b/ci-runner/executor/scriptExecutor.go index 3f7b1af9d..442cb60f8 100644 --- a/ci-runner/executor/scriptExecutor.go +++ b/ci-runner/executor/scriptExecutor.go @@ -18,6 +18,7 @@ package executor import ( "fmt" + "github.com/devtron-labs/ci-runner/bean" cictx "github.com/devtron-labs/ci-runner/executor/context" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -164,10 +165,10 @@ type executionConf struct { DockerImage string command string args []string - CustomScriptMount *helper.MountPath - SourceCodeMount *helper.MountPath - ExtraVolumeMounts []*helper.MountPath - OutputDirMount []*helper.MountPath + CustomScriptMount *bean.MountPath + SourceCodeMount *bean.MountPath + ExtraVolumeMounts []*bean.MountPath + OutputDirMount []*bean.MountPath // system generate values scriptFileName string //internal workDirectory string diff --git a/ci-runner/executor/scriptExecutor_test.go b/ci-runner/executor/scriptExecutor_test.go index cfcc175ef..596719c03 100644 --- a/ci-runner/executor/scriptExecutor_test.go +++ b/ci-runner/executor/scriptExecutor_test.go @@ -18,7 +18,7 @@ package executor import ( "fmt" - "github.com/devtron-labs/ci-runner/helper" + "github.com/devtron-labs/ci-runner/bean" "io/ioutil" "os" "reflect" @@ -106,9 +106,9 @@ func Test_buildDockerRunCommand(t *testing.T) { EnvInputFileName: "/tmp/ci-test/abc.env", EntryScriptFileName: "/tmp/code-location/_entry.sh", EnvOutFileName: "/tmp/ci-test/_env.out", - ExtraVolumeMounts: []*helper.MountPath{{SrcPath: "/src", DstPath: "/des"}}, - SourceCodeMount: &helper.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, - CustomScriptMount: &helper.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, + ExtraVolumeMounts: []*bean.MountPath{{SrcPath: "/src", DstPath: "/des"}}, + SourceCodeMount: &bean.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, + CustomScriptMount: &bean.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, ExposedPorts: map[int]int{80: 8080}, }}, wantErr: false, @@ -120,9 +120,9 @@ func Test_buildDockerRunCommand(t *testing.T) { EnvInputFileName: "/tmp/ci-test/abc.env", EntryScriptFileName: "/tmp/code-location/_entry.sh", EnvOutFileName: "/tmp/ci-test/_env.out", - ExtraVolumeMounts: []*helper.MountPath{{SrcPath: "/src", DstPath: "/des"}, {SrcPath: "/src2", DstPath: "/des2"}}, - SourceCodeMount: &helper.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, - CustomScriptMount: &helper.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, + ExtraVolumeMounts: []*bean.MountPath{{SrcPath: "/src", DstPath: "/des"}, {SrcPath: "/src2", DstPath: "/des2"}}, + SourceCodeMount: &bean.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, + CustomScriptMount: &bean.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, ExposedPorts: map[int]int{80: 8080, 90: 9090}, }}, wantErr: false, @@ -206,8 +206,8 @@ func TestRunScriptsInDocker(t *testing.T) { ExposedPorts: map[int]int{80: 8080, 90: 9090}, OutputVars: []string{"HOME", "PWD", "NAME", "KIND"}, DockerImage: "alpine:latest", - SourceCodeMount: &helper.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, - CustomScriptMount: &helper.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, + SourceCodeMount: &bean.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, + CustomScriptMount: &bean.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, command: "/bin/sh", args: []string{"-c", "ls;sleep 1;export NAME=from-script;echo done;"}, scriptFileName: "", diff --git a/ci-runner/executor/stage/bean/bean.go b/ci-runner/executor/stage/bean/bean.go index f66364d82..82a7e65ba 100644 --- a/ci-runner/executor/stage/bean/bean.go +++ b/ci-runner/executor/stage/bean/bean.go @@ -16,9 +16,29 @@ package bean +import ( + bean3 "github.com/devtron-labs/ci-runner/bean" + util2 "github.com/devtron-labs/ci-runner/executor/util" + "github.com/devtron-labs/ci-runner/helper" +) + const ( ExternalCiArtifact = "externalCiArtifact" ImageDigest = "imageDigest" UseAppDockerConfig = "useAppDockerConfig" CiProjectDetails = "ciProjectDetails" ) +const ( + DigestGlobalEnvKey = "DIGEST" + ScanToolIdGlobalEnvKey = "SCAN_TOOL_ID" +) + +type ImageScanningExecutorBean struct { + CiCdRequest *helper.CiCdTriggerEvent + ScriptEnvs *util2.ScriptEnvVariables + RefStageMap map[int][]*bean3.StepObject + Metrics *helper.CIMetrics + ArtifactUploaded bool + Dest string + Digest string +} diff --git a/ci-runner/executor/stage/cdStages.go b/ci-runner/executor/stage/cdStages.go index e3e753dea..7c99cc358 100644 --- a/ci-runner/executor/stage/cdStages.go +++ b/ci-runner/executor/stage/cdStages.go @@ -20,6 +20,7 @@ import ( "context" "errors" "fmt" + "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/helper/adaptor" "github.com/devtron-labs/common-lib/utils/workFlow" "log" @@ -71,7 +72,7 @@ func deferCDEvent(cdRequest *helper.CommonWorkflowRequest, artifactUploaded bool func (impl *CdStage) HandleCDEvent(ciCdRequest *helper.CiCdTriggerEvent, exitCode *int) { var artifactUploaded bool var err error - var allPluginArtifacts *helper.PluginArtifacts + var allPluginArtifacts *bean.PluginArtifacts defer func() { *exitCode = deferCDEvent(ciCdRequest.CommonWorkflowRequest, artifactUploaded, err) }() @@ -135,7 +136,7 @@ func collectAndUploadCDArtifacts(cdRequest *helper.CommonWorkflowRequest) (artif return helper.UploadArtifact(cloudHelperBaseConfig, artifactFiles, cdRequest.CiArtifactFileName) } -func (impl *CdStage) runCDStages(ciCdRequest *helper.CiCdTriggerEvent) (*helper.PluginArtifacts, error) { +func (impl *CdStage) runCDStages(ciCdRequest *helper.CiCdTriggerEvent) (*bean.PluginArtifacts, error) { err := os.Chdir("/") if err != nil { return nil, err @@ -182,15 +183,15 @@ func (impl *CdStage) runCDStages(ciCdRequest *helper.CiCdTriggerEvent) (*helper. log.Println(util.DEVTRON, "error while getting global envs", err) return nil, err } - allPluginArtifacts := helper.NewPluginArtifact() + allPluginArtifacts := bean.NewPluginArtifact() if len(ciCdRequest.CommonWorkflowRequest.PrePostDeploySteps) > 0 { - refStageMap := make(map[int][]*helper.StepObject) + refStageMap := make(map[int][]*bean.StepObject) for _, ref := range ciCdRequest.CommonWorkflowRequest.RefPlugins { refStageMap[ref.Id] = ref.Steps } scriptEnvs.SystemEnv["DEST"] = ciCdRequest.CommonWorkflowRequest.CiArtifactDTO.Image scriptEnvs.SystemEnv["DIGEST"] = ciCdRequest.CommonWorkflowRequest.CiArtifactDTO.ImageDigest - var stage = helper.StepType(ciCdRequest.CommonWorkflowRequest.StageType) + var stage = bean.StepType(ciCdRequest.CommonWorkflowRequest.StageType) pluginArtifacts, _, step, err := impl.stageExecutorManager.RunCiCdSteps(stage, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PrePostDeploySteps, refStageMap, scriptEnvs, nil, true) if err != nil { return allPluginArtifacts, helper.NewCdStageError(err). diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index fa4fe16f3..fa80ce29b 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -21,6 +21,7 @@ import ( "encoding/json" "errors" "fmt" + bean3 "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/executor" adaptor2 "github.com/devtron-labs/ci-runner/executor/adaptor" cicxt "github.com/devtron-labs/ci-runner/executor/context" @@ -234,7 +235,7 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. } } - refStageMap := make(map[int][]*helper.StepObject) + refStageMap := make(map[int][]*bean3.StepObject) for _, ref := range ciCdRequest.CommonWorkflowRequest.RefPlugins { refStageMap[ref.Id] = ref.Steps } @@ -257,11 +258,12 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. return artifactUploaded, err } } - setDigestInGlobalEnv(scriptEnvs, digest) + // setting digest in global env + helper.SetKeyValueInGlobalSystemEnv(scriptEnvs, bean2.DigestGlobalEnvKey, digest) var postCiDuration float64 start = time.Now() metrics.PostCiStartTime = start - var pluginArtifacts *helper.PluginArtifacts + var pluginArtifacts *bean3.PluginArtifacts if len(ciCdRequest.CommonWorkflowRequest.PostCiSteps) > 0 { pluginArtifacts, resultsFromPlugin, err = impl.runPostCiSteps(ciCdRequest, scriptEnvs, refStageMap, preCiStageOutVariable, metrics, artifactUploaded, dest, digest) postCiDuration = time.Since(start).Seconds() @@ -300,7 +302,7 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. // scan only if ci scan enabled if helper.IsEventTypeEligibleToScanImage(ciCdRequest.Type) && ciCdRequest.CommonWorkflowRequest.ScanEnabled { - err = impl.runImageScanning(ciCdRequest, scriptEnvs, refStageMap, metrics, artifactUploaded, dest, digest) + err = impl.runImageScanning(adaptor2.GetImageScannerExecutorBean(ciCdRequest, scriptEnvs, refStageMap, metrics, artifactUploaded, dest, digest)) if err != nil { return artifactUploaded, err } @@ -326,12 +328,9 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. } return artifactUploaded, nil } -func setDigestInGlobalEnv(scriptEnvs *util2.ScriptEnvVariables, digest string) { - scriptEnvs.SystemEnv["DIGEST"] = digest -} func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, - buildSkipEnabled bool, refStageMap map[int][]*helper.StepObject, + buildSkipEnabled bool, refStageMap map[int][]*bean3.StepObject, scriptEnvs *util2.ScriptEnvVariables, artifactUploaded bool) (json.RawMessage, map[int]map[string]*commonBean.VariableObject, error) { start := time.Now() metrics.PreCiStartTime = start @@ -339,7 +338,7 @@ func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics log.Println("running PRE-CI steps") } // run pre artifact processing - _, preCiStageOutVariable, step, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_PRE, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PreCiSteps, refStageMap, scriptEnvs, nil, true) + _, preCiStageOutVariable, step, err := impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_PRE, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PreCiSteps, refStageMap, scriptEnvs, nil, true) preCiDuration := time.Since(start).Seconds() if err != nil { log.Println("error in running pre Ci Steps", "err", err) @@ -360,7 +359,7 @@ func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics } func (impl *CiStage) runBuildArtifact(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, - refStageMap map[int][]*helper.StepObject, scriptEnvs *util2.ScriptEnvVariables, artifactUploaded bool, + refStageMap map[int][]*bean3.StepObject, scriptEnvs *util2.ScriptEnvVariables, artifactUploaded bool, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject) (string, error) { // build start := time.Now() @@ -376,7 +375,7 @@ func (impl *CiStage) runBuildArtifact(ciCdRequest *helper.CiCdTriggerEvent, metr // build success will always be false scriptEnvs.SystemEnv[util.ENV_VARIABLE_BUILD_SUCCESS] = "false" // run post artifact processing - impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, postCiStepsToTriggerOnCiFail, refStageMap, scriptEnvs, preCiStageOutVariable, true) + impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, postCiStepsToTriggerOnCiFail, refStageMap, scriptEnvs, preCiStageOutVariable, true) scriptEnvs = scriptEnvs.ResetExistingScriptEnv() } // code-block ends @@ -415,14 +414,14 @@ func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest st return digest, err } -func (impl *CiStage) runPostCiSteps(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) (*helper.PluginArtifacts, json.RawMessage, error) { +func (impl *CiStage) runPostCiSteps(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*bean3.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) (*bean3.PluginArtifacts, json.RawMessage, error) { log.Println("running POST-CI steps") // sending build success as true always as post-ci triggers only if ci gets success scriptEnvs.SystemEnv[util.ENV_VARIABLE_BUILD_SUCCESS] = "true" scriptEnvs.SystemEnv["DEST"] = dest scriptEnvs.SystemEnv["DIGEST"] = digest // run post artifact processing - pluginArtifactsFromFile, _, step, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PostCiSteps, refStageMap, scriptEnvs, preCiStageOutVariable, true) + pluginArtifactsFromFile, _, step, err := impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PostCiSteps, refStageMap, scriptEnvs, preCiStageOutVariable, true) if err != nil { log.Println("error in running Post Ci Steps", "err", err) return nil, nil, helper.NewCiStageError(err). @@ -442,7 +441,12 @@ func (impl *CiStage) runPostCiSteps(ciCdRequest *helper.CiCdTriggerEvent, script return pluginArtifactsFromFile, resultsFromPlugin, nil } -func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) error { +func (impl *CiStage) runImageScanning(imageScannerExecutor *bean2.ImageScanningExecutorBean) error { + ciCdRequest := imageScannerExecutor.CiCdRequest + dest, digest := imageScannerExecutor.Dest, imageScannerExecutor.Digest + metrics, artifactUploaded := imageScannerExecutor.Metrics, imageScannerExecutor.ArtifactUploaded + scriptEnvs, refStageMap := imageScannerExecutor.ScriptEnvs, imageScannerExecutor.RefStageMap + imageScanningStage := func() error { log.Println("Image Scanning Started for digest", digest) scanEvent := adaptor2.GetImageScanEvent(dest, digest, ciCdRequest.CommonWorkflowRequest) @@ -465,7 +469,7 @@ func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scri //setting scan tool id in script env scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = strconv.Itoa(scanToolId) // run image scanning steps - _, _, _, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) + _, _, _, err := impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) if err != nil { log.Println("error in running pre Ci Steps", "err", err) return helper.NewCiStageError(err). @@ -475,7 +479,7 @@ func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scri } } //unset scan tool id in script env - scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = "" + delete(scriptEnvs.SystemEnv, bean2.ScanToolIdGlobalEnvKey) log.Println("Image scanning completed") return nil } @@ -485,7 +489,7 @@ func (impl *CiStage) runImageScanning(ciCdRequest *helper.CiCdTriggerEvent, scri return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningStage) } -func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, artifactUploaded bool) (string, string, error) { +func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*bean3.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, artifactUploaded bool) (string, string, error) { dest, err := impl.runBuildArtifact(ciCdRequest, metrics, refStageMap, scriptEnvs, artifactUploaded, preCiStageOutVariable) if err != nil { return "", "", err @@ -498,8 +502,8 @@ func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, return dest, digest, nil } -func getPostCiStepToRunOnCiFail(postCiSteps []*helper.StepObject) []*helper.StepObject { - var postCiStepsToTriggerOnCiFail []*helper.StepObject +func getPostCiStepToRunOnCiFail(postCiSteps []*bean3.StepObject) []*bean3.StepObject { + var postCiStepsToTriggerOnCiFail []*bean3.StepObject if len(postCiSteps) > 0 { for _, postCiStep := range postCiSteps { if postCiStep.TriggerIfParentStageFail { diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index bef00d0ba..e7fe1280b 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -20,6 +20,7 @@ import ( "crypto/tls" "encoding/json" "fmt" + bean3 "github.com/devtron-labs/ci-runner/bean" bean2 "github.com/devtron-labs/common-lib/imageScan/bean" "github.com/devtron-labs/common-lib/utils/remoteConnection/bean" "log" @@ -134,9 +135,9 @@ type CommonWorkflowRequest struct { InAppLoggingEnabled bool `json:"inAppLoggingEnabled"` DefaultAddressPoolBaseCidr string `json:"defaultAddressPoolBaseCidr"` DefaultAddressPoolSize int `json:"defaultAddressPoolSize"` - PreCiSteps []*StepObject `json:"preCiSteps"` - PostCiSteps []*StepObject `json:"postCiSteps"` - RefPlugins []*RefPluginObject `json:"refPlugins"` + PreCiSteps []*bean3.StepObject `json:"preCiSteps"` + PostCiSteps []*bean3.StepObject `json:"postCiSteps"` + RefPlugins []*bean3.RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` @@ -176,7 +177,7 @@ type CommonWorkflowRequest struct { DeploymentTriggeredBy string `json:"deploymentTriggeredBy,omitempty"` DeploymentTriggerTime time.Time `json:"deploymentTriggerTime,omitempty"` DeploymentReleaseCounter int `json:"deploymentReleaseCounter,omitempty"` - PrePostDeploySteps []*StepObject `json:"prePostDeploySteps"` + PrePostDeploySteps []*bean3.StepObject `json:"prePostDeploySteps"` TaskYaml *TaskYaml `json:"-"` IsVirtualExecution bool `json:"isVirtualExecution"` CiArtifactLastFetch time.Time `json:"ciArtifactLastFetch"` @@ -196,17 +197,17 @@ type CommonWorkflowRequest struct { } func (c *CommonWorkflowRequest) IsPreCdStage() bool { - return c.StageType == string(STEP_TYPE_PRE) + return c.StageType == string(bean3.STEP_TYPE_PRE) } func (c *CommonWorkflowRequest) IsPostCdStage() bool { - return c.StageType == string(STEP_TYPE_POST) + return c.StageType == string(bean3.STEP_TYPE_POST) } func (c *CommonWorkflowRequest) GetCdStageType() PipelineType { - if c.StageType == string(STEP_TYPE_PRE) { + if c.StageType == string(bean3.STEP_TYPE_PRE) { return PRE_CD - } else if c.StageType == string(STEP_TYPE_POST) { + } else if c.StageType == string(bean3.STEP_TYPE_POST) { return POST_CD } return "" @@ -269,9 +270,9 @@ type CiRequest struct { MinioEndpoint string `json:"minioEndpoint"` DefaultAddressPoolBaseCidr string `json:"defaultAddressPoolBaseCidr"` DefaultAddressPoolSize int `json:"defaultAddressPoolSize"` - PreCiSteps []*StepObject `json:"preCiSteps"` - PostCiSteps []*StepObject `json:"postCiSteps"` - RefPlugins []*RefPluginObject `json:"refPlugins"` + PreCiSteps []*bean3.StepObject `json:"preCiSteps"` + PostCiSteps []*bean3.StepObject `json:"postCiSteps"` + RefPlugins []*bean3.RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` @@ -329,8 +330,8 @@ type CdRequest struct { CiRunnerDockerMtuValue int `json:"ciRunnerDockerMtuValue"` DeploymentReleaseCounter int `json:"deploymentReleaseCounter,omitempty"` IsDryRun bool `json:"isDryRun"` - PrePostDeploySteps []*StepObject `json:"prePostDeploySteps"` - RefPlugins []*RefPluginObject `json:"refPlugins"` + PrePostDeploySteps []*bean3.StepObject `json:"prePostDeploySteps"` + RefPlugins []*bean3.RefPluginObject `json:"refPlugins"` StageType string `json:"stageType"` } @@ -356,25 +357,25 @@ type CiArtifactDTO struct { } type CiCompleteEvent struct { - CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` - DockerImage string `json:"dockerImage"` - Digest string `json:"digest"` - PipelineId int `json:"pipelineId"` - DataSource string `json:"dataSource"` - PipelineName string `json:"pipelineName"` - WorkflowId int `json:"workflowId"` - TriggeredBy int `json:"triggeredBy"` - MaterialType string `json:"materialType"` - Metrics CIMetrics `json:"metrics"` - AppName string `json:"appName"` - IsArtifactUploaded bool `json:"isArtifactUploaded"` - FailureReason string `json:"failureReason"` // FailureReason is used for notifying the failure reason to the user. Should be short and user-friendly - ImageDetailsFromCR json.RawMessage `json:"imageDetailsFromCR"` - PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` - PluginArtifactStage string `json:"pluginArtifactStage"` - IsScanEnabled bool `json:"isScanEnabled"` - PluginArtifacts *PluginArtifacts `json:"pluginArtifacts"` - DockerRegistryId string `json:"dockerRegistryId"` + CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` + DockerImage string `json:"dockerImage"` + Digest string `json:"digest"` + PipelineId int `json:"pipelineId"` + DataSource string `json:"dataSource"` + PipelineName string `json:"pipelineName"` + WorkflowId int `json:"workflowId"` + TriggeredBy int `json:"triggeredBy"` + MaterialType string `json:"materialType"` + Metrics CIMetrics `json:"metrics"` + AppName string `json:"appName"` + IsArtifactUploaded bool `json:"isArtifactUploaded"` + FailureReason string `json:"failureReason"` // FailureReason is used for notifying the failure reason to the user. Should be short and user-friendly + ImageDetailsFromCR json.RawMessage `json:"imageDetailsFromCR"` + PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` + PluginArtifactStage string `json:"pluginArtifactStage"` + IsScanEnabled bool `json:"isScanEnabled"` + PluginArtifacts *bean3.PluginArtifacts `json:"pluginArtifacts"` + DockerRegistryId string `json:"dockerRegistryId"` } func (event *CiCompleteEvent) WithMetrics(metrics CIMetrics) *CiCompleteEvent { @@ -392,7 +393,7 @@ func (event *CiCompleteEvent) WithImageDetailsFromCR(imageDetailsFromCR json.Raw return event } -func (event *CiCompleteEvent) WithPluginArtifacts(pluginArtifacts *PluginArtifacts) *CiCompleteEvent { +func (event *CiCompleteEvent) WithPluginArtifacts(pluginArtifacts *bean3.PluginArtifacts) *CiCompleteEvent { event.PluginArtifacts = pluginArtifacts return event } @@ -437,23 +438,23 @@ type ImageScanningEvent struct { } type CdStageCompleteEvent struct { - CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` - WorkflowId int `json:"workflowId"` - WorkflowRunnerId int `json:"workflowRunnerId"` - CdPipelineId int `json:"cdPipelineId"` - TriggeredBy int `json:"triggeredBy"` - StageYaml string `json:"stageYaml"` - ArtifactLocation string `json:"artifactLocation"` - TaskYaml *TaskYaml `json:"-"` - PipelineName string `json:"pipelineName"` - CiArtifactDTO CiArtifactDTO `json:"ciArtifactDTO"` - PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` - PluginArtifactStage string `json:"pluginArtifactStage"` - PluginArtifacts *PluginArtifacts `json:"pluginArtifacts"` - IsArtifactUploaded bool `json:"isArtifactUploaded"` -} - -func (event *CdStageCompleteEvent) WithPluginArtifacts(pluginArtifacts *PluginArtifacts) *CdStageCompleteEvent { + CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` + WorkflowId int `json:"workflowId"` + WorkflowRunnerId int `json:"workflowRunnerId"` + CdPipelineId int `json:"cdPipelineId"` + TriggeredBy int `json:"triggeredBy"` + StageYaml string `json:"stageYaml"` + ArtifactLocation string `json:"artifactLocation"` + TaskYaml *TaskYaml `json:"-"` + PipelineName string `json:"pipelineName"` + CiArtifactDTO CiArtifactDTO `json:"ciArtifactDTO"` + PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` + PluginArtifactStage string `json:"pluginArtifactStage"` + PluginArtifacts *bean3.PluginArtifacts `json:"pluginArtifacts"` + IsArtifactUploaded bool `json:"isArtifactUploaded"` +} + +func (event *CdStageCompleteEvent) WithPluginArtifacts(pluginArtifacts *bean3.PluginArtifacts) *CdStageCompleteEvent { event.PluginArtifacts = pluginArtifacts return event } @@ -758,9 +759,9 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent Digest: ciCdRequest.CiArtifactDTO.ImageDigest, } var stage PipelineType - if ciCdRequest.StageType == string(STEP_TYPE_PRE) { + if ciCdRequest.StageType == string(bean3.STEP_TYPE_PRE) { stage = PRE_CD - } else if ciCdRequest.StageType == string(STEP_TYPE_POST) { + } else if ciCdRequest.StageType == string(bean3.STEP_TYPE_POST) { stage = POST_CD } event.PipelineType = stage @@ -768,6 +769,6 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent } type ImageScanningSteps struct { - Steps []*StepObject `json:"steps"` - ScanToolId int `json:"scanToolId"` + Steps []*bean3.StepObject `json:"steps"` + ScanToolId int `json:"scanToolId"` } diff --git a/ci-runner/helper/ExpressionEvaluater.go b/ci-runner/helper/ExpressionEvaluater.go index b5a081fde..8b4203f2d 100644 --- a/ci-runner/helper/ExpressionEvaluater.go +++ b/ci-runner/helper/ExpressionEvaluater.go @@ -19,14 +19,15 @@ package helper import ( "fmt" "github.com/Knetic/govaluate" + "github.com/devtron-labs/ci-runner/bean" commonBean "github.com/devtron-labs/common-lib/workflow" ) type ConditionObject struct { - ConditionType ConditionType `json:"conditionType"` //TRIGGER, SKIP, PASS, FAIL - ConditionOnVariable string `json:"conditionOnVariable"` //name of variable - ConditionalOperator string `json:"conditionalOperator"` - ConditionalValue string `json:"conditionalValue"` + ConditionType bean.ConditionType `json:"conditionType"` //TRIGGER, SKIP, PASS, FAIL + ConditionOnVariable string `json:"conditionOnVariable"` //name of variable + ConditionalOperator string `json:"conditionalOperator"` + ConditionalValue string `json:"conditionalValue"` typecastConditionalValue interface{} } @@ -40,7 +41,7 @@ func ShouldTriggerStage(conditions []*ConditionObject, variables []*commonBean.V } status = status && result } - if conditionType == TRIGGER { + if conditionType == bean.TRIGGER { return status, nil // trigger if all success } else { return !status, nil //skip if all ture @@ -57,7 +58,7 @@ func StageIsSuccess(conditions []*ConditionObject, variables []*commonBean.Varia } status = status && result } - if conditionType == PASS { + if conditionType == bean.PASS { return status, nil // success if all success } else { return !status, nil //fail if all success diff --git a/ci-runner/helper/envVariableHelper.go b/ci-runner/helper/envVariableHelper.go new file mode 100644 index 000000000..bdda8bff7 --- /dev/null +++ b/ci-runner/helper/envVariableHelper.go @@ -0,0 +1,7 @@ +package helper + +import util2 "github.com/devtron-labs/ci-runner/executor/util" + +func SetKeyValueInGlobalSystemEnv(scriptEnvs *util2.ScriptEnvVariables, key, value string) { + scriptEnvs.SystemEnv[key] = value +} diff --git a/ci-runner/helper/pluginUtils.go b/ci-runner/helper/pluginUtils.go index 9ac7b7ee0..bea6b5fb2 100644 --- a/ci-runner/helper/pluginUtils.go +++ b/ci-runner/helper/pluginUtils.go @@ -2,13 +2,14 @@ package helper import ( "encoding/json" + "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/util" "io/ioutil" "log" "os" ) -func ExtractPluginArtifactsAndRemoveFile() (*PluginArtifacts, error) { +func ExtractPluginArtifactsAndRemoveFile() (*bean.PluginArtifacts, error) { exists, err := util.CheckFileExists(util.PluginArtifactsResults) if err != nil || !exists { log.Println("err", err) @@ -19,7 +20,7 @@ func ExtractPluginArtifactsAndRemoveFile() (*PluginArtifacts, error) { log.Println("error in reading file", "err", err.Error()) return nil, err } - pluginArtifacts := &PluginArtifacts{} + pluginArtifacts := &bean.PluginArtifacts{} err = json.Unmarshal(file, &pluginArtifacts) if err != nil { log.Println("error in unmarshalling imageDetailsFromCr results", "err", err.Error()) From cb2509a933a834958d85e095f93784576b09fdce Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Mon, 20 Jan 2025 13:58:37 +0530 Subject: [PATCH 41/70] make dep update oss --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/api/RestHandler.go | 2 +- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 22 files changed, 36 insertions(+), 36 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 8eb81f427..cf1e4c613 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 9304bd3f0..720b4cd89 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index c78fe127f..9657196ab 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 2b96b5c91..a307f50dc 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index ba766b52e..bfcaf3b43 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 3f29f39e6..a070e502b 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index eca604c4d..af682fe74 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index dc660c8ab..16d2c30bf 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index d26b4b380..2de69f5ee 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/image-scanner/api/RestHandler.go b/image-scanner/api/RestHandler.go index 139227cd9..c2dc4771c 100644 --- a/image-scanner/api/RestHandler.go +++ b/image-scanner/api/RestHandler.go @@ -195,7 +195,7 @@ func (impl *RestHandlerImpl) RegisterAndSaveScannedResult(w http.ResponseWriter, return } - impl.Logger.Infow("register and save scan result payload", "saveScanResultPayload", scanResultPayload) + impl.Logger.Debugw("register and save scan result payload", "saveScanResultPayload", scanResultPayload) _, err = impl.ImageScanService.RegisterAndSaveScannedResult(&scanResultPayload) if err != nil { impl.Logger.Errorw("service err, RegisterAndSaveScannedResult", "err", err) diff --git a/image-scanner/go.mod b/image-scanner/go.mod index bb3f5b6b6..fdc5ef90a 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 4f4c02ff7..177e0b080 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index a1d26f9c8..a6481aaaa 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/kubelink/go.mod b/kubelink/go.mod index 60d050f87..013652a31 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index adfe9a073..a3dc6f381 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 0eda16e36..cf3a3f7ae 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 3f06a864e..e194f5df4 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 221d8d667..832dc1a34 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 6d0fd4815..cbab0236b 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/lens/go.mod b/lens/go.mod index 443aadbc9..ed60a5718 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 diff --git a/lens/go.sum b/lens/go.sum index a7e6b3440..5deff91bc 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e h1:mjC7kgs+Tg9wxyfQPIXrAuPZ3wVsrYRSHqv/gRrGBnA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 88d2fbbba..075482d5e 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250117073343-fefedf01262e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 From 27a509557e09fd708cff2aa42bdaf9213c25b6bc Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Mon, 20 Jan 2025 15:44:43 +0530 Subject: [PATCH 42/70] import cycle --- ci-runner/executor/StageExecutor.go | 47 ++++---- ci-runner/executor/StageExecutor_test.go | 3 +- .../executor/adaptor/ImageScanAdaptor.go | 3 +- .../helper/envVariableHelper.go | 0 ci-runner/executor/scriptExecutor.go | 9 +- ci-runner/executor/scriptExecutor_test.go | 18 +-- ci-runner/executor/stage/bean/bean.go | 3 +- ci-runner/executor/stage/cdStages.go | 11 +- ci-runner/executor/stage/ciStages.go | 28 ++--- ci-runner/helper/EventHelper.go | 109 +++++++++--------- ci-runner/helper/ExpressionEvaluater.go | 13 +-- .../{bean => helper}/pluginArtifactsBean.go | 2 +- ci-runner/{bean => helper}/pluginBean.go | 7 +- ci-runner/helper/pluginUtils.go | 5 +- 14 files changed, 124 insertions(+), 134 deletions(-) rename ci-runner/{ => executor}/helper/envVariableHelper.go (100%) rename ci-runner/{bean => helper}/pluginArtifactsBean.go (98%) rename ci-runner/{bean => helper}/pluginBean.go (96%) diff --git a/ci-runner/executor/StageExecutor.go b/ci-runner/executor/StageExecutor.go index a7f896b6a..572d11dee 100644 --- a/ci-runner/executor/StageExecutor.go +++ b/ci-runner/executor/StageExecutor.go @@ -19,7 +19,6 @@ package executor import ( "context" "fmt" - "github.com/devtron-labs/ci-runner/bean" cictx "github.com/devtron-labs/ci-runner/executor/context" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -38,7 +37,7 @@ type StageExecutorImpl struct { } type StageExecutor interface { - RunCiCdSteps(stepType bean.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*bean.StepObject, refStageMap map[int][]*bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (pluginArtifacts *bean.PluginArtifacts, outVars map[int]map[string]*commonBean.VariableObject, failedStep *bean.StepObject, err error) + RunCiCdSteps(stepType helper.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*helper.StepObject, refStageMap map[int][]*helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (pluginArtifacts *helper.PluginArtifacts, outVars map[int]map[string]*commonBean.VariableObject, failedStep *helper.StepObject, err error) RunCdStageTasks(ciContext cictx.CiContext, tasks []*helper.Task, scriptEnvVariables *util2.ScriptEnvVariables, stageType helper.PipelineType) error } @@ -49,20 +48,20 @@ func NewStageExecutorImpl(cmdExecutor helper.CommandExecutor, scriptExecutor Scr } } -func (impl *StageExecutorImpl) RunCiCdSteps(stepType bean.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*bean.StepObject, refStageMap map[int][]*bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (*bean.PluginArtifacts, map[int]map[string]*commonBean.VariableObject, *bean.StepObject, error) { +func (impl *StageExecutorImpl) RunCiCdSteps(stepType helper.StepType, ciCdRequest *helper.CommonWorkflowRequest, steps []*helper.StepObject, refStageMap map[int][]*helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (*helper.PluginArtifacts, map[int]map[string]*commonBean.VariableObject, *helper.StepObject, error) { /*if stageType == STEP_TYPE_POST { postCiStageVariable = make(map[int]map[string]*VariableObject) // [stepId]name[]value }*/ stageVariable := make(map[int]map[string]*commonBean.VariableObject) - pluginArtifactsFromFile := bean.NewPluginArtifact() + pluginArtifactsFromFile := helper.NewPluginArtifact() for i, step := range steps { - stageInfoLoggingRequired := stepType != bean.STEP_TYPE_REF_PLUGIN + stageInfoLoggingRequired := stepType != helper.STEP_TYPE_REF_PLUGIN failedStep := step var ( err error - refPluginArtifacts *bean.PluginArtifacts + refPluginArtifacts *helper.PluginArtifacts ) executeStep := func() error { @@ -96,7 +95,7 @@ func (impl *StageExecutorImpl) RunCiCdSteps(stepType bean.StepType, ciCdRequest return pluginArtifactsFromFile, stageVariable, nil, nil } -func getScriptVariables(step *bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables) (emptyVariableList []string, scriptEnvs map[string]string, variableFileMount map[string]string) { +func getScriptVariables(step *helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables) (emptyVariableList []string, scriptEnvs map[string]string, variableFileMount map[string]string) { //variables with empty value scriptEnvs = make(map[string]string) variableFileMount = make(map[string]string) @@ -139,20 +138,20 @@ func getScriptVariables(step *bean.StepObject, scriptEnvVariables *util2.ScriptE return emptyVariableList, scriptEnvs, variableFileMount } -func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest helper.CommonWorkflowRequest, index int, step *bean.StepObject, - refStageMap map[int][]*bean.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, - stageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (artifacts *bean.PluginArtifacts, failedStep *bean.StepObject, err error) { +func (impl *StageExecutorImpl) RunCiCdStep(stepType helper.StepType, ciCdRequest helper.CommonWorkflowRequest, index int, step *helper.StepObject, + refStageMap map[int][]*helper.StepObject, scriptEnvVariables *util2.ScriptEnvVariables, preCiStageVariable map[int]map[string]*commonBean.VariableObject, + stageVariable map[int]map[string]*commonBean.VariableObject, resetEnvVariable bool) (artifacts *helper.PluginArtifacts, failedStep *helper.StepObject, err error) { var vars []*commonBean.VariableObject - if stepType == bean.STEP_TYPE_REF_PLUGIN { + if stepType == helper.STEP_TYPE_REF_PLUGIN { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, nil, nil, stageVariable) - } else if stepType == bean.STEP_TYPE_SCANNING { + } else if stepType == helper.STEP_TYPE_SCANNING { // only global variables are supported here in image scanning step vars, err = deduceVariables(step.InputVars, scriptEnvVariables, nil, nil, nil) } else { log.Printf("running step : %s\n", step.Name) - if stepType == bean.STEP_TYPE_PRE { + if stepType == helper.STEP_TYPE_PRE { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, stageVariable, nil, nil) - } else if stepType == bean.STEP_TYPE_POST { + } else if stepType == helper.STEP_TYPE_POST { vars, err = deduceVariables(step.InputVars, scriptEnvVariables, preCiStageVariable, stageVariable, nil) } } @@ -165,7 +164,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h // this is required to pass the existing script env variables to the next recursive call scriptEnvVariables.ExistingScriptEnv = scriptEnvs - if stepType == bean.STEP_TYPE_PRE || stepType == bean.STEP_TYPE_POST { + if stepType == helper.STEP_TYPE_PRE || stepType == helper.STEP_TYPE_POST { log.Println(fmt.Sprintf("variables with empty value : %v", emptyVariableList)) } if len(step.TriggerSkipConditions) > 0 { @@ -199,9 +198,9 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h ciContext := cictx.BuildCiContext(context.Background(), ciCdRequest.EnableSecretMasking) stepOutputVarsFinal := make(map[string]string) - var pluginArtifacts *bean.PluginArtifacts + var pluginArtifacts *helper.PluginArtifacts //--------------------------------------------------------------------------------------------------- - if step.StepType == bean.STEP_TYPE_INLINE.String() { + if step.StepType == helper.STEP_TYPE_INLINE.String() { //add system env variable for k, v := range util2.GetSystemEnvVariables() { //add only when not overridden by user @@ -212,7 +211,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h // set the script env variables to the existing script env variables // this is required to pass the existing script env variables to the next recursive call scriptEnvVariables.ExistingScriptEnv = scriptEnvs - if step.ExecutorType == bean.SHELL { + if step.ExecutorType == helper.SHELL { stageOutputVars, err := impl.scriptExecutor.RunScripts(ciContext, util.Output_path, fmt.Sprintf("stage-%d", index), step.Script, scriptEnvs, outVars) if err != nil { return nil, step, err @@ -231,8 +230,8 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h } } } - } else if step.ExecutorType == bean.CONTAINER_IMAGE { - var outputDirMount []*bean.MountPath + } else if step.ExecutorType == helper.CONTAINER_IMAGE { + var outputDirMount []*helper.MountPath stepArtifact := filepath.Join(util.Output_path, "opt") for _, artifact := range step.ArtifactPaths { @@ -242,7 +241,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h log.Println(util.DEVTRON, err) return nil, step, err } - path := bean.NewMountPath(filepath.Join(stepArtifact, artifact), artifact) + path := helper.NewMountPath(filepath.Join(stepArtifact, artifact), artifact) outputDirMount = append(outputDirMount, path) } executionConf := &executionConf{ @@ -262,7 +261,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h } for fileSrc, fileDst := range variableFileMount { - fileMountPaths := bean.NewMountPath(fileSrc, fileDst) + fileMountPaths := helper.NewMountPath(fileSrc, fileDst) executionConf.ExtraVolumeMounts = append(executionConf.ExtraVolumeMounts, fileMountPaths) } if executionConf.SourceCodeMount != nil { @@ -283,7 +282,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h } } } - } else if step.StepType == bean.STEP_TYPE_REF_PLUGIN.String() { + } else if step.StepType == helper.STEP_TYPE_REF_PLUGIN.String() { steps := refStageMap[step.RefPluginId] stepIndexVarNameValueMap := make(map[int]map[string]string) stepIndexFileMountMap := make(map[int]map[string]*fileContentDto) @@ -321,7 +320,7 @@ func (impl *StageExecutorImpl) RunCiCdStep(stepType bean.StepType, ciCdRequest h } } } - refPluginArtifacts, opt, _, err := impl.RunCiCdSteps(bean.STEP_TYPE_REF_PLUGIN, &ciCdRequest, steps, refStageMap, scriptEnvVariables, nil, false) + refPluginArtifacts, opt, _, err := impl.RunCiCdSteps(helper.STEP_TYPE_REF_PLUGIN, &ciCdRequest, steps, refStageMap, scriptEnvVariables, nil, false) if err != nil { fmt.Println(err) return nil, step, err diff --git a/ci-runner/executor/StageExecutor_test.go b/ci-runner/executor/StageExecutor_test.go index 326c4b479..53342553b 100644 --- a/ci-runner/executor/StageExecutor_test.go +++ b/ci-runner/executor/StageExecutor_test.go @@ -17,7 +17,6 @@ package executor import ( - "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/helper" commonBean "github.com/devtron-labs/common-lib/workflow" "reflect" @@ -115,7 +114,7 @@ func Test_deduceVariables(t *testing.T) { func TestRunCiSteps(t *testing.T) { type args struct { - stageType bean.StepType + stageType helper.StepType req *helper.CommonWorkflowRequest globalEnvironmentVariables map[string]string preeCiStageVariable map[int]map[string]*commonBean.VariableObject diff --git a/ci-runner/executor/adaptor/ImageScanAdaptor.go b/ci-runner/executor/adaptor/ImageScanAdaptor.go index aec45b2f0..6eeb6fdd6 100644 --- a/ci-runner/executor/adaptor/ImageScanAdaptor.go +++ b/ci-runner/executor/adaptor/ImageScanAdaptor.go @@ -17,7 +17,6 @@ package adaptor import ( - bean3 "github.com/devtron-labs/ci-runner/bean" bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -45,7 +44,7 @@ func GetImageScanEvent(dest, digest string, commonWorkflowRequest *helper.Common ImageScanRetryDelay: commonWorkflowRequest.ImageScanRetryDelay, } } -func GetImageScannerExecutorBean(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*bean3.StepObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) *bean2.ImageScanningExecutorBean { +func GetImageScannerExecutorBean(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) *bean2.ImageScanningExecutorBean { return &bean2.ImageScanningExecutorBean{ CiCdRequest: ciCdRequest, ScriptEnvs: scriptEnvs, diff --git a/ci-runner/helper/envVariableHelper.go b/ci-runner/executor/helper/envVariableHelper.go similarity index 100% rename from ci-runner/helper/envVariableHelper.go rename to ci-runner/executor/helper/envVariableHelper.go diff --git a/ci-runner/executor/scriptExecutor.go b/ci-runner/executor/scriptExecutor.go index 442cb60f8..3f7b1af9d 100644 --- a/ci-runner/executor/scriptExecutor.go +++ b/ci-runner/executor/scriptExecutor.go @@ -18,7 +18,6 @@ package executor import ( "fmt" - "github.com/devtron-labs/ci-runner/bean" cictx "github.com/devtron-labs/ci-runner/executor/context" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -165,10 +164,10 @@ type executionConf struct { DockerImage string command string args []string - CustomScriptMount *bean.MountPath - SourceCodeMount *bean.MountPath - ExtraVolumeMounts []*bean.MountPath - OutputDirMount []*bean.MountPath + CustomScriptMount *helper.MountPath + SourceCodeMount *helper.MountPath + ExtraVolumeMounts []*helper.MountPath + OutputDirMount []*helper.MountPath // system generate values scriptFileName string //internal workDirectory string diff --git a/ci-runner/executor/scriptExecutor_test.go b/ci-runner/executor/scriptExecutor_test.go index 596719c03..cfcc175ef 100644 --- a/ci-runner/executor/scriptExecutor_test.go +++ b/ci-runner/executor/scriptExecutor_test.go @@ -18,7 +18,7 @@ package executor import ( "fmt" - "github.com/devtron-labs/ci-runner/bean" + "github.com/devtron-labs/ci-runner/helper" "io/ioutil" "os" "reflect" @@ -106,9 +106,9 @@ func Test_buildDockerRunCommand(t *testing.T) { EnvInputFileName: "/tmp/ci-test/abc.env", EntryScriptFileName: "/tmp/code-location/_entry.sh", EnvOutFileName: "/tmp/ci-test/_env.out", - ExtraVolumeMounts: []*bean.MountPath{{SrcPath: "/src", DstPath: "/des"}}, - SourceCodeMount: &bean.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, - CustomScriptMount: &bean.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, + ExtraVolumeMounts: []*helper.MountPath{{SrcPath: "/src", DstPath: "/des"}}, + SourceCodeMount: &helper.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, + CustomScriptMount: &helper.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, ExposedPorts: map[int]int{80: 8080}, }}, wantErr: false, @@ -120,9 +120,9 @@ func Test_buildDockerRunCommand(t *testing.T) { EnvInputFileName: "/tmp/ci-test/abc.env", EntryScriptFileName: "/tmp/code-location/_entry.sh", EnvOutFileName: "/tmp/ci-test/_env.out", - ExtraVolumeMounts: []*bean.MountPath{{SrcPath: "/src", DstPath: "/des"}, {SrcPath: "/src2", DstPath: "/des2"}}, - SourceCodeMount: &bean.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, - CustomScriptMount: &bean.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, + ExtraVolumeMounts: []*helper.MountPath{{SrcPath: "/src", DstPath: "/des"}, {SrcPath: "/src2", DstPath: "/des2"}}, + SourceCodeMount: &helper.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, + CustomScriptMount: &helper.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, ExposedPorts: map[int]int{80: 8080, 90: 9090}, }}, wantErr: false, @@ -206,8 +206,8 @@ func TestRunScriptsInDocker(t *testing.T) { ExposedPorts: map[int]int{80: 8080, 90: 9090}, OutputVars: []string{"HOME", "PWD", "NAME", "KIND"}, DockerImage: "alpine:latest", - SourceCodeMount: &bean.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, - CustomScriptMount: &bean.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, + SourceCodeMount: &helper.MountPath{SrcPath: "/tmp/code-location", DstPath: "/tmp/code-mount-location"}, + CustomScriptMount: &helper.MountPath{SrcPath: "/tmp/custom-script-location", DstPath: "/tmp/script-mount-location"}, command: "/bin/sh", args: []string{"-c", "ls;sleep 1;export NAME=from-script;echo done;"}, scriptFileName: "", diff --git a/ci-runner/executor/stage/bean/bean.go b/ci-runner/executor/stage/bean/bean.go index 82a7e65ba..203011d6d 100644 --- a/ci-runner/executor/stage/bean/bean.go +++ b/ci-runner/executor/stage/bean/bean.go @@ -17,7 +17,6 @@ package bean import ( - bean3 "github.com/devtron-labs/ci-runner/bean" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" ) @@ -36,7 +35,7 @@ const ( type ImageScanningExecutorBean struct { CiCdRequest *helper.CiCdTriggerEvent ScriptEnvs *util2.ScriptEnvVariables - RefStageMap map[int][]*bean3.StepObject + RefStageMap map[int][]*helper.StepObject Metrics *helper.CIMetrics ArtifactUploaded bool Dest string diff --git a/ci-runner/executor/stage/cdStages.go b/ci-runner/executor/stage/cdStages.go index 7c99cc358..e3e753dea 100644 --- a/ci-runner/executor/stage/cdStages.go +++ b/ci-runner/executor/stage/cdStages.go @@ -20,7 +20,6 @@ import ( "context" "errors" "fmt" - "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/helper/adaptor" "github.com/devtron-labs/common-lib/utils/workFlow" "log" @@ -72,7 +71,7 @@ func deferCDEvent(cdRequest *helper.CommonWorkflowRequest, artifactUploaded bool func (impl *CdStage) HandleCDEvent(ciCdRequest *helper.CiCdTriggerEvent, exitCode *int) { var artifactUploaded bool var err error - var allPluginArtifacts *bean.PluginArtifacts + var allPluginArtifacts *helper.PluginArtifacts defer func() { *exitCode = deferCDEvent(ciCdRequest.CommonWorkflowRequest, artifactUploaded, err) }() @@ -136,7 +135,7 @@ func collectAndUploadCDArtifacts(cdRequest *helper.CommonWorkflowRequest) (artif return helper.UploadArtifact(cloudHelperBaseConfig, artifactFiles, cdRequest.CiArtifactFileName) } -func (impl *CdStage) runCDStages(ciCdRequest *helper.CiCdTriggerEvent) (*bean.PluginArtifacts, error) { +func (impl *CdStage) runCDStages(ciCdRequest *helper.CiCdTriggerEvent) (*helper.PluginArtifacts, error) { err := os.Chdir("/") if err != nil { return nil, err @@ -183,15 +182,15 @@ func (impl *CdStage) runCDStages(ciCdRequest *helper.CiCdTriggerEvent) (*bean.Pl log.Println(util.DEVTRON, "error while getting global envs", err) return nil, err } - allPluginArtifacts := bean.NewPluginArtifact() + allPluginArtifacts := helper.NewPluginArtifact() if len(ciCdRequest.CommonWorkflowRequest.PrePostDeploySteps) > 0 { - refStageMap := make(map[int][]*bean.StepObject) + refStageMap := make(map[int][]*helper.StepObject) for _, ref := range ciCdRequest.CommonWorkflowRequest.RefPlugins { refStageMap[ref.Id] = ref.Steps } scriptEnvs.SystemEnv["DEST"] = ciCdRequest.CommonWorkflowRequest.CiArtifactDTO.Image scriptEnvs.SystemEnv["DIGEST"] = ciCdRequest.CommonWorkflowRequest.CiArtifactDTO.ImageDigest - var stage = bean.StepType(ciCdRequest.CommonWorkflowRequest.StageType) + var stage = helper.StepType(ciCdRequest.CommonWorkflowRequest.StageType) pluginArtifacts, _, step, err := impl.stageExecutorManager.RunCiCdSteps(stage, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PrePostDeploySteps, refStageMap, scriptEnvs, nil, true) if err != nil { return allPluginArtifacts, helper.NewCdStageError(err). diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index fa80ce29b..d15936a2d 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -21,10 +21,10 @@ import ( "encoding/json" "errors" "fmt" - bean3 "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/executor" adaptor2 "github.com/devtron-labs/ci-runner/executor/adaptor" cicxt "github.com/devtron-labs/ci-runner/executor/context" + helper2 "github.com/devtron-labs/ci-runner/executor/helper" bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -235,7 +235,7 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. } } - refStageMap := make(map[int][]*bean3.StepObject) + refStageMap := make(map[int][]*helper.StepObject) for _, ref := range ciCdRequest.CommonWorkflowRequest.RefPlugins { refStageMap[ref.Id] = ref.Steps } @@ -259,11 +259,11 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. } } // setting digest in global env - helper.SetKeyValueInGlobalSystemEnv(scriptEnvs, bean2.DigestGlobalEnvKey, digest) + helper2.SetKeyValueInGlobalSystemEnv(scriptEnvs, bean2.DigestGlobalEnvKey, digest) var postCiDuration float64 start = time.Now() metrics.PostCiStartTime = start - var pluginArtifacts *bean3.PluginArtifacts + var pluginArtifacts *helper.PluginArtifacts if len(ciCdRequest.CommonWorkflowRequest.PostCiSteps) > 0 { pluginArtifacts, resultsFromPlugin, err = impl.runPostCiSteps(ciCdRequest, scriptEnvs, refStageMap, preCiStageOutVariable, metrics, artifactUploaded, dest, digest) postCiDuration = time.Since(start).Seconds() @@ -330,7 +330,7 @@ func (impl *CiStage) runCIStages(ciContext cicxt.CiContext, ciCdRequest *helper. } func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, - buildSkipEnabled bool, refStageMap map[int][]*bean3.StepObject, + buildSkipEnabled bool, refStageMap map[int][]*helper.StepObject, scriptEnvs *util2.ScriptEnvVariables, artifactUploaded bool) (json.RawMessage, map[int]map[string]*commonBean.VariableObject, error) { start := time.Now() metrics.PreCiStartTime = start @@ -338,7 +338,7 @@ func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics log.Println("running PRE-CI steps") } // run pre artifact processing - _, preCiStageOutVariable, step, err := impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_PRE, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PreCiSteps, refStageMap, scriptEnvs, nil, true) + _, preCiStageOutVariable, step, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_PRE, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PreCiSteps, refStageMap, scriptEnvs, nil, true) preCiDuration := time.Since(start).Seconds() if err != nil { log.Println("error in running pre Ci Steps", "err", err) @@ -359,7 +359,7 @@ func (impl *CiStage) runPreCiSteps(ciCdRequest *helper.CiCdTriggerEvent, metrics } func (impl *CiStage) runBuildArtifact(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, - refStageMap map[int][]*bean3.StepObject, scriptEnvs *util2.ScriptEnvVariables, artifactUploaded bool, + refStageMap map[int][]*helper.StepObject, scriptEnvs *util2.ScriptEnvVariables, artifactUploaded bool, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject) (string, error) { // build start := time.Now() @@ -375,7 +375,7 @@ func (impl *CiStage) runBuildArtifact(ciCdRequest *helper.CiCdTriggerEvent, metr // build success will always be false scriptEnvs.SystemEnv[util.ENV_VARIABLE_BUILD_SUCCESS] = "false" // run post artifact processing - impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, postCiStepsToTriggerOnCiFail, refStageMap, scriptEnvs, preCiStageOutVariable, true) + impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, postCiStepsToTriggerOnCiFail, refStageMap, scriptEnvs, preCiStageOutVariable, true) scriptEnvs = scriptEnvs.ResetExistingScriptEnv() } // code-block ends @@ -414,14 +414,14 @@ func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest st return digest, err } -func (impl *CiStage) runPostCiSteps(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*bean3.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) (*bean3.PluginArtifacts, json.RawMessage, error) { +func (impl *CiStage) runPostCiSteps(ciCdRequest *helper.CiCdTriggerEvent, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, metrics *helper.CIMetrics, artifactUploaded bool, dest string, digest string) (*helper.PluginArtifacts, json.RawMessage, error) { log.Println("running POST-CI steps") // sending build success as true always as post-ci triggers only if ci gets success scriptEnvs.SystemEnv[util.ENV_VARIABLE_BUILD_SUCCESS] = "true" scriptEnvs.SystemEnv["DEST"] = dest scriptEnvs.SystemEnv["DIGEST"] = digest // run post artifact processing - pluginArtifactsFromFile, _, step, err := impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PostCiSteps, refStageMap, scriptEnvs, preCiStageOutVariable, true) + pluginArtifactsFromFile, _, step, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_POST, ciCdRequest.CommonWorkflowRequest, ciCdRequest.CommonWorkflowRequest.PostCiSteps, refStageMap, scriptEnvs, preCiStageOutVariable, true) if err != nil { log.Println("error in running Post Ci Steps", "err", err) return nil, nil, helper.NewCiStageError(err). @@ -469,7 +469,7 @@ func (impl *CiStage) runImageScanning(imageScannerExecutor *bean2.ImageScanningE //setting scan tool id in script env scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = strconv.Itoa(scanToolId) // run image scanning steps - _, _, _, err := impl.stageExecutorManager.RunCiCdSteps(bean3.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) + _, _, _, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) if err != nil { log.Println("error in running pre Ci Steps", "err", err) return helper.NewCiStageError(err). @@ -489,7 +489,7 @@ func (impl *CiStage) runImageScanning(imageScannerExecutor *bean2.ImageScanningE return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningStage) } -func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*bean3.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, artifactUploaded bool) (string, string, error) { +func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, metrics *helper.CIMetrics, scriptEnvs *util2.ScriptEnvVariables, refStageMap map[int][]*helper.StepObject, preCiStageOutVariable map[int]map[string]*commonBean.VariableObject, artifactUploaded bool) (string, string, error) { dest, err := impl.runBuildArtifact(ciCdRequest, metrics, refStageMap, scriptEnvs, artifactUploaded, preCiStageOutVariable) if err != nil { return "", "", err @@ -502,8 +502,8 @@ func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, return dest, digest, nil } -func getPostCiStepToRunOnCiFail(postCiSteps []*bean3.StepObject) []*bean3.StepObject { - var postCiStepsToTriggerOnCiFail []*bean3.StepObject +func getPostCiStepToRunOnCiFail(postCiSteps []*helper.StepObject) []*helper.StepObject { + var postCiStepsToTriggerOnCiFail []*helper.StepObject if len(postCiSteps) > 0 { for _, postCiStep := range postCiSteps { if postCiStep.TriggerIfParentStageFail { diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index e7fe1280b..bef00d0ba 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -20,7 +20,6 @@ import ( "crypto/tls" "encoding/json" "fmt" - bean3 "github.com/devtron-labs/ci-runner/bean" bean2 "github.com/devtron-labs/common-lib/imageScan/bean" "github.com/devtron-labs/common-lib/utils/remoteConnection/bean" "log" @@ -135,9 +134,9 @@ type CommonWorkflowRequest struct { InAppLoggingEnabled bool `json:"inAppLoggingEnabled"` DefaultAddressPoolBaseCidr string `json:"defaultAddressPoolBaseCidr"` DefaultAddressPoolSize int `json:"defaultAddressPoolSize"` - PreCiSteps []*bean3.StepObject `json:"preCiSteps"` - PostCiSteps []*bean3.StepObject `json:"postCiSteps"` - RefPlugins []*bean3.RefPluginObject `json:"refPlugins"` + PreCiSteps []*StepObject `json:"preCiSteps"` + PostCiSteps []*StepObject `json:"postCiSteps"` + RefPlugins []*RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` @@ -177,7 +176,7 @@ type CommonWorkflowRequest struct { DeploymentTriggeredBy string `json:"deploymentTriggeredBy,omitempty"` DeploymentTriggerTime time.Time `json:"deploymentTriggerTime,omitempty"` DeploymentReleaseCounter int `json:"deploymentReleaseCounter,omitempty"` - PrePostDeploySteps []*bean3.StepObject `json:"prePostDeploySteps"` + PrePostDeploySteps []*StepObject `json:"prePostDeploySteps"` TaskYaml *TaskYaml `json:"-"` IsVirtualExecution bool `json:"isVirtualExecution"` CiArtifactLastFetch time.Time `json:"ciArtifactLastFetch"` @@ -197,17 +196,17 @@ type CommonWorkflowRequest struct { } func (c *CommonWorkflowRequest) IsPreCdStage() bool { - return c.StageType == string(bean3.STEP_TYPE_PRE) + return c.StageType == string(STEP_TYPE_PRE) } func (c *CommonWorkflowRequest) IsPostCdStage() bool { - return c.StageType == string(bean3.STEP_TYPE_POST) + return c.StageType == string(STEP_TYPE_POST) } func (c *CommonWorkflowRequest) GetCdStageType() PipelineType { - if c.StageType == string(bean3.STEP_TYPE_PRE) { + if c.StageType == string(STEP_TYPE_PRE) { return PRE_CD - } else if c.StageType == string(bean3.STEP_TYPE_POST) { + } else if c.StageType == string(STEP_TYPE_POST) { return POST_CD } return "" @@ -270,9 +269,9 @@ type CiRequest struct { MinioEndpoint string `json:"minioEndpoint"` DefaultAddressPoolBaseCidr string `json:"defaultAddressPoolBaseCidr"` DefaultAddressPoolSize int `json:"defaultAddressPoolSize"` - PreCiSteps []*bean3.StepObject `json:"preCiSteps"` - PostCiSteps []*bean3.StepObject `json:"postCiSteps"` - RefPlugins []*bean3.RefPluginObject `json:"refPlugins"` + PreCiSteps []*StepObject `json:"preCiSteps"` + PostCiSteps []*StepObject `json:"postCiSteps"` + RefPlugins []*RefPluginObject `json:"refPlugins"` AppName string `json:"appName"` TriggerByAuthor string `json:"triggerByAuthor"` CiBuildConfig *CiBuildConfigBean `json:"ciBuildConfig"` @@ -330,8 +329,8 @@ type CdRequest struct { CiRunnerDockerMtuValue int `json:"ciRunnerDockerMtuValue"` DeploymentReleaseCounter int `json:"deploymentReleaseCounter,omitempty"` IsDryRun bool `json:"isDryRun"` - PrePostDeploySteps []*bean3.StepObject `json:"prePostDeploySteps"` - RefPlugins []*bean3.RefPluginObject `json:"refPlugins"` + PrePostDeploySteps []*StepObject `json:"prePostDeploySteps"` + RefPlugins []*RefPluginObject `json:"refPlugins"` StageType string `json:"stageType"` } @@ -357,25 +356,25 @@ type CiArtifactDTO struct { } type CiCompleteEvent struct { - CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` - DockerImage string `json:"dockerImage"` - Digest string `json:"digest"` - PipelineId int `json:"pipelineId"` - DataSource string `json:"dataSource"` - PipelineName string `json:"pipelineName"` - WorkflowId int `json:"workflowId"` - TriggeredBy int `json:"triggeredBy"` - MaterialType string `json:"materialType"` - Metrics CIMetrics `json:"metrics"` - AppName string `json:"appName"` - IsArtifactUploaded bool `json:"isArtifactUploaded"` - FailureReason string `json:"failureReason"` // FailureReason is used for notifying the failure reason to the user. Should be short and user-friendly - ImageDetailsFromCR json.RawMessage `json:"imageDetailsFromCR"` - PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` - PluginArtifactStage string `json:"pluginArtifactStage"` - IsScanEnabled bool `json:"isScanEnabled"` - PluginArtifacts *bean3.PluginArtifacts `json:"pluginArtifacts"` - DockerRegistryId string `json:"dockerRegistryId"` + CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` + DockerImage string `json:"dockerImage"` + Digest string `json:"digest"` + PipelineId int `json:"pipelineId"` + DataSource string `json:"dataSource"` + PipelineName string `json:"pipelineName"` + WorkflowId int `json:"workflowId"` + TriggeredBy int `json:"triggeredBy"` + MaterialType string `json:"materialType"` + Metrics CIMetrics `json:"metrics"` + AppName string `json:"appName"` + IsArtifactUploaded bool `json:"isArtifactUploaded"` + FailureReason string `json:"failureReason"` // FailureReason is used for notifying the failure reason to the user. Should be short and user-friendly + ImageDetailsFromCR json.RawMessage `json:"imageDetailsFromCR"` + PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` + PluginArtifactStage string `json:"pluginArtifactStage"` + IsScanEnabled bool `json:"isScanEnabled"` + PluginArtifacts *PluginArtifacts `json:"pluginArtifacts"` + DockerRegistryId string `json:"dockerRegistryId"` } func (event *CiCompleteEvent) WithMetrics(metrics CIMetrics) *CiCompleteEvent { @@ -393,7 +392,7 @@ func (event *CiCompleteEvent) WithImageDetailsFromCR(imageDetailsFromCR json.Raw return event } -func (event *CiCompleteEvent) WithPluginArtifacts(pluginArtifacts *bean3.PluginArtifacts) *CiCompleteEvent { +func (event *CiCompleteEvent) WithPluginArtifacts(pluginArtifacts *PluginArtifacts) *CiCompleteEvent { event.PluginArtifacts = pluginArtifacts return event } @@ -438,23 +437,23 @@ type ImageScanningEvent struct { } type CdStageCompleteEvent struct { - CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` - WorkflowId int `json:"workflowId"` - WorkflowRunnerId int `json:"workflowRunnerId"` - CdPipelineId int `json:"cdPipelineId"` - TriggeredBy int `json:"triggeredBy"` - StageYaml string `json:"stageYaml"` - ArtifactLocation string `json:"artifactLocation"` - TaskYaml *TaskYaml `json:"-"` - PipelineName string `json:"pipelineName"` - CiArtifactDTO CiArtifactDTO `json:"ciArtifactDTO"` - PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` - PluginArtifactStage string `json:"pluginArtifactStage"` - PluginArtifacts *bean3.PluginArtifacts `json:"pluginArtifacts"` - IsArtifactUploaded bool `json:"isArtifactUploaded"` -} - -func (event *CdStageCompleteEvent) WithPluginArtifacts(pluginArtifacts *bean3.PluginArtifacts) *CdStageCompleteEvent { + CiProjectDetails []CiProjectDetails `json:"ciProjectDetails"` + WorkflowId int `json:"workflowId"` + WorkflowRunnerId int `json:"workflowRunnerId"` + CdPipelineId int `json:"cdPipelineId"` + TriggeredBy int `json:"triggeredBy"` + StageYaml string `json:"stageYaml"` + ArtifactLocation string `json:"artifactLocation"` + TaskYaml *TaskYaml `json:"-"` + PipelineName string `json:"pipelineName"` + CiArtifactDTO CiArtifactDTO `json:"ciArtifactDTO"` + PluginRegistryArtifactDetails map[string][]string `json:"PluginRegistryArtifactDetails"` + PluginArtifactStage string `json:"pluginArtifactStage"` + PluginArtifacts *PluginArtifacts `json:"pluginArtifacts"` + IsArtifactUploaded bool `json:"isArtifactUploaded"` +} + +func (event *CdStageCompleteEvent) WithPluginArtifacts(pluginArtifacts *PluginArtifacts) *CdStageCompleteEvent { event.PluginArtifacts = pluginArtifacts return event } @@ -759,9 +758,9 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent Digest: ciCdRequest.CiArtifactDTO.ImageDigest, } var stage PipelineType - if ciCdRequest.StageType == string(bean3.STEP_TYPE_PRE) { + if ciCdRequest.StageType == string(STEP_TYPE_PRE) { stage = PRE_CD - } else if ciCdRequest.StageType == string(bean3.STEP_TYPE_POST) { + } else if ciCdRequest.StageType == string(STEP_TYPE_POST) { stage = POST_CD } event.PipelineType = stage @@ -769,6 +768,6 @@ func GetImageScanningEvent(ciCdRequest CommonWorkflowRequest) ImageScanningEvent } type ImageScanningSteps struct { - Steps []*bean3.StepObject `json:"steps"` - ScanToolId int `json:"scanToolId"` + Steps []*StepObject `json:"steps"` + ScanToolId int `json:"scanToolId"` } diff --git a/ci-runner/helper/ExpressionEvaluater.go b/ci-runner/helper/ExpressionEvaluater.go index 8b4203f2d..b5a081fde 100644 --- a/ci-runner/helper/ExpressionEvaluater.go +++ b/ci-runner/helper/ExpressionEvaluater.go @@ -19,15 +19,14 @@ package helper import ( "fmt" "github.com/Knetic/govaluate" - "github.com/devtron-labs/ci-runner/bean" commonBean "github.com/devtron-labs/common-lib/workflow" ) type ConditionObject struct { - ConditionType bean.ConditionType `json:"conditionType"` //TRIGGER, SKIP, PASS, FAIL - ConditionOnVariable string `json:"conditionOnVariable"` //name of variable - ConditionalOperator string `json:"conditionalOperator"` - ConditionalValue string `json:"conditionalValue"` + ConditionType ConditionType `json:"conditionType"` //TRIGGER, SKIP, PASS, FAIL + ConditionOnVariable string `json:"conditionOnVariable"` //name of variable + ConditionalOperator string `json:"conditionalOperator"` + ConditionalValue string `json:"conditionalValue"` typecastConditionalValue interface{} } @@ -41,7 +40,7 @@ func ShouldTriggerStage(conditions []*ConditionObject, variables []*commonBean.V } status = status && result } - if conditionType == bean.TRIGGER { + if conditionType == TRIGGER { return status, nil // trigger if all success } else { return !status, nil //skip if all ture @@ -58,7 +57,7 @@ func StageIsSuccess(conditions []*ConditionObject, variables []*commonBean.Varia } status = status && result } - if conditionType == bean.PASS { + if conditionType == PASS { return status, nil // success if all success } else { return !status, nil //fail if all success diff --git a/ci-runner/bean/pluginArtifactsBean.go b/ci-runner/helper/pluginArtifactsBean.go similarity index 98% rename from ci-runner/bean/pluginArtifactsBean.go rename to ci-runner/helper/pluginArtifactsBean.go index 01dbd48b9..6d417fee4 100644 --- a/ci-runner/bean/pluginArtifactsBean.go +++ b/ci-runner/helper/pluginArtifactsBean.go @@ -1,4 +1,4 @@ -package bean +package helper import "time" diff --git a/ci-runner/bean/pluginBean.go b/ci-runner/helper/pluginBean.go similarity index 96% rename from ci-runner/bean/pluginBean.go rename to ci-runner/helper/pluginBean.go index a47b0bbc3..1d7aee0af 100644 --- a/ci-runner/bean/pluginBean.go +++ b/ci-runner/helper/pluginBean.go @@ -14,12 +14,11 @@ * limitations under the License. */ -package bean +package helper import ( "encoding/json" "fmt" - "github.com/devtron-labs/ci-runner/helper" commonBean "github.com/devtron-labs/common-lib/workflow" "strings" ) @@ -53,8 +52,8 @@ type StepObject struct { InputVars []*commonBean.VariableObject `json:"inputVars"` ExposedPorts map[int]int `json:"exposedPorts"` //map of host:container OutputVars []*commonBean.VariableObject `json:"outputVars"` - TriggerSkipConditions []*helper.ConditionObject `json:"triggerSkipConditions"` - SuccessFailureConditions []*helper.ConditionObject `json:"successFailureConditions"` + TriggerSkipConditions []*ConditionObject `json:"triggerSkipConditions"` + SuccessFailureConditions []*ConditionObject `json:"successFailureConditions"` DockerImage string `json:"dockerImage"` Command string `json:"command"` Args []string `json:"args"` diff --git a/ci-runner/helper/pluginUtils.go b/ci-runner/helper/pluginUtils.go index bea6b5fb2..9ac7b7ee0 100644 --- a/ci-runner/helper/pluginUtils.go +++ b/ci-runner/helper/pluginUtils.go @@ -2,14 +2,13 @@ package helper import ( "encoding/json" - "github.com/devtron-labs/ci-runner/bean" "github.com/devtron-labs/ci-runner/util" "io/ioutil" "log" "os" ) -func ExtractPluginArtifactsAndRemoveFile() (*bean.PluginArtifacts, error) { +func ExtractPluginArtifactsAndRemoveFile() (*PluginArtifacts, error) { exists, err := util.CheckFileExists(util.PluginArtifactsResults) if err != nil || !exists { log.Println("err", err) @@ -20,7 +19,7 @@ func ExtractPluginArtifactsAndRemoveFile() (*bean.PluginArtifacts, error) { log.Println("error in reading file", "err", err.Error()) return nil, err } - pluginArtifacts := &bean.PluginArtifacts{} + pluginArtifacts := &PluginArtifacts{} err = json.Unmarshal(file, &pluginArtifacts) if err != nil { log.Println("error in unmarshalling imageDetailsFromCr results", "err", err.Error()) From 8edf81b606fea011d24ab0bd34cb5c3249de7826 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Mon, 20 Jan 2025 15:46:40 +0530 Subject: [PATCH 43/70] make dep oss update --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index cf1e4c613..92bd7a6dc 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 720b4cd89..77cdb738f 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 9657196ab..9c41195b6 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index a307f50dc..568842a0f 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index bfcaf3b43..ee7ee5cc7 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index a070e502b..bd5d7760f 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index af682fe74..1d9421fe6 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 16d2c30bf..6d2226d01 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 2de69f5ee..c48574678 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index fdc5ef90a..da507b0e4 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 177e0b080..ff07283c8 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index a6481aaaa..f41ebf62e 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/kubelink/go.mod b/kubelink/go.mod index 013652a31..c4d8d6439 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index a3dc6f381..18cfd33ac 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index cf3a3f7ae..258a1cf84 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index e194f5df4..f4e368ec0 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 832dc1a34..fe0f1a659 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index cbab0236b..9bd1fd56e 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/lens/go.mod b/lens/go.mod index ed60a5718..b331f0eb5 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 diff --git a/lens/go.sum b/lens/go.sum index 5deff91bc..44642028b 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 h1:C/WfMsiFa9mM6sw82RQXm7izoOVc0eiF0HKrpTdYeRA= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 075482d5e..c53b58e7f 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120082430-55f091f78d82 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 From 6b1f31f298c09c519289b9589743b8eaedd74f0c Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Mon, 20 Jan 2025 18:41:04 +0530 Subject: [PATCH 44/70] counter for git fetch timeout --- git-sensor/internals/middleware/instrument.go | 8 ++++++++ git-sensor/pkg/git/GitBaseManager.go | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/git-sensor/internals/middleware/instrument.go b/git-sensor/internals/middleware/instrument.go index 90ee82576..86b3aa33c 100644 --- a/git-sensor/internals/middleware/instrument.go +++ b/git-sensor/internals/middleware/instrument.go @@ -110,6 +110,14 @@ var GitMaterialPollCounter = promauto.NewCounterVec( }, []string{}) +var GitFetchTimeoutCounter = promauto.NewCounterVec( + prometheus.CounterOpts{ + Name: "git_fetch_timeout", + Help: "no of timeouts while running git fetch command", + ConstLabels: constLabels, + }, + []string{}) + var PanicCounter = promauto.NewCounterVec( prometheus.CounterOpts{ Name: "panic", diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index 93d276368..cf7a9a0b8 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -23,6 +23,7 @@ import ( "fmt" commonLibGitManager "github.com/devtron-labs/common-lib/git-manager" "github.com/devtron-labs/git-sensor/internals" + "github.com/devtron-labs/git-sensor/internals/middleware" "github.com/devtron-labs/git-sensor/internals/sql" "github.com/devtron-labs/git-sensor/util" "go.uber.org/zap" @@ -201,6 +202,13 @@ func (impl *GitManagerBaseImpl) runCommand(cmd *exec.Cmd) (response, errMsg stri if err != nil { impl.logger.Errorw("error in git cli operation", "msg", string(outBytes), "err", err) errMsg = output + if errors.Is(err, context.DeadlineExceeded) { + errMsg = "command timed out" + impl.logger.Errorw("command timed out", "cmd", cmd.String()) + // prometheus event count for timeout + middleware.GitMaterialPollCounter.WithLabelValues().Inc() + return output, errMsg, err + } exErr, ok := err.(*exec.ExitError) if !ok { return output, errMsg, err From b0c9d298f882e88452a574c5f9b400c94a2b212c Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 20 Jan 2025 19:22:38 +0530 Subject: [PATCH 45/70] change GetResourceScanExecutionResult sig --- image-scanner/pkg/sql/adaptor/adaptor.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/image-scanner/pkg/sql/adaptor/adaptor.go b/image-scanner/pkg/sql/adaptor/adaptor.go index 8bd0aa4d2..1c2a10e42 100644 --- a/image-scanner/pkg/sql/adaptor/adaptor.go +++ b/image-scanner/pkg/sql/adaptor/adaptor.go @@ -36,12 +36,22 @@ func GetScanToolExecutionHistoryMapping(executionHistoryModel *repository.ImageS } } -func GetResourceScanExecutionResult(executionHistoryId, scanToolId int, scanDataJson string, format repository.ResourceScanFormat, types []int) *repository.ResourceScanResult { +func GetResourceScanExecutionResult(executionHistoryId, scanToolId int, scanDataJson string, format repository.ResourceScanFormat) *repository.ResourceScanResult { + resultTypes := make([]int, 0, 4) + switch format { + case repository.SbomResultSource: + resultTypes = []int{repository.Vulnerabilities.ToInt(), repository.License.ToInt()} + case repository.CycloneDxSbom: + resultTypes = []int{repository.Vulnerabilities.ToInt(), repository.License.ToInt()} + default: + resultTypes = []int{repository.Vulnerabilities.ToInt(), repository.License.ToInt(), repository.Config.ToInt(), repository.Secrets.ToInt()} + + } return &repository.ResourceScanResult{ ImageScanExecutionHistoryId: executionHistoryId, ScanDataJson: scanDataJson, Format: format, - Types: types, + Types: resultTypes, ScanToolId: scanToolId, } } From 8c500ec2c5701be3c100edffae46049a68591d0e Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Mon, 20 Jan 2025 19:26:04 +0530 Subject: [PATCH 46/70] counter for git fetch timeout --- git-sensor/pkg/git/GitBaseManager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index cf7a9a0b8..d3d3b93ff 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -206,7 +206,7 @@ func (impl *GitManagerBaseImpl) runCommand(cmd *exec.Cmd) (response, errMsg stri errMsg = "command timed out" impl.logger.Errorw("command timed out", "cmd", cmd.String()) // prometheus event count for timeout - middleware.GitMaterialPollCounter.WithLabelValues().Inc() + middleware.GitFetchTimeoutCounter.WithLabelValues().Inc() return output, errMsg, err } exErr, ok := err.(*exec.ExitError) From cb7a38b376bfbb63622461e3342369d80853b33b Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 20 Jan 2025 19:29:32 +0530 Subject: [PATCH 47/70] go mod changes --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 92bd7a6dc..50d69c172 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 77cdb738f..29f460246 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 9c41195b6..58241989b 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 568842a0f..f1650568e 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index ee7ee5cc7..78517943b 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index bd5d7760f..f241fbce2 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 1d9421fe6..f8b2c8346 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 6d2226d01..e693d89aa 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index c48574678..b5697bd35 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index da507b0e4..2b2dcd565 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index ff07283c8..0161f58f0 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index f41ebf62e..2d70b508a 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/kubelink/go.mod b/kubelink/go.mod index c4d8d6439..1279c4123 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index 18cfd33ac..cfde77237 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 258a1cf84..1091a1101 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index f4e368ec0..68d3544dc 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index fe0f1a659..7940e6d40 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 9bd1fd56e..94be87862 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/lens/go.mod b/lens/go.mod index b331f0eb5..1de16234c 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 diff --git a/lens/go.sum b/lens/go.sum index 44642028b..2a9fe468c 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 h1:Dd+CACKV91GHSiolUlVcuYYtj96QYEnlFYGPRdyWyx8= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index c53b58e7f..3fafb1f4b 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120101443-27a509557e09 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 From 331e71edf958ae54fcc39bb7b73f3ec3abd5a736 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 20 Jan 2025 19:42:15 +0530 Subject: [PATCH 48/70] go mod changes --- image-scanner/pkg/sql/adaptor/adaptor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-scanner/pkg/sql/adaptor/adaptor.go b/image-scanner/pkg/sql/adaptor/adaptor.go index 1c2a10e42..c671b083a 100644 --- a/image-scanner/pkg/sql/adaptor/adaptor.go +++ b/image-scanner/pkg/sql/adaptor/adaptor.go @@ -40,7 +40,7 @@ func GetResourceScanExecutionResult(executionHistoryId, scanToolId int, scanData resultTypes := make([]int, 0, 4) switch format { case repository.SbomResultSource: - resultTypes = []int{repository.Vulnerabilities.ToInt(), repository.License.ToInt()} + resultTypes = []int{repository.Vulnerabilities.ToInt()} case repository.CycloneDxSbom: resultTypes = []int{repository.Vulnerabilities.ToInt(), repository.License.ToInt()} default: From 2a2e1e28871e217ef3864e130e135816cad55910 Mon Sep 17 00:00:00 2001 From: Shivam-nagar23 Date: Mon, 20 Jan 2025 19:45:16 +0530 Subject: [PATCH 49/70] make dep update oss --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 50d69c172..26ad801e4 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 29f460246..8fdbccf63 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 58241989b..9a5f0f390 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index f1650568e..c84398a4e 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 78517943b..56c3fea00 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index f241fbce2..ebac89fa6 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index f8b2c8346..b664d6fc3 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index e693d89aa..2c9ba2f44 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index b5697bd35..092a08caa 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 2b2dcd565..adca47f48 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 0161f58f0..760f31dc8 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 2d70b508a..80bc27eb3 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/kubelink/go.mod b/kubelink/go.mod index 1279c4123..d395799df 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index cfde77237..5a8f947a5 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 1091a1101..f2b1035f9 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 68d3544dc..45aebce3a 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 7940e6d40..2d07150b4 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 94be87862..0a4dde9a2 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/lens/go.mod b/lens/go.mod index 1de16234c..8ad4681b8 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 diff --git a/lens/go.sum b/lens/go.sum index 2a9fe468c..5274d28c9 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 h1:FQ9AeBNLhjR+DXGffBjPOppvsJMpPJDhRA+gsWvHkjg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 3fafb1f4b..bb1d90fbe 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120135247-b0c9d298f882 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 From 33159c0c68134f570993d09c960e669de40ab463 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Tue, 21 Jan 2025 10:33:54 +0530 Subject: [PATCH 50/70] counter for git fetch timeout --- git-sensor/pkg/git/GitBaseManager.go | 26 +++++++++++++------------- git-sensor/wire_gen.go | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index d3d3b93ff..021bdfc8b 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -120,12 +120,12 @@ func (impl *GitManagerBaseImpl) Fetch(gitCtx GitContext, rootDir string) (respon impl.logger.Errorw("error encountered in createFilesForTlsData", "err", err) } defer commonLibGitManager.DeleteTlsFiles(tlsPathInfo) - output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) if strings.Contains(output, util.LOCK_REF_MESSAGE) { impl.logger.Info("error in fetch, pruning local refs and retrying", "rootDir", rootDir) // running git remote prune origin and retrying fetch. gitHub issue - https://github.com/devtron-labs/devtron/issues/4605 pruneCmd, pruneCmdCancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "remote", "prune", "origin") - pruneOutput, pruneMsg, pruneErr := impl.runCommandWithCred(pruneCmd, gitCtx.Username, gitCtx.Password, tlsPathInfo) + pruneOutput, pruneMsg, pruneErr := impl.runCommandWithCred(pruneCmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) defer pruneCmdCancel() if pruneErr != nil { impl.logger.Errorw("error in pruning local refs that do not exist at remote") @@ -135,7 +135,7 @@ func (impl *GitManagerBaseImpl) Fetch(gitCtx GitContext, rootDir string) (respon retryFetchCmd, retryFetchCancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "fetch", "origin", "--tags", "--force") defer retryFetchCancel() - output, errMsg, err = impl.runCommandWithCred(retryFetchCmd, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err = impl.runCommandWithCred(retryFetchCmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) } impl.logger.Debugw("fetch output", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err) return output, errMsg, err @@ -145,7 +145,7 @@ func (impl *GitManagerBaseImpl) Checkout(gitCtx GitContext, rootDir, branch stri impl.logger.Debugw("git checkout ", "location", rootDir) cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "checkout", branch, "--force") defer cancel() - output, errMsg, err := impl.runCommand(cmd) + output, errMsg, err := impl.runCommand(gitCtx, cmd) impl.logger.Debugw("checkout output", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err) return output, errMsg, err } @@ -162,7 +162,7 @@ func (impl *GitManagerBaseImpl) LogMergeBase(gitCtx GitContext, rootDir, from st impl.logger.Debugw("git", cmdArgs) cmd, cancel := impl.createCmdWithContext(gitCtx, "git", cmdArgs...) defer cancel() - output, errMsg, err := impl.runCommand(cmd) + output, errMsg, err := impl.runCommand(gitCtx, cmd) impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err) if err != nil { return nil, err @@ -175,7 +175,7 @@ func (impl *GitManagerBaseImpl) LogMergeBase(gitCtx GitContext, rootDir, from st return commits, nil } -func (impl *GitManagerBaseImpl) runCommandWithCred(cmd *exec.Cmd, userName, password string, tlsPathInfo *commonLibGitManager.TlsPathInfo) (response, errMsg string, err error) { +func (impl *GitManagerBaseImpl) runCommandWithCred(cmd *exec.Cmd, gitCtx GitContext, userName, password string, tlsPathInfo *commonLibGitManager.TlsPathInfo) (response, errMsg string, err error) { cmd.Env = append(os.Environ(), fmt.Sprintf("GIT_ASKPASS=%s", util.GIT_ASK_PASS), fmt.Sprintf("GIT_USERNAME=%s", userName), @@ -191,10 +191,10 @@ func (impl *GitManagerBaseImpl) runCommandWithCred(cmd *exec.Cmd, userName, pass cmd.Env = append(cmd.Env, fmt.Sprintf("GIT_SSL_CAINFO=%s", tlsPathInfo.CaCertPath)) } } - return impl.runCommand(cmd) + return impl.runCommand(gitCtx, cmd) } -func (impl *GitManagerBaseImpl) runCommand(cmd *exec.Cmd) (response, errMsg string, err error) { +func (impl *GitManagerBaseImpl) runCommand(gitCtx GitContext, cmd *exec.Cmd) (response, errMsg string, err error) { cmd.Env = append(cmd.Env, "HOME=/dev/null") outBytes, err := cmd.CombinedOutput() output := string(outBytes) @@ -202,7 +202,7 @@ func (impl *GitManagerBaseImpl) runCommand(cmd *exec.Cmd) (response, errMsg stri if err != nil { impl.logger.Errorw("error in git cli operation", "msg", string(outBytes), "err", err) errMsg = output - if errors.Is(err, context.DeadlineExceeded) { + if errors.Is(gitCtx.Err(), context.DeadlineExceeded) { errMsg = "command timed out" impl.logger.Errorw("command timed out", "cmd", cmd.String()) // prometheus event count for timeout @@ -232,7 +232,7 @@ func (impl *GitManagerBaseImpl) ConfigureSshCommand(gitCtx GitContext, rootDir s coreSshCommand := fmt.Sprintf("ssh -i %s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", sshPrivateKeyPath) cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "config", "core.sshCommand", coreSshCommand) defer cancel() - output, errMsg, err := impl.runCommand(cmd) + output, errMsg, err := impl.runCommand(gitCtx, cmd) impl.logger.Debugw("configure ssh command output ", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err) return output, errMsg, err } @@ -339,7 +339,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsNameOnly(gitCtx GitCo commonLibGitManager.DeleteTlsFiles(tlsPathInfo) }() - output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err) if err != nil || len(errMsg) > 0 { impl.logger.Errorw("error in fetching fileStat diff btw commits: ", "oldHash", oldHash, "newHash", newHash, "checkoutPath", rootDir, "errorMsg", errMsg, "err", err) @@ -363,7 +363,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsWithNumstat(gitCtx Gi impl.logger.Errorw("error encountered in createFilesForTlsData", "err", err) } defer commonLibGitManager.DeleteTlsFiles(tlsPathInfo) - output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err) if err != nil || len(errMsg) > 0 { impl.logger.Errorw("error in fetching fileStat diff btw commits: ", "oldHash", oldHash, "newHash", newHash, "checkoutPath", rootDir, "errorMsg", errMsg, "err", err) @@ -405,6 +405,6 @@ func (impl *GitManagerBaseImpl) ExecuteCustomCommand(gitContext GitContext, name impl.logger.Errorw("error encountered in createFilesForTlsData", "err", err) } defer commonLibGitManager.DeleteTlsFiles(tlsPathInfo) - output, errMsg, err := impl.runCommandWithCred(cmd, gitContext.Username, gitContext.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, gitContext, gitContext.Username, gitContext.Password, tlsPathInfo) return output, errMsg, err } diff --git a/git-sensor/wire_gen.go b/git-sensor/wire_gen.go index 341f4f58b..f2bff30b2 100644 --- a/git-sensor/wire_gen.go +++ b/git-sensor/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject From f87c4569b920d0d87fe56eb692e82e797d6ab164 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Tue, 21 Jan 2025 13:30:55 +0530 Subject: [PATCH 51/70] counter for git fetch timeout --- git-sensor/pkg/git/GitBaseManager.go | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index 021bdfc8b..803425e51 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -112,7 +112,7 @@ func parseCmdTimeoutJson(config *internals.Configuration) (map[string]int, error func (impl *GitManagerBaseImpl) Fetch(gitCtx GitContext, rootDir string) (response, errMsg string, err error) { impl.logger.Debugw("git fetch ", "location", rootDir) - cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "fetch", "origin", "--tags", "--force") + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "fetch", "origin", "--tags", "--force") defer cancel() tlsPathInfo, err := commonLibGitManager.CreateFilesForTlsData(commonLibGitManager.BuildTlsData(gitCtx.TLSKey, gitCtx.TLSCertificate, gitCtx.CACert, gitCtx.TLSVerificationEnabled), TLS_FILES_DIR) if err != nil { @@ -120,22 +120,22 @@ func (impl *GitManagerBaseImpl) Fetch(gitCtx GitContext, rootDir string) (respon impl.logger.Errorw("error encountered in createFilesForTlsData", "err", err) } defer commonLibGitManager.DeleteTlsFiles(tlsPathInfo) - output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, newGitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) if strings.Contains(output, util.LOCK_REF_MESSAGE) { impl.logger.Info("error in fetch, pruning local refs and retrying", "rootDir", rootDir) // running git remote prune origin and retrying fetch. gitHub issue - https://github.com/devtron-labs/devtron/issues/4605 - pruneCmd, pruneCmdCancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "remote", "prune", "origin") - pruneOutput, pruneMsg, pruneErr := impl.runCommandWithCred(pruneCmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) + pruneCmd, newGitCtx, pruneCmdCancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "remote", "prune", "origin") + pruneOutput, pruneMsg, pruneErr := impl.runCommandWithCred(pruneCmd, newGitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) defer pruneCmdCancel() if pruneErr != nil { impl.logger.Errorw("error in pruning local refs that do not exist at remote") return pruneOutput, pruneMsg, pruneErr } - retryFetchCmd, retryFetchCancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "fetch", "origin", "--tags", "--force") + retryFetchCmd, newGitCtx, retryFetchCancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "fetch", "origin", "--tags", "--force") defer retryFetchCancel() - output, errMsg, err = impl.runCommandWithCred(retryFetchCmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err = impl.runCommandWithCred(retryFetchCmd, newGitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) } impl.logger.Debugw("fetch output", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err) return output, errMsg, err @@ -143,9 +143,9 @@ func (impl *GitManagerBaseImpl) Fetch(gitCtx GitContext, rootDir string) (respon func (impl *GitManagerBaseImpl) Checkout(gitCtx GitContext, rootDir, branch string) (response, errMsg string, err error) { impl.logger.Debugw("git checkout ", "location", rootDir) - cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "checkout", branch, "--force") + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "checkout", branch, "--force") defer cancel() - output, errMsg, err := impl.runCommand(gitCtx, cmd) + output, errMsg, err := impl.runCommand(newGitCtx, cmd) impl.logger.Debugw("checkout output", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err) return output, errMsg, err } @@ -160,9 +160,9 @@ func (impl *GitManagerBaseImpl) LogMergeBase(gitCtx GitContext, rootDir, from st } cmdArgs := []string{"-C", rootDir, "log", from + "..." + toCommitHash, "--date=iso-strict", GITFORMAT} impl.logger.Debugw("git", cmdArgs) - cmd, cancel := impl.createCmdWithContext(gitCtx, "git", cmdArgs...) + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitCtx, "git", cmdArgs...) defer cancel() - output, errMsg, err := impl.runCommand(gitCtx, cmd) + output, errMsg, err := impl.runCommand(newGitCtx, cmd) impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err) if err != nil { return nil, err @@ -230,9 +230,9 @@ func (impl *GitManagerBaseImpl) runCommand(gitCtx GitContext, cmd *exec.Cmd) (re func (impl *GitManagerBaseImpl) ConfigureSshCommand(gitCtx GitContext, rootDir string, sshPrivateKeyPath string) (response, errMsg string, err error) { impl.logger.Debugw("configuring ssh command on ", "location", rootDir) coreSshCommand := fmt.Sprintf("ssh -i %s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", sshPrivateKeyPath) - cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "config", "core.sshCommand", coreSshCommand) + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "config", "core.sshCommand", coreSshCommand) defer cancel() - output, errMsg, err := impl.runCommand(gitCtx, cmd) + output, errMsg, err := impl.runCommand(newGitCtx, cmd) impl.logger.Debugw("configure ssh command output ", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err) return output, errMsg, err } @@ -326,7 +326,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsNameOnly(gitCtx GitCo newHash = oldHash oldHash = oldHash + "^" } - cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "diff", "--name-only", oldHash, newHash) + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "diff", "--name-only", oldHash, newHash) tlsPathInfo, err := commonLibGitManager.CreateFilesForTlsData(commonLibGitManager.BuildTlsData(gitCtx.TLSKey, gitCtx.TLSCertificate, gitCtx.CACert, gitCtx.TLSVerificationEnabled), TLS_FILES_DIR) if err != nil { @@ -339,7 +339,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsNameOnly(gitCtx GitCo commonLibGitManager.DeleteTlsFiles(tlsPathInfo) }() - output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, newGitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err) if err != nil || len(errMsg) > 0 { impl.logger.Errorw("error in fetching fileStat diff btw commits: ", "oldHash", oldHash, "newHash", newHash, "checkoutPath", rootDir, "errorMsg", errMsg, "err", err) @@ -355,7 +355,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsWithNumstat(gitCtx Gi newHash = oldHash oldHash = oldHash + "^" } - cmd, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "diff", "--numstat", oldHash, newHash) + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitCtx, "git", "-C", rootDir, "diff", "--numstat", oldHash, newHash) defer cancel() tlsPathInfo, err := commonLibGitManager.CreateFilesForTlsData(commonLibGitManager.BuildTlsData(gitCtx.TLSKey, gitCtx.TLSCertificate, gitCtx.CACert, gitCtx.TLSVerificationEnabled), TLS_FILES_DIR) if err != nil { @@ -363,7 +363,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsWithNumstat(gitCtx Gi impl.logger.Errorw("error encountered in createFilesForTlsData", "err", err) } defer commonLibGitManager.DeleteTlsFiles(tlsPathInfo) - output, errMsg, err := impl.runCommandWithCred(cmd, gitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, newGitCtx, gitCtx.Username, gitCtx.Password, tlsPathInfo) impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err) if err != nil || len(errMsg) > 0 { impl.logger.Errorw("error in fetching fileStat diff btw commits: ", "oldHash", oldHash, "newHash", newHash, "checkoutPath", rootDir, "errorMsg", errMsg, "err", err) @@ -372,7 +372,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommitsWithNumstat(gitCtx Gi return processFileStatOutputWithNumstat(output) } -func (impl *GitManagerBaseImpl) createCmdWithContext(ctx GitContext, name string, arg ...string) (*exec.Cmd, context.CancelFunc) { +func (impl *GitManagerBaseImpl) createCmdWithContext(ctx GitContext, name string, arg ...string) (*exec.Cmd, GitContext, context.CancelFunc) { newCtx := ctx cancel := func() {} @@ -385,7 +385,7 @@ func (impl *GitManagerBaseImpl) createCmdWithContext(ctx GitContext, name string newCtx, cancel = ctx.WithTimeout(timeout) //context.WithTimeout(ctx.Context, timeout*time.Second) } cmd := exec.CommandContext(newCtx, name, arg...) - return cmd, cancel + return cmd, newCtx, cancel } func (impl *GitManagerBaseImpl) getCommandTimeout(command string) int { @@ -397,7 +397,7 @@ func (impl *GitManagerBaseImpl) getCommandTimeout(command string) int { } func (impl *GitManagerBaseImpl) ExecuteCustomCommand(gitContext GitContext, name string, arg ...string) (response, errMsg string, err error) { - cmd, cancel := impl.createCmdWithContext(gitContext, name, arg...) + cmd, newGitCtx, cancel := impl.createCmdWithContext(gitContext, name, arg...) defer cancel() tlsPathInfo, err := commonLibGitManager.CreateFilesForTlsData(commonLibGitManager.BuildTlsData(gitContext.TLSKey, gitContext.TLSCertificate, gitContext.CACert, gitContext.TLSVerificationEnabled), TLS_FILES_DIR) if err != nil { @@ -405,6 +405,6 @@ func (impl *GitManagerBaseImpl) ExecuteCustomCommand(gitContext GitContext, name impl.logger.Errorw("error encountered in createFilesForTlsData", "err", err) } defer commonLibGitManager.DeleteTlsFiles(tlsPathInfo) - output, errMsg, err := impl.runCommandWithCred(cmd, gitContext, gitContext.Username, gitContext.Password, tlsPathInfo) + output, errMsg, err := impl.runCommandWithCred(cmd, newGitCtx, gitContext.Username, gitContext.Password, tlsPathInfo) return output, errMsg, err } From f97c82d324033bda5d5cfb91c154e53a7d8bb953 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Tue, 21 Jan 2025 16:05:06 +0530 Subject: [PATCH 52/70] arg length check --- git-sensor/pkg/git/GitBaseManager.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index 803425e51..d9ffe4b7a 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -378,10 +378,11 @@ func (impl *GitManagerBaseImpl) createCmdWithContext(ctx GitContext, name string //TODO: how to make it generic, currently works because the // git command is placed at index 2 for current implementations - timeout := impl.getCommandTimeout(arg[2]) - + timeout := 0 + if len(arg) > 2 { + timeout = impl.getCommandTimeout(arg[2]) + } if timeout > 0 { - newCtx, cancel = ctx.WithTimeout(timeout) //context.WithTimeout(ctx.Context, timeout*time.Second) } cmd := exec.CommandContext(newCtx, name, arg...) From 59903291c4db4c5e4b11bc24c7e9e380889f7e93 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Tue, 21 Jan 2025 17:15:46 +0530 Subject: [PATCH 53/70] POC for killing zombies --- git-sensor/pkg/git/GitBaseManager.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index d9ffe4b7a..486295786 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -31,6 +31,7 @@ import ( "os/exec" "regexp" "strings" + "syscall" ) type GitManager interface { @@ -196,6 +197,7 @@ func (impl *GitManagerBaseImpl) runCommandWithCred(cmd *exec.Cmd, gitCtx GitCont func (impl *GitManagerBaseImpl) runCommand(gitCtx GitContext, cmd *exec.Cmd) (response, errMsg string, err error) { cmd.Env = append(cmd.Env, "HOME=/dev/null") + cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} outBytes, err := cmd.CombinedOutput() output := string(outBytes) output = strings.TrimSpace(output) @@ -203,6 +205,8 @@ func (impl *GitManagerBaseImpl) runCommand(gitCtx GitContext, cmd *exec.Cmd) (re impl.logger.Errorw("error in git cli operation", "msg", string(outBytes), "err", err) errMsg = output if errors.Is(gitCtx.Err(), context.DeadlineExceeded) { + // kill the process group + syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL) errMsg = "command timed out" impl.logger.Errorw("command timed out", "cmd", cmd.String()) // prometheus event count for timeout From 925caa5991eeb30030bd65e4f1dea9ac5c291520 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 22 Jan 2025 13:39:48 +0530 Subject: [PATCH 54/70] common lib changes --- ci-runner/executor/stage/ciStages.go | 2 +- common-lib/imageScan/bean/executionBean.go | 14 +++++++------- image-scanner/pkg/sql/adaptor/adaptor.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index d15936a2d..58dd9a5c6 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -467,7 +467,7 @@ func (impl *CiStage) runImageScanning(imageScannerExecutor *bean2.ImageScanningE scanToolId := allSteps.ScanToolId tasks := allSteps.Steps //setting scan tool id in script env - scriptEnvs.SystemEnv["SCAN_TOOL_ID"] = strconv.Itoa(scanToolId) + scriptEnvs.SystemEnv[bean2.ScanToolIdGlobalEnvKey] = strconv.Itoa(scanToolId) // run image scanning steps _, _, _, err := impl.stageExecutorManager.RunCiCdSteps(helper.STEP_TYPE_SCANNING, ciCdRequest.CommonWorkflowRequest, tasks, refStageMap, scriptEnvs, nil, true) if err != nil { diff --git a/common-lib/imageScan/bean/executionBean.go b/common-lib/imageScan/bean/executionBean.go index 490345545..d1313aba5 100644 --- a/common-lib/imageScan/bean/executionBean.go +++ b/common-lib/imageScan/bean/executionBean.go @@ -1,16 +1,16 @@ package bean -type ExecutionMedium string +type ScanExecutionMedium string const ( - Rest ExecutionMedium = "rest" - Steps ExecutionMedium = "steps" + InHouse ScanExecutionMedium = "in-house" // this contains all methods of hitting image scanner directly via rest or rpc + External ScanExecutionMedium = "external" // if a scan tool is registered via api and execution is via plugin steps ) -func (e ExecutionMedium) IsExecutionMediumRest() bool { - return e == Rest +func (e ScanExecutionMedium) IsScanExecutionMediumInHouse() bool { + return e == InHouse } -func (e ExecutionMedium) IsExecutionMediumSteps() bool { - return e == Steps +func (e ScanExecutionMedium) IsScanMediumExternal() bool { + return e == External } diff --git a/image-scanner/pkg/sql/adaptor/adaptor.go b/image-scanner/pkg/sql/adaptor/adaptor.go index c671b083a..9e3584488 100644 --- a/image-scanner/pkg/sql/adaptor/adaptor.go +++ b/image-scanner/pkg/sql/adaptor/adaptor.go @@ -37,7 +37,7 @@ func GetScanToolExecutionHistoryMapping(executionHistoryModel *repository.ImageS } func GetResourceScanExecutionResult(executionHistoryId, scanToolId int, scanDataJson string, format repository.ResourceScanFormat) *repository.ResourceScanResult { - resultTypes := make([]int, 0, 4) + var resultTypes []int switch format { case repository.SbomResultSource: resultTypes = []int{repository.Vulnerabilities.ToInt()} From dfb58d8271c5e69839e42632819950f914cc5cb7 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 22 Jan 2025 13:45:04 +0530 Subject: [PATCH 55/70] go mod changes --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 26ad801e4..f7499fd9e 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 8fdbccf63..9370c3fae 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 9a5f0f390..34482a34b 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/ci-runner/go.mod b/ci-runner/go.mod index c84398a4e..88b21462d 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 56c3fea00..e07c5dcb7 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index ebac89fa6..7a6936a5e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/git-sensor/go.mod b/git-sensor/go.mod index b664d6fc3..ce8c54604 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 2c9ba2f44..21d10c9f6 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 092a08caa..1142e2202 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/image-scanner/go.mod b/image-scanner/go.mod index adca47f48..75bd960cb 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 760f31dc8..136170e3b 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 80bc27eb3..5c06b18c6 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/kubelink/go.mod b/kubelink/go.mod index d395799df..edd117b75 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index 5a8f947a5..0aa6ce8b4 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index f2b1035f9..a540f780a 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 45aebce3a..70b2ab196 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 2d07150b4..516490927 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 0a4dde9a2..0e512103a 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/lens/go.mod b/lens/go.mod index 8ad4681b8..366532b37 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e diff --git a/lens/go.sum b/lens/go.sum index 5274d28c9..e6c478a1c 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 h1:6p7l19ZKwta1URA+CGQmFtAUDgMh1mQVyPLGTOa42u0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index bb1d90fbe..7f2413bbf 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141215-331e71edf958 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e From 92c9e408e16f45a43f5e40309fc7799f2b852cb9 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 22 Jan 2025 14:13:51 +0530 Subject: [PATCH 56/70] go mod --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/helper/EventHelper.go | 2 +- .../common-lib/imageScan/bean/executionBean.go | 14 +++++++------- ci-runner/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../common-lib/imageScan/bean/executionBean.go | 14 +++++++------- image-scanner/vendor/modules.txt | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 88b21462d..94e8a3e82 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index e07c5dcb7..9c7b8979a 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 h1:d31D/MSOFaa1PYJ9Ciq+VIBRuaWk8kvxptrEdx9M74E= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index bef00d0ba..5e6fe5574 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -191,7 +191,7 @@ type CommonWorkflowRequest struct { UseDockerApiToGetDigest bool `json:"useDockerApiToGetDigest"` HostUrl string `json:"hostUrl"` ImageScanningSteps []*ImageScanningSteps `json:"imageScanningSteps,omitempty"` - ExecuteImageScanningVia bean2.ExecutionMedium `json:"executeImageScanningVia,omitempty"` + ExecuteImageScanningVia bean2.ScanExecutionMedium `json:"executeImageScanningVia,omitempty"` AwsInspectorConfig string `json:"awsInspectorConfig,omitempty"` } diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go index 490345545..d1313aba5 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go @@ -1,16 +1,16 @@ package bean -type ExecutionMedium string +type ScanExecutionMedium string const ( - Rest ExecutionMedium = "rest" - Steps ExecutionMedium = "steps" + InHouse ScanExecutionMedium = "in-house" // this contains all methods of hitting image scanner directly via rest or rpc + External ScanExecutionMedium = "external" // if a scan tool is registered via api and execution is via plugin steps ) -func (e ExecutionMedium) IsExecutionMediumRest() bool { - return e == Rest +func (e ScanExecutionMedium) IsScanExecutionMediumInHouse() bool { + return e == InHouse } -func (e ExecutionMedium) IsExecutionMediumSteps() bool { - return e == Steps +func (e ScanExecutionMedium) IsScanMediumExternal() bool { + return e == External } diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 7a6936a5e..1e4611630 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 75bd960cb..0bacfd0ed 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 136170e3b..5ccb4d514 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 h1:d31D/MSOFaa1PYJ9Ciq+VIBRuaWk8kvxptrEdx9M74E= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go index 490345545..d1313aba5 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go @@ -1,16 +1,16 @@ package bean -type ExecutionMedium string +type ScanExecutionMedium string const ( - Rest ExecutionMedium = "rest" - Steps ExecutionMedium = "steps" + InHouse ScanExecutionMedium = "in-house" // this contains all methods of hitting image scanner directly via rest or rpc + External ScanExecutionMedium = "external" // if a scan tool is registered via api and execution is via plugin steps ) -func (e ExecutionMedium) IsExecutionMediumRest() bool { - return e == Rest +func (e ScanExecutionMedium) IsScanExecutionMediumInHouse() bool { + return e == InHouse } -func (e ExecutionMedium) IsExecutionMediumSteps() bool { - return e == Steps +func (e ScanExecutionMedium) IsScanMediumExternal() bool { + return e == External } diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 5c06b18c6..26e467106 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 From e8cfac1153e98c0627ba564031e47b06b45757c5 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 22 Jan 2025 14:28:24 +0530 Subject: [PATCH 57/70] IsExecutionMediumSteps -> IsScanMediumExternal --- ci-runner/executor/stage/ciStages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 58dd9a5c6..d5ab32383 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -483,7 +483,7 @@ func (impl *CiStage) runImageScanning(imageScannerExecutor *bean2.ImageScanningE log.Println("Image scanning completed") return nil } - if ciCdRequest.CommonWorkflowRequest.ExecuteImageScanningVia.IsExecutionMediumSteps() { + if ciCdRequest.CommonWorkflowRequest.ExecuteImageScanningVia.IsScanMediumExternal() { return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningTaskExecution) } return util.ExecuteWithStageInfoLog(util.IMAGE_SCAN, imageScanningStage) From 0379ab9f35be7bdb4725c41d6f6d573f90fc7ccc Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 22 Jan 2025 15:40:20 +0530 Subject: [PATCH 58/70] move common logic for target platform --- common-lib/utils/CommonUtils.go | 19 +++++++++++++++++++ common-lib/utils/bean/bean.go | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/common-lib/utils/CommonUtils.go b/common-lib/utils/CommonUtils.go index aaebee868..ee88c1da0 100644 --- a/common-lib/utils/CommonUtils.go +++ b/common-lib/utils/CommonUtils.go @@ -152,3 +152,22 @@ var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func GetTargetPlatformObjectFromString(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := GetTargetPlatformListFromString(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func GetTargetPlatformListFromString(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func GetTargetPlatformStringFromList(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/common-lib/utils/bean/bean.go b/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/common-lib/utils/bean/bean.go +++ b/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} From ae49de348368c100be1c352e22a8b6fae71a142f Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 22 Jan 2025 15:42:48 +0530 Subject: [PATCH 59/70] func renaming --- common-lib/utils/CommonUtils.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common-lib/utils/CommonUtils.go b/common-lib/utils/CommonUtils.go index ee88c1da0..3d5e98288 100644 --- a/common-lib/utils/CommonUtils.go +++ b/common-lib/utils/CommonUtils.go @@ -153,8 +153,8 @@ var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Help: "Duration of PG queries", }, []string{"status", "serviceName"}) -func GetTargetPlatformObjectFromString(targetPlatformString string) []*bean.TargetPlatform { - targetPlatforms := GetTargetPlatformListFromString(targetPlatformString) +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) targetPlatformObject := []*bean.TargetPlatform{} for _, targetPlatform := range targetPlatforms { if len(targetPlatform) > 0 { @@ -164,10 +164,10 @@ func GetTargetPlatformObjectFromString(targetPlatformString string) []*bean.Targ return targetPlatformObject } -func GetTargetPlatformListFromString(targetPlatform string) []string { +func ConvertTargetPlatformStringToList(targetPlatform string) []string { return strings.Split(targetPlatform, ",") } -func GetTargetPlatformStringFromList(targetPlatforms []string) string { +func ConvertTargetPlatformListToString(targetPlatforms []string) string { return strings.Join(targetPlatforms, ",") } From 47de00200a94f7d0932552e77676847055ba9210 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 22 Jan 2025 15:48:55 +0530 Subject: [PATCH 60/70] revert kill zombie --- git-sensor/pkg/git/GitBaseManager.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/git-sensor/pkg/git/GitBaseManager.go b/git-sensor/pkg/git/GitBaseManager.go index 486295786..d9ffe4b7a 100644 --- a/git-sensor/pkg/git/GitBaseManager.go +++ b/git-sensor/pkg/git/GitBaseManager.go @@ -31,7 +31,6 @@ import ( "os/exec" "regexp" "strings" - "syscall" ) type GitManager interface { @@ -197,7 +196,6 @@ func (impl *GitManagerBaseImpl) runCommandWithCred(cmd *exec.Cmd, gitCtx GitCont func (impl *GitManagerBaseImpl) runCommand(gitCtx GitContext, cmd *exec.Cmd) (response, errMsg string, err error) { cmd.Env = append(cmd.Env, "HOME=/dev/null") - cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} outBytes, err := cmd.CombinedOutput() output := string(outBytes) output = strings.TrimSpace(output) @@ -205,8 +203,6 @@ func (impl *GitManagerBaseImpl) runCommand(gitCtx GitContext, cmd *exec.Cmd) (re impl.logger.Errorw("error in git cli operation", "msg", string(outBytes), "err", err) errMsg = output if errors.Is(gitCtx.Err(), context.DeadlineExceeded) { - // kill the process group - syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL) errMsg = "command timed out" impl.logger.Errorw("command timed out", "cmd", cmd.String()) // prometheus event count for timeout From e7d7af31e081870ef4d94f0333e3e1659f16e786 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 22 Jan 2025 15:54:31 +0530 Subject: [PATCH 61/70] use common lib functions --- ci-runner/executor/stage/adapter/adapter.go | 19 ------------------- ci-runner/executor/stage/bean/bean.go | 8 +++----- ci-runner/executor/stage/ciStages.go | 3 +-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/helper/DockerHelper.go | 5 ++--- .../common-lib/utils/CommonUtils.go | 19 +++++++++++++++++++ .../common-lib/utils/bean/bean.go | 4 ++++ ci-runner/vendor/modules.txt | 4 ++-- 9 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 ci-runner/executor/stage/adapter/adapter.go diff --git a/ci-runner/executor/stage/adapter/adapter.go b/ci-runner/executor/stage/adapter/adapter.go deleted file mode 100644 index ad475189e..000000000 --- a/ci-runner/executor/stage/adapter/adapter.go +++ /dev/null @@ -1,19 +0,0 @@ -package adapter - -import ( - "github.com/devtron-labs/ci-runner/executor/stage/bean" - "strings" -) - -func GetTargetPlatformObjectForList(targetPlatform string) []bean.TargetPlatform { - targetPlatforms := GetTargetPlatformListFromString(targetPlatform) - var targetPlatformObject []bean.TargetPlatform - for _, targetPlatform := range targetPlatforms { - targetPlatformObject = append(targetPlatformObject, bean.TargetPlatform{Name: targetPlatform}) - } - return targetPlatformObject -} - -func GetTargetPlatformListFromString(targetPlatform string) []string { - return strings.Split(targetPlatform, ",") -} diff --git a/ci-runner/executor/stage/bean/bean.go b/ci-runner/executor/stage/bean/bean.go index db8178655..ffcaa6221 100644 --- a/ci-runner/executor/stage/bean/bean.go +++ b/ci-runner/executor/stage/bean/bean.go @@ -16,6 +16,8 @@ package bean +import "github.com/devtron-labs/common-lib/utils/bean" + const ( ExternalCiArtifact = "externalCiArtifact" ImageDigest = "imageDigest" @@ -24,9 +26,5 @@ const ( ) type DockerBuildStageMetadata struct { - TargetPlatforms []TargetPlatform `json:"targetPlatforms"` -} - -type TargetPlatform struct { - Name string `json:"name"` + TargetPlatforms []*bean.TargetPlatform `json:"targetPlatforms"` } diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index d44fa7bdd..b4c8fbc48 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -24,7 +24,6 @@ import ( "github.com/devtron-labs/ci-runner/executor" adaptor2 "github.com/devtron-labs/ci-runner/executor/adaptor" cicxt "github.com/devtron-labs/ci-runner/executor/context" - "github.com/devtron-labs/ci-runner/executor/stage/adapter" bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" @@ -668,6 +667,6 @@ func GetTargetPlatformFromCiBuildConfig(ciBuildConfig *helper.CiBuildConfigBean) } else if ciBuildConfig.DockerBuildConfig == nil { return []string{} } else { - return adapter.GetTargetPlatformListFromString(ciBuildConfig.DockerBuildConfig.TargetPlatform) + return utils.ConvertTargetPlatformStringToList(ciBuildConfig.DockerBuildConfig.TargetPlatform) } } diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 41bb9b0ca..47591adac 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 2ef26729e..2a31d8634 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 h1:Yp/e2ZgveecA7+LhKZW1LMYGmqSLiKKSjIwyuqAbs3E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 h1:LIE9o6PoFgfSNnhVkS3ksb7KhC8haFLA2iUV0+Q5lDQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 309d7ce5a..31a8eb6bb 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -30,7 +30,6 @@ import ( "github.com/aws/aws-sdk-go/service/ecr" "github.com/caarlos0/env" cicxt "github.com/devtron-labs/ci-runner/executor/context" - "github.com/devtron-labs/ci-runner/executor/stage/adapter" bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" "github.com/devtron-labs/ci-runner/util" "github.com/devtron-labs/common-lib/utils" @@ -405,7 +404,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s return nil } - if err = util.ExecuteWithStageInfoLogWithMetadata(util.DOCKER_BUILD, bean2.DockerBuildStageMetadata{TargetPlatforms: adapter.GetTargetPlatformObjectForList(ciBuildConfig.DockerBuildConfig.TargetPlatform)}, buildImageStage); err != nil { + if err = util.ExecuteWithStageInfoLogWithMetadata(util.DOCKER_BUILD, bean2.DockerBuildStageMetadata{TargetPlatforms: utils.ConvertTargetPlatformStringToObject(ciBuildConfig.DockerBuildConfig.TargetPlatform)}, buildImageStage); err != nil { return "", nil } @@ -559,7 +558,7 @@ func getExportCacheCmds(targetPlatforms, dockerBuild, localCachePath string, use } cacheCmd := "%s --platform=%s --cache-to=type=local,dest=%s,mode=" + cacheMode - platforms := adapter.GetTargetPlatformListFromString(targetPlatforms) + platforms := utils.ConvertTargetPlatformStringToList(targetPlatforms) exportCacheCmds := make(map[string]string) for _, platform := range platforms { diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..3d5e98288 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -152,3 +152,22 @@ var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index aa58e88ca..1b715932e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113035729-92b06d9ec587 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 From 4d939279c70af21cee54575afa4dd71eabec13ba Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 22 Jan 2025 16:30:43 +0530 Subject: [PATCH 62/70] develop sync hash update --- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- .../github.com/devtron-labs/common-lib/utils/CommonUtils.go | 1 - ci-runner/vendor/modules.txt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 47591adac..ef1042547 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122105919-b869ca3870fd require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 2a31d8634..cbaef263c 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 h1:LIE9o6PoFgfSNnhVkS3ksb7KhC8haFLA2iUV0+Q5lDQ= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122105919-b869ca3870fd h1:FMNCRCl/WTsiHylGF0FBPhhMWaIDn5RdKNMCYMP53Es= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122105919-b869ca3870fd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index 3d5e98288..8fbb25981 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,7 +147,6 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 1b715932e..6d3f81940 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122105919-b869ca3870fd ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122101248-ae49de348368 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122105919-b869ca3870fd From 066a6172c073e8481e497b89a189306ec6fe3331 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 23 Jan 2025 05:11:18 +0530 Subject: [PATCH 63/70] annotations removed from buildx command --- ci-runner/helper/DockerHelper.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index b7c0b4f84..a81fc2433 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -1065,32 +1065,35 @@ func getBuildXDriverOptionsWithImage(buildxDriverImage, driverOptions string) st } func getBuildXDriverOptionsWithLabelsAndAnnotations(driverOptions string) (string, error) { + // not passing annotation as of now because --driver-opt=annotations is not supported by buildx if contains quotes labels := make(map[string]string) - annotations := make(map[string]string) - // Read labels and annotations from files + // Read labels from file labelsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_LABELS labelsOut, err := readFileAndLogErrors(labelsPath) if err != nil { return "", err } - annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS - annotationsOut, err := readFileAndLogErrors(annotationsPath) - if err != nil { - return "", err - } - // Parse labels and annotations + // Parse labels if len(labelsOut) > 0 { labels = parseKeyValuePairs(string(labelsOut)) } - if len(annotationsOut) > 0 { - annotations = parseKeyValuePairs(string(annotationsOut)) - } // Combine driver options driverOptions = getBuildXDriverOptions(utils.POD_LABELS, labels, driverOptions) - driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) + + //annotations := make(map[string]string) + //annotationsPath := utils.DEVTRON_SELF_DOWNWARD_API_VOLUME_PATH + "/" + utils.POD_ANNOTATIONS + //annotationsOut, err := readFileAndLogErrors(annotationsPath) + //if err != nil { + // return "", err + //} + //if len(annotationsOut) > 0 { + // annotations = parseKeyValuePairs(string(annotationsOut)) + //} + //driverOptions = getBuildXDriverOptions(utils.POD_ANNOTATIONS, annotations, driverOptions) + return driverOptions, nil } From a77d6124c15d0792670c5a24023c16669cbec3d4 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Thu, 23 Jan 2025 22:49:06 +0530 Subject: [PATCH 64/70] flag --- ci-runner/helper/DockerHelper.go | 16 +++++++++------- ci-runner/helper/EventHelper.go | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index a81fc2433..e5f440c15 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -344,7 +344,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } useBuildxK8sDriver, eligibleK8sDriverNodes = dockerBuildConfig.CheckForBuildXK8sDriver() if useBuildxK8sDriver { - err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) + err = impl.createBuildxBuilderWithK8sDriver(ciContext, ciRequest, ciRequest.DockerConnection, dockerBuildConfig.BuildxDriverImage, eligibleK8sDriverNodes, ciRequest.PipelineId, ciRequest.WorkflowId) if err != nil { log.Println(util.DEVTRON, " error in creating buildxDriver , err : ", err.Error()) return err @@ -938,14 +938,14 @@ func (impl *DockerHelperImpl) createBuildxBuilderForMultiArchBuild(ciContext cic return nil } -func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { +func (impl *DockerHelperImpl) createBuildxBuilderWithK8sDriver(ciContext cicxt.CiContext, ciRequest *CommonWorkflowRequest, dockerConnection, buildxDriverImage string, builderNodes []map[string]string, ciPipelineId, ciWorkflowId int) error { if len(builderNodes) == 0 { return errors.New("atleast one node is expected for builder with kubernetes driver") } deploymentNames := make([]string, 0) for i := 0; i < len(builderNodes); i++ { nodeOpts := builderNodes[i] - builderCmd, deploymentName, err := getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) + builderCmd, deploymentName, err := getBuildxK8sDriverCmd(ciRequest, dockerConnection, buildxDriverImage, nodeOpts, ciPipelineId, ciWorkflowId) if err != nil { return err } @@ -1020,7 +1020,7 @@ func (impl *DockerHelperImpl) runCmd(cmd string) (error, *bytes.Buffer) { return err, errBuf } -func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string, error) { +func getBuildxK8sDriverCmd(ciRequest *CommonWorkflowRequest, dockerConnection, buildxDriverImage string, driverOpts map[string]string, ciPipelineId, ciWorkflowId int) (string, string, error) { buildxCreate := "docker buildx create --buildkitd-flags '--allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure' --name=%s --driver=kubernetes --node=%s --bootstrap " nodeName := driverOpts["node"] if nodeName == "" { @@ -1034,9 +1034,11 @@ func getBuildxK8sDriverCmd(dockerConnection, buildxDriverImage string, driverOpt } // add driver options for app labels and annotations var err error - driverOpts["driverOptions"], err = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) - if err != nil { - return "", "", err + if ciRequest.PropagateLabelsInBuildxPod { + driverOpts["driverOptions"], err = getBuildXDriverOptionsWithLabelsAndAnnotations(driverOpts["driverOptions"]) + if err != nil { + return "", "", err + } } driverOpts["driverOptions"] = getBuildXDriverOptionsWithImage(buildxDriverImage, driverOpts["driverOptions"]) diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 06c8ebfea..87595335b 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -162,6 +162,7 @@ type CommonWorkflowRequest struct { ImageScanRetryDelay int `json:"imageScanRetryDelay,omitempty"` ShouldPullDigest bool `json:"shouldPullDigest,omitempty"` EnableSecretMasking bool `json:"enableSecretMasking"` + PropagateLabelsInBuildxPod bool `json:"propagateLabelsInBuildxPod"` // Data from CD Workflow service WorkflowRunnerId int `json:"workflowRunnerId"` CdPipelineId int `json:"cdPipelineId"` From 608d2510011dae551efb4f87450a28c3b46bae90 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Fri, 24 Jan 2025 16:25:08 +0530 Subject: [PATCH 65/70] merge develop --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- .../common-lib/utils/CommonUtils.go | 20 ++++++++++++++++++- .../common-lib/utils/bean/bean.go | 4 ++++ chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- .../common-lib/utils/CommonUtils.go | 20 ++++++++++++++++++- .../common-lib/utils/bean/bean.go | 4 ++++ git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../common-lib/utils/CommonUtils.go | 20 ++++++++++++++++++- .../common-lib/utils/bean/bean.go | 4 ++++ image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- .../common-lib/utils/CommonUtils.go | 20 ++++++++++++++++++- .../common-lib/utils/bean/bean.go | 4 ++++ kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- .../common-lib/utils/CommonUtils.go | 20 ++++++++++++++++++- .../common-lib/utils/bean/bean.go | 4 ++++ kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- .../common-lib/utils/CommonUtils.go | 20 ++++++++++++++++++- .../common-lib/utils/bean/bean.go | 4 ++++ lens/vendor/modules.txt | 4 ++-- 33 files changed, 173 insertions(+), 41 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index f7499fd9e..d2fc4f16c 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 9370c3fae..26c5fee40 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..8fbb25981 100644 --- a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,8 +147,26 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/chart-sync/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 34482a34b..19127c46f 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 94e8a3e82..965e94206 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 9c7b8979a..5e73b6167 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 h1:d31D/MSOFaa1PYJ9Ciq+VIBRuaWk8kvxptrEdx9M74E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 1e4611630..fdb6bf22e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index ce8c54604..0d621d6dd 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 21d10c9f6..8dae68759 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..8fbb25981 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,8 +147,26 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 1142e2202..f8bea8873 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 0bacfd0ed..f1372e576 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 5ccb4d514..1665e798f 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 h1:d31D/MSOFaa1PYJ9Ciq+VIBRuaWk8kvxptrEdx9M74E= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..8fbb25981 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,8 +147,26 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 26e467106..4c4d7c2bd 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122081504-dfb58d8271c5 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/kubelink/go.mod b/kubelink/go.mod index edd117b75..43f86c709 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index 0aa6ce8b4..d91879ca7 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..8fbb25981 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,8 +147,26 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index a540f780a..f167b2562 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 70b2ab196..06bfbc959 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 516490927..85a1bd1d2 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..8fbb25981 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,8 +147,26 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 0e512103a..06b0ed124 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/lens/go.mod b/lens/go.mod index 366532b37..dca670c4e 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 diff --git a/lens/go.sum b/lens/go.sum index e6c478a1c..a66012cce 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go index aaebee868..8fbb25981 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go @@ -147,8 +147,26 @@ func GetSelfK8sPodName() string { return os.Getenv(DEVTRON_SELF_POD_NAME) } -// TODO: how to separate this service-wise ? var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ Name: "pg_query_duration_seconds", Help: "Duration of PG queries", }, []string{"status", "serviceName"}) + +func ConvertTargetPlatformStringToObject(targetPlatformString string) []*bean.TargetPlatform { + targetPlatforms := ConvertTargetPlatformStringToList(targetPlatformString) + targetPlatformObject := []*bean.TargetPlatform{} + for _, targetPlatform := range targetPlatforms { + if len(targetPlatform) > 0 { + targetPlatformObject = append(targetPlatformObject, &bean.TargetPlatform{Name: targetPlatform}) + } + } + return targetPlatformObject +} + +func ConvertTargetPlatformStringToList(targetPlatform string) []string { + return strings.Split(targetPlatform, ",") +} + +func ConvertTargetPlatformListToString(targetPlatforms []string) string { + return strings.Join(targetPlatforms, ",") +} diff --git a/lens/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go b/lens/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go index 56d485090..50b122e49 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go @@ -84,3 +84,7 @@ type PgQueryEvent struct { Error error Query string } + +type TargetPlatform struct { + Name string `json:"name"` +} diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 7f2413bbf..4f2a0c4f9 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 From 5242f640f4e78df0bb3ebc64e86245dbb08a40b9 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Fri, 24 Jan 2025 16:38:06 +0530 Subject: [PATCH 66/70] fixes --- ci-runner/executor/stage/bean/bean.go | 5 ----- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/helper/DockerHelper.go | 3 ++- ci-runner/helper/bean/bean.go | 7 +++++++ ci-runner/vendor/modules.txt | 4 ++-- 6 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 ci-runner/helper/bean/bean.go diff --git a/ci-runner/executor/stage/bean/bean.go b/ci-runner/executor/stage/bean/bean.go index adeb41309..203011d6d 100644 --- a/ci-runner/executor/stage/bean/bean.go +++ b/ci-runner/executor/stage/bean/bean.go @@ -19,7 +19,6 @@ package bean import ( util2 "github.com/devtron-labs/ci-runner/executor/util" "github.com/devtron-labs/ci-runner/helper" - "github.com/devtron-labs/common-lib/utils/bean" ) const ( @@ -42,7 +41,3 @@ type ImageScanningExecutorBean struct { Dest string Digest string } - -type DockerBuildStageMetadata struct { - TargetPlatforms []*bean.TargetPlatform `json:"targetPlatforms"` -} diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 965e94206..1f0f31d66 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 5e73b6167..12ea0d2f0 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d h1:NTd6tLKYyn23LOezcaMEAs+Wjv7ToZWlp7kUiw8AoQY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 31a8eb6bb..59a05e7e1 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -30,7 +30,8 @@ import ( "github.com/aws/aws-sdk-go/service/ecr" "github.com/caarlos0/env" cicxt "github.com/devtron-labs/ci-runner/executor/context" - bean2 "github.com/devtron-labs/ci-runner/executor/stage/bean" + bean2 "github.com/devtron-labs/ci-runner/helper/bean" + "github.com/devtron-labs/ci-runner/util" "github.com/devtron-labs/common-lib/utils" "github.com/devtron-labs/common-lib/utils/bean" diff --git a/ci-runner/helper/bean/bean.go b/ci-runner/helper/bean/bean.go new file mode 100644 index 000000000..060d7307d --- /dev/null +++ b/ci-runner/helper/bean/bean.go @@ -0,0 +1,7 @@ +package bean + +import "github.com/devtron-labs/common-lib/utils/bean" + +type DockerBuildStageMetadata struct { + TargetPlatforms []*bean.TargetPlatform `json:"targetPlatforms"` +} diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index fdb6bf22e..f0546f26b 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d From ae27cdeb93490d81adcc5359c44b8df0e7c17e10 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Fri, 24 Jan 2025 16:40:30 +0530 Subject: [PATCH 67/70] go mod update --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index d2fc4f16c..e43b3c293 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 26c5fee40..b5250dcf8 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 19127c46f..d107e8d46 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 1f0f31d66..43eb539c6 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 12ea0d2f0..19346ebf7 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d h1:NTd6tLKYyn23LOezcaMEAs+Wjv7ToZWlp7kUiw8AoQY= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index f0546f26b..32ea31383 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124105508-608d2510011d +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 0d621d6dd..e674706eb 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index 8dae68759..dd9f884f2 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index f8bea8873..4832bdbdc 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index f1372e576..cde7d810e 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 1665e798f..29bbf448c 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 4c4d7c2bd..eefbc9dd4 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/kubelink/go.mod b/kubelink/go.mod index 43f86c709..31f48b1d0 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index d91879ca7..e4e280e9a 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index f167b2562..8837e9072 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 06bfbc959..b27922f09 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 85a1bd1d2..f15340b9b 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 06b0ed124..67a92650a 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/lens/go.mod b/lens/go.mod index dca670c4e..381a3a729 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 diff --git a/lens/go.sum b/lens/go.sum index a66012cce..5d795ed5c 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 h1:Ubc23LehLRGKlfv0pC0HuLGrAgJ0m3viNVDfsmWe4Sk= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 4f2a0c4f9..e9b039f3e 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124104205-f3e4aeae5222 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 From 7dfda79a8c7c1483596adf72955fa7c969cbee64 Mon Sep 17 00:00:00 2001 From: Rajeev Date: Mon, 27 Jan 2025 13:16:28 +0530 Subject: [PATCH 68/70] executed make with feat branch --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index e43b3c293..546c03ea5 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index b5250dcf8..17edd94f5 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index d107e8d46..5ba93f7c3 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry @@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 43eb539c6..daa2a6d80 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 19346ebf7..b8f18ec3d 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 32ea31383..27555820e 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/git-sensor/go.mod b/git-sensor/go.mod index e674706eb..2d10405de 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index dd9f884f2..c46451006 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 4832bdbdc..f51c774b6 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -481,4 +481,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/image-scanner/go.mod b/image-scanner/go.mod index cde7d810e..02b7bd9ac 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 29bbf448c..b32897f1d 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index eefbc9dd4..d9ffec318 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -439,4 +439,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/kubelink/go.mod b/kubelink/go.mod index 31f48b1d0..3f97b42b0 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index e4e280e9a..f392f0063 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 8837e9072..ceefba27e 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index b27922f09..5699ae84e 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/kubewatch/go.sum b/kubewatch/go.sum index f15340b9b..a45e18ad3 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 67a92650a..e3ecf42c7 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/lens/go.mod b/lens/go.mod index 381a3a729..d75e7e164 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd diff --git a/lens/go.sum b/lens/go.sum index 5d795ed5c..666f294ed 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 h1:kXWh+Wtf8oLeWlZTMUxANjdI2GK4GXotqoXAneFWYLg= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index e9b039f3e..9ebbfe386 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -288,4 +288,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250124110806-5242f640f4e7 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd From cf0aa81b51ea1e3c04aeccb03232ae0768ab739e Mon Sep 17 00:00:00 2001 From: kartik-579 Date: Mon, 27 Jan 2025 16:07:07 +0530 Subject: [PATCH 69/70] updated common lib hash --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 5 +++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 5 +++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 5 +++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 5 +++-- image-scanner/wire_gen.go | 2 +- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 5 +++-- kubelink/wire_gen.go | 2 +- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 5 +++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 5 +++-- 23 files changed, 44 insertions(+), 37 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 546c03ea5..fdcd19d43 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 17edd94f5..fb329b6b4 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 5ba93f7c3..5e3b481c9 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,8 +93,9 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry github.com/devtron-labs/common-lib/utils @@ -789,4 +790,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/ci-runner/go.mod b/ci-runner/go.mod index daa2a6d80..2084a34d0 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index b8f18ec3d..6f63edb1f 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 27555820e..8cea9b005 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,10 +118,11 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/imageScan/bean @@ -860,4 +861,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 2d10405de..dd3fbf033 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index c46451006..b017934bf 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index f51c774b6..7f7902741 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,9 +62,10 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/middlewares @@ -481,4 +482,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 02b7bd9ac..5e1b5b914 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/image-scanner/go.sum b/image-scanner/go.sum index b32897f1d..728401d0e 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index d9ffec318..cee9e17af 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,9 +72,10 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/imageScan/bean @@ -439,4 +440,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/image-scanner/wire_gen.go b/image-scanner/wire_gen.go index b668a2a40..d3a947ce0 100644 --- a/image-scanner/wire_gen.go +++ b/image-scanner/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/kubelink/go.mod b/kubelink/go.mod index 3f97b42b0..48e1c5275 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index f392f0063..5efadde29 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index ceefba27e..221c8b7d4 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,10 +127,11 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/helmLib/registry github.com/devtron-labs/common-lib/middlewares @@ -1353,7 +1354,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubelink/wire_gen.go b/kubelink/wire_gen.go index c8075adb9..2ded63c44 100644 --- a/kubelink/wire_gen.go +++ b/kubelink/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 5699ae84e..ca5e4579b 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/kubewatch/go.sum b/kubewatch/go.sum index a45e18ad3..0436f6be8 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index e3ecf42c7..3682c833c 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,9 +211,10 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/monitoring github.com/devtron-labs/common-lib/monitoring/pprof @@ -1753,4 +1754,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/lens/go.mod b/lens/go.mod index d75e7e164..2425b4537 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 diff --git a/lens/go.sum b/lens/go.sum index 666f294ed..b3db4994c 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd h1:Mq9sBScfBWU4FWnfihutOXQbvy3t63tViYN9DVrPExw= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 9ebbfe386..894833194 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,9 +7,10 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants +github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager/util github.com/devtron-labs/common-lib/pubsub-lib github.com/devtron-labs/common-lib/pubsub-lib/metrics @@ -288,4 +289,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127074233-945aa5b576dd +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 From 92a0c7dcdd22396e9827dfd2c27ef1d18ad901cd Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Mon, 27 Jan 2025 18:04:53 +0530 Subject: [PATCH 70/70] vendor update --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- lens/vendor/modules.txt | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index fdcd19d43..c5a766737 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index fb329b6b4..cda7489c3 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 5e3b481c9..89461210e 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/fetchAllEnv github.com/devtron-labs/common-lib/git-manager/util @@ -790,4 +790,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 2084a34d0..b70c95156 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 6f63edb1f..58c9b3dc2 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 8cea9b005..463aa22ef 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -861,4 +861,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/git-sensor/go.mod b/git-sensor/go.mod index dd3fbf033..79b6284c5 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index b017934bf..c25cf547b 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 7f7902741..81623963f 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/fetchAllEnv @@ -482,4 +482,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 5e1b5b914..e3758cffa 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.2 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 728401d0e..3765fe5b8 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index cee9e17af..154af5072 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2 github.com/coreos/clair/api/v3/clairpb github.com/coreos/clair/database github.com/coreos/clair/ext/versionfmt -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/fetchAllEnv @@ -440,4 +440,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/kubelink/go.mod b/kubelink/go.mod index 48e1c5275..4024d8316 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index 5efadde29..c959a860e 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 221c8b7d4..e4e907c89 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1354,7 +1354,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index ca5e4579b..1d248f39e 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 0436f6be8..4fb4348ff 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 3682c833c..b3e9e2190 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/fetchAllEnv @@ -1754,4 +1754,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/lens/go.mod b/lens/go.mod index 2425b4537..4b7a86b5e 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f diff --git a/lens/go.sum b/lens/go.sum index b3db4994c..e78edac3b 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 h1:EPMILz/Lk4oK/gTJWiOL5a7jFAiuiokeFFc/T7qeQ/o= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f h1:4wUbt+83DmpZFqYS69CJxNtBpSuCb58UwqOrWsZG82s= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA= 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/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 894833194..6417e4a1b 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/fetchAllEnv @@ -289,4 +289,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.2 ## explicit; go 1.20 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127103321-97c55f5baa57 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250127104410-85d6bfe0b45f