Skip to content

Commit 533ed2d

Browse files
Ash-expAsh-exp
authored
Merge pull request #192 from devtron-labs/fix-material-fetch-err-handling
fix: error handling for git material
2 parents 7628711 + d0bade8 commit 533ed2d

File tree

25 files changed

+75
-113
lines changed

25 files changed

+75
-113
lines changed

‎chart-sync/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.4
55
toolchain go1.22.6
66

77
replace (
8-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
8+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
99
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
1010
)
1111

‎chart-sync/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
5454
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5555
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
5656
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
57-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13 h1:oL8v0vMVzRouQAUDx+LlhfDgy8K1PbGKV8L4yOqyvGI=
58-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
57+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195 h1:vqXs6O6QP90QnBI2U4W+yYvyjckby17xIYzexdPoQI4=
58+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
5959
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
6060
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
6161
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=

‎chart-sync/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ github.com/containerd/platforms
9393
# github.com/davecgh/go-spew v1.1.1
9494
## explicit
9595
github.com/davecgh/go-spew/spew
96-
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
96+
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
9797
## explicit; go 1.21
9898
github.com/devtron-labs/common-lib/fetchAllEnv
9999
github.com/devtron-labs/common-lib/git-manager/util
@@ -790,4 +790,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
790790
# sigs.k8s.io/yaml v1.3.0
791791
## explicit; go 1.12
792792
sigs.k8s.io/yaml
793-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
793+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195

‎ci-runner/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
toolchain go1.21.8
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
88

99
require (
1010
github.com/Knetic/govaluate v3.0.0+incompatible

‎ci-runner/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
5757
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5858
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
5959
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
60-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13 h1:oL8v0vMVzRouQAUDx+LlhfDgy8K1PbGKV8L4yOqyvGI=
61-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
60+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195 h1:vqXs6O6QP90QnBI2U4W+yYvyjckby17xIYzexdPoQI4=
61+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
6262
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
6363
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
6464
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

‎ci-runner/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2
118118
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
119119
## explicit
120120
github.com/davecgh/go-spew/spew
121-
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
121+
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
122122
## explicit; go 1.21
123123
github.com/devtron-labs/common-lib/blob-storage
124124
github.com/devtron-labs/common-lib/constants
@@ -861,4 +861,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
861861
# sigs.k8s.io/yaml v1.3.0
862862
## explicit; go 1.12
863863
sigs.k8s.io/yaml
864-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
864+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195

‎git-sensor/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
toolchain go1.22.4
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
88

99
require (
1010
github.com/caarlos0/env v3.5.0+incompatible

‎git-sensor/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL
2727
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2828
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2929
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
30-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13 h1:oL8v0vMVzRouQAUDx+LlhfDgy8K1PbGKV8L4yOqyvGI=
31-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
30+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195 h1:vqXs6O6QP90QnBI2U4W+yYvyjckby17xIYzexdPoQI4=
31+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
3232
github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ=
3333
github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk=
3434
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

‎git-sensor/internals/sql/CiPipelineMaterial.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ type CiPipelineMaterialRepository interface {
4646
FindById(id int) (*CiPipelineMaterial, error)
4747
Exists(id int) (bool, error)
4848
Save(material []*CiPipelineMaterial) ([]*CiPipelineMaterial, error)
49-
UpdateMaterialsErroredForGitMaterialId(gitMaterialId int, materialType SourceType, errorMessage string) error
50-
UpdateMaterialsNonErroredForGitMaterialId(gitMaterialId int, materialType SourceType) error
5149
}
5250

5351
type CiPipelineMaterialRepositoryImpl struct {
@@ -106,25 +104,3 @@ func (impl CiPipelineMaterialRepositoryImpl) FindById(id int) (*CiPipelineMateri
106104
Where("active = ?", true).Select()
107105
return materials, err
108106
}
109-
110-
func (impl CiPipelineMaterialRepositoryImpl) UpdateMaterialsErroredForGitMaterialId(gitMaterialId int, materialType SourceType, errorMessage string) error {
111-
_, err := impl.dbConnection.Model(&CiPipelineMaterial{}).
112-
Set("errored = ?", true).
113-
Set("error_msg = ?", errorMessage).
114-
Where("active = ?", true).
115-
Where("git_material_id = ?", gitMaterialId).
116-
Where("type = ?", materialType).
117-
Update()
118-
return err
119-
}
120-
121-
func (impl CiPipelineMaterialRepositoryImpl) UpdateMaterialsNonErroredForGitMaterialId(gitMaterialId int, materialType SourceType) error {
122-
_, err := impl.dbConnection.Model(&CiPipelineMaterial{}).
123-
Set("errored = ?", false).
124-
Set("error_msg = ?", "").
125-
Where("active = ?", true).
126-
Where("git_material_id = ?", gitMaterialId).
127-
Where("type = ?", materialType).
128-
Update()
129-
return err
130-
}

‎git-sensor/pkg/RepoManages.go

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,15 @@ func (impl RepoManagerImpl) checkoutMaterial(gitCtx git.GitContext, material *sq
377377
material.CheckoutStatus = false
378378
errorMessage := util2.BuildDisplayErrorMessage(errMsg, err)
379379
material.CheckoutMsgAny = errorMessage
380+
dbErr := impl.materialRepository.Update(material)
381+
if dbErr != nil {
382+
impl.logger.Errorw("error in updating material repo", "err", dbErr, "material", material)
383+
}
380384
return nil, errors.New(errorMessage)
381385
} else {
382386
material.CheckoutLocation = checkoutLocationForFetching
383387
material.CheckoutStatus = true
388+
material.FetchStatus = true
384389
}
385390
err = impl.materialRepository.Update(material)
386391
if err != nil {
@@ -528,27 +533,27 @@ func (impl RepoManagerImpl) FetchGitCommitsForBranchFixPipeline(pipelineMaterial
528533
}
529534

530535
func (impl RepoManagerImpl) CheckAndSetErrorTypeAndMsgInResponse(pipelineMaterial *sql.CiPipelineMaterial, gitMaterial *sql.GitMaterial, response *git.MaterialChangeResp, isWebhook bool) bool {
531-
if pipelineMaterial.Errored {
532-
impl.logger.Infow("errored material ", "id", pipelineMaterial.Id, "gitMaterialId", gitMaterial.Id, "fetchErrorMessage", gitMaterial.FetchErrorMessage, "checkoutMsgAny", gitMaterial.CheckoutMsgAny, "errMsg", pipelineMaterial.ErrorMsg)
533-
if !gitMaterial.CheckoutStatus {
534-
response.IsRepoError = true
535-
// doing this as previously fetch message was stored with checkoutStatus flag, if empty return fetchErrormessage
536-
if len(gitMaterial.CheckoutMsgAny) > 0 {
537-
response.RepoErrorMsg = gitMaterial.CheckoutMsgAny
538-
} else {
539-
response.RepoErrorMsg = gitMaterial.FetchErrorMessage
540-
}
541-
} else if isWebhook {
542-
// this is done as old data has been saved in db for tag/pr/webhook and only checkoutStatus is relevant for these types
543-
return false
544-
} else if !gitMaterial.FetchStatus {
545-
response.IsRepoError = true
546-
response.RepoErrorMsg = gitMaterial.FetchErrorMessage
536+
impl.logger.Infow("errored material ", "id", pipelineMaterial.Id, "gitMaterialId", gitMaterial.Id, "fetchErrorMessage", gitMaterial.FetchErrorMessage, "checkoutMsgAny", gitMaterial.CheckoutMsgAny, "errMsg", pipelineMaterial.ErrorMsg)
537+
if !gitMaterial.CheckoutStatus {
538+
response.IsRepoError = true
539+
// doing this as previously fetch message was stored with checkoutStatus flag, if empty return fetchErrormessage
540+
if len(gitMaterial.CheckoutMsgAny) > 0 {
541+
response.RepoErrorMsg = gitMaterial.CheckoutMsgAny
547542
} else {
548-
response.IsBranchError = true
549-
response.BranchErrorMsg = pipelineMaterial.ErrorMsg
543+
response.RepoErrorMsg = gitMaterial.FetchErrorMessage
550544
}
551545
return true
546+
} else if isWebhook {
547+
// this is done as old data has been saved in db for tag/pr/webhook and only checkoutStatus is relevant for these types
548+
return false
549+
} else if !gitMaterial.FetchStatus {
550+
response.IsRepoError = true
551+
response.RepoErrorMsg = gitMaterial.FetchErrorMessage
552+
return true
553+
} else if pipelineMaterial.Errored {
554+
response.IsBranchError = true
555+
response.BranchErrorMsg = pipelineMaterial.ErrorMsg
556+
return true
552557
}
553558
return false
554559
}

‎git-sensor/pkg/git/RepositoryManager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func (impl *RepositoryManagerImpl) ChangesSinceByRepository(gitCtx GitContext, r
311311
if !gitCommit.IsMessageValidUTF8() {
312312
gitCommit.FixInvalidUTF8Message()
313313
}
314-
impl.logger.Debugw("commit dto for repo ", "repo", repository, commit)
314+
impl.logger.Debugw("commit dto for repo ", "repo", repository, "commit", commit)
315315
gitCommits = append(gitCommits, gitCommit)
316316
itrCounter = itrCounter + 1
317317

‎git-sensor/pkg/git/Watcher.go

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -204,39 +204,20 @@ func (impl GitWatcherImpl) handleSshKeyCreationAndRetry(gitCtx GitContext, mater
204204
impl.logger.Info("Retrying fetching for", "repo", material.Url)
205205
updated, repo, errMsg, err = impl.FetchAndUpdateMaterial(gitCtx, material, location)
206206
if err != nil {
207-
impl.logAndUpdateDbError(material.Id, errMsg)
208207
impl.logger.Errorw("error in fetching material details in retry", "repo", material.Url, "err", err)
208+
errorMessage := util2.BuildDisplayErrorMessage(errMsg, err)
209+
material.FetchStatus = false
210+
material.FetchErrorMessage = errorMessage
209211
return false, nil, errMsg, err
210212
}
211213
}
212214
return updated, repo, errMsg, err
213215
}
214216

215-
// Helper function to log and update database with error message for CI pipeline material
216-
func (impl GitWatcherImpl) logAndUpdateDbError(materialId int, errMsg string) {
217-
dbErr := impl.ciPipelineMaterialRepository.UpdateMaterialsErroredForGitMaterialId(materialId, sql.SOURCE_TYPE_BRANCH_FIXED, errMsg)
218-
if dbErr != nil {
219-
// made this non-blocking
220-
impl.logger.Errorw("error encountered in updating ci pipeline material", "materialId", materialId, "dbErr", dbErr)
221-
}
222-
}
223-
224-
func (impl GitWatcherImpl) logAndUpdateDbNonError(materialId int, fetchStatus bool) {
225-
if !fetchStatus {
226-
// if fetch previously failed then update errored to false
227-
dbErr := impl.ciPipelineMaterialRepository.UpdateMaterialsNonErroredForGitMaterialId(materialId, sql.SOURCE_TYPE_BRANCH_FIXED)
228-
if dbErr != nil {
229-
// made this non-blocking
230-
impl.logger.Errorw("error encountered in updating ci pipeline material", "materialId", materialId, "dbErr", dbErr)
231-
}
232-
}
233-
}
234-
235217
func (impl GitWatcherImpl) pollGitMaterialAndNotify(material *sql.GitMaterial) (string, error) {
236218
gitProvider := material.GitProvider
237219
userName, password, err := GetUserNamePassword(gitProvider)
238220
location := material.CheckoutLocation
239-
initialFetchStatus := material.FetchStatus
240221
if err != nil {
241222
impl.logger.Errorw("error in determining location", "url", material.Url, "err", err)
242223
return "", err
@@ -258,14 +239,15 @@ func (impl GitWatcherImpl) pollGitMaterialAndNotify(material *sql.GitMaterial) (
258239
}
259240
} else {
260241
// Log and update database if retry not possible or SSH key already exists
261-
impl.logAndUpdateDbError(material.Id, errMsg)
242+
impl.logger.Errorw("error in fetching material details in retry", "repo", material.Url, "materialId", material.Id, "err", err, "errMsg", errMsg)
243+
errorMessage := util2.BuildDisplayErrorMessage(errMsg, err)
244+
material.FetchStatus = false
245+
material.FetchErrorMessage = errorMessage
262246
return errMsg, err
263247
}
264248
}
265249
if !updated {
266250
impl.logger.Debugw("no new commit found but fetch success", "url", material.Url, "fetchStatus", material.FetchStatus)
267-
// update set errored false in ci pipeline material as fetch is successful
268-
impl.logAndUpdateDbNonError(material.Id, initialFetchStatus)
269251
return "", nil
270252
}
271253
materials, err := impl.ciPipelineMaterialRepository.FindByGitMaterialId(material.Id)
@@ -336,22 +318,21 @@ func (impl GitWatcherImpl) pollGitMaterialAndNotify(material *sql.GitMaterial) (
336318
updatedMaterialsModel = append(updatedMaterialsModel, material)
337319
}
338320
}
339-
if len(updatedMaterialsModel) > 0 {
340-
err = impl.NotifyForMaterialUpdate(updatedMaterials, material)
341-
if err != nil {
342-
impl.logger.Errorw("error in sending notification for materials", "url", material.Url, "update", updatedMaterialsModel)
343-
}
344-
err = impl.ciPipelineMaterialRepository.Update(updatedMaterialsModel)
321+
if len(erroredMaterialsModels) > 0 {
322+
err = impl.ciPipelineMaterialRepository.Update(erroredMaterialsModels)
345323
if err != nil {
346-
impl.logger.Errorw("error in update db ", "url", material.Url, "update", updatedMaterialsModel)
347-
impl.logger.Errorw("error in sending notification for materials", "url", material.Url, "update", updatedMaterialsModel)
324+
impl.logger.Errorw("error in update db ", "url", material.Url, "update", erroredMaterialsModels)
348325
}
349326
}
350-
if len(erroredMaterialsModels) > 0 {
327+
if len(updatedMaterialsModel) > 0 {
351328
err = impl.ciPipelineMaterialRepository.Update(updatedMaterialsModel)
352329
if err != nil {
353330
impl.logger.Errorw("error in update db ", "url", material.Url, "update", updatedMaterialsModel)
354-
impl.logger.Errorw("error in sending notification for materials", "url", material.Url, "update", updatedMaterialsModel)
331+
} else {
332+
err = impl.NotifyForMaterialUpdate(updatedMaterials, material)
333+
if err != nil {
334+
impl.logger.Errorw("error in sending notification for materials", "url", material.Url, "update", updatedMaterialsModel)
335+
}
355336
}
356337
}
357338
return "", nil

‎git-sensor/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ github.com/cyphar/filepath-securejoin
6666
# github.com/davecgh/go-spew v1.1.1
6767
## explicit
6868
github.com/davecgh/go-spew/spew
69-
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
69+
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
7070
## explicit; go 1.21
7171
github.com/devtron-labs/common-lib/constants
7272
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -488,4 +488,4 @@ gopkg.in/yaml.v3
488488
# mellium.im/sasl v0.3.2
489489
## explicit; go 1.20
490490
mellium.im/sasl
491-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
491+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195

‎image-scanner/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ require (
7474
mellium.im/sasl v0.3.2 // indirect
7575
)
7676

77-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
77+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195

‎image-scanner/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
280280
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
281281
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
282282
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
283-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13 h1:oL8v0vMVzRouQAUDx+LlhfDgy8K1PbGKV8L4yOqyvGI=
284-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
283+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195 h1:vqXs6O6QP90QnBI2U4W+yYvyjckby17xIYzexdPoQI4=
284+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
285285
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
286286
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
287287
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=

‎image-scanner/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ github.com/cespare/xxhash/v2
7272
github.com/coreos/clair/api/v3/clairpb
7373
github.com/coreos/clair/database
7474
github.com/coreos/clair/ext/versionfmt
75-
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
75+
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
7676
## explicit; go 1.21
7777
github.com/devtron-labs/common-lib/constants
7878
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -440,4 +440,4 @@ google.golang.org/protobuf/types/known/wrapperspb
440440
# mellium.im/sasl v0.3.2
441441
## explicit; go 1.20
442442
mellium.im/sasl
443-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
443+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195

‎kubelink/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ require (
177177
)
178178

179179
replace (
180-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250313102545-75df8a5bec13
180+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250318120348-f6eebf1e6195
181181
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0
182182
// https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280
183183
k8s.io/api => k8s.io/api v0.29.0

0 commit comments

Comments
 (0)