Skip to content

Commit e481a0f

Browse files
prakash100198prakash100198
committed
make dep update oss
1 parent e3ff390 commit e481a0f

File tree

8 files changed

+20
-24
lines changed

8 files changed

+20
-24
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
291-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250120141516-2a2e1e28871e
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250122085824-e8cfac1153e9
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122085824-e8cfac1153e9
293293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
294294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
295295
k8s.io/api => k8s.io/api v0.29.7

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
792792
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
793793
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
794794
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
795-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250120141516-2a2e1e28871e h1:xeFoxfP3bH9nbzWyHc8Vw1xZmr48gVe94xqg7BV3bA8=
796-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e h1:cPuKp3c0+dxj1YjjXkuxRLG0oGSegVz+D+jk8xBzSEc=
798-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
795+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250122085824-e8cfac1153e9 h1:+vWE4oNKJ3dMjTXnHzwc2LdLGAd91ZmZYutqOQ9K9Ik=
796+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250122085824-e8cfac1153e9/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122085824-e8cfac1153e9 h1:mbJg1CQqZIyifzdB6QaYeh22zMUZK5QQ/GAuMj8cN58=
798+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122085824-e8cfac1153e9/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
799799
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
800800
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
801801
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

‎pkg/pipeline/CiService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
836836
return nil, err
837837
}
838838
workflowRequest.SetExecuteImageScanningVia(scanVia)
839-
if scanVia.IsExecutionMediumSteps() {
839+
if scanVia.IsScanMediumExternal() {
840840
imageScanExecutionSteps, refPlugins, err := impl.fetchImageScanExecutionStepsForWfRequest(scanToolMetadata)
841841
if err != nil {
842842
impl.Logger.Errorw("error occurred, fetchImageScanExecutionStepsForWfRequest", "scanToolMetadata", scanToolMetadata, "err", err)

‎pkg/pipeline/CiService_ent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/devtron-labs/devtron/pkg/policyGovernance/security/scanTool/repository"
88
)
99

10-
func (impl *CiServiceImpl) fetchImageScanExecutionMedium() (*repository.ScanToolMetadata, bean.ExecutionMedium, error) {
10+
func (impl *CiServiceImpl) fetchImageScanExecutionMedium() (*repository.ScanToolMetadata, bean.ScanExecutionMedium, error) {
1111
return &repository.ScanToolMetadata{}, "", nil
1212
}
1313

‎pkg/pipeline/types/Workflow_ent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (r *ImageScanningSteps) WithScanToolId(scanToolId int) *ImageScanningSteps
2222
return r
2323
}
2424

25-
func (workflowRequest *WorkflowRequest) SetExecuteImageScanningVia(scanVia bean2.ExecutionMedium) {
25+
func (workflowRequest *WorkflowRequest) SetExecuteImageScanningVia(scanVia bean2.ScanExecutionMedium) {
2626
return
2727
}
2828

‎pkg/policyGovernance/security/scanTool/repository/ScanToolMetaDataRepository.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ type ScanToolMetadata struct {
4040
sql.AuditLog
4141
}
4242

43-
func (r *ScanToolMetadata) IsPluginIdPresent() bool {
44-
return r.PluginId > 0
45-
}
46-
4743
type ScanToolMetadataRepository interface {
4844
FindActiveToolByScanTarget(scanTarget bean.ScanTargetType) (*ScanToolMetadata, error)
4945
FindByNameAndVersion(name, version string) (*ScanToolMetadata, error)

‎vendor/github.com/devtron-labs/common-lib/imageScan/bean/executionBean.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,15 @@ github.com/davecgh/go-spew/spew
336336
# github.com/deckarep/golang-set v1.8.0
337337
## explicit; go 1.17
338338
github.com/deckarep/golang-set
339-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250120141516-2a2e1e28871e
339+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250122085824-e8cfac1153e9
340340
## explicit; go 1.21
341341
github.com/devtron-labs/authenticator/apiToken
342342
github.com/devtron-labs/authenticator/client
343343
github.com/devtron-labs/authenticator/jwt
344344
github.com/devtron-labs/authenticator/middleware
345345
github.com/devtron-labs/authenticator/oidc
346346
github.com/devtron-labs/authenticator/password
347-
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e
347+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122085824-e8cfac1153e9
348348
## explicit; go 1.21
349349
github.com/devtron-labs/common-lib/async
350350
github.com/devtron-labs/common-lib/blob-storage
@@ -2214,8 +2214,8 @@ xorm.io/xorm/log
22142214
xorm.io/xorm/names
22152215
xorm.io/xorm/schemas
22162216
xorm.io/xorm/tags
2217-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250120141516-2a2e1e28871e
2218-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250120141516-2a2e1e28871e
2217+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250122085824-e8cfac1153e9
2218+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250122085824-e8cfac1153e9
22192219
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
22202220
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
22212221
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)