Fixed test case

fluxxBot · fluxxBot · commit 3b7657e999ac · 2025-04-15T06:18:38.000+05:30
diff --git a/artifactory/commands/npm/npmPublishHandler.go b/artifactory/commands/npm/npmPublishHandler.go
@@ -26,7 +26,9 @@ func (npu *npmPublish) upload() (err error) {
 
 		// If requested, perform a Xray binary scan before deployment. If a FailBuildError is returned, skip the deployment.
 		if npu.xrayScan {
-			err = errors.Join(err, performXrayScan(packedFilePath, npu.repo, npu.serverDetails, npu.scanOutputFormat))
+			if err = performXrayScan(packedFilePath, npu.repo, npu.serverDetails, npu.scanOutputFormat); err != nil {
+				return
+			}
 		}
 		err = errors.Join(err, npu.publishPackage(npu.executablePath, packedFilePath, npu.serverDetails, target))
 	}
diff --git a/artifactory/commands/npm/rtPublishHandler.go b/artifactory/commands/npm/rtPublishHandler.go
@@ -28,7 +28,9 @@ func (nru *npmRtUpload) upload() (err error) {
 
 		// If requested, perform a Xray binary scan before deployment. If a FailBuildError is returned, skip the deployment.
 		if nru.xrayScan {
-			err = errors.Join(err, performXrayScan(packedFilePath, nru.repo, nru.serverDetails, nru.scanOutputFormat))
+			if err = performXrayScan(packedFilePath, nru.repo, nru.serverDetails, nru.scanOutputFormat); err != nil {
+				return
+			}
 		}
 		err = errors.Join(err, nru.doDeploy(target, nru.serverDetails, packedFilePath))
 	}
diff --git a/go.mod b/go.mod
@@ -121,7 +121,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e
 
 replace github.com/jfrog/jfrog-client-go => github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6
 
diff --git a/go.sum b/go.sum
@@ -54,8 +54,8 @@ github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o
 github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb h1:StUinFdDlk+8eY6jJ1qX5o9eAHSL7ub7gJGwQZFaIyo=
-github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb/go.mod h1:eV3CTP/F4nEYE7p4WojZc4ruU1/3sXj0o/ctnjmO5fw=
+github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e h1:q0BinSmz7ZhYbkuow5I+R3DhOIHFIcKk/ZxkE/GSW1w=
+github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e/go.mod h1:eV3CTP/F4nEYE7p4WojZc4ruU1/3sXj0o/ctnjmO5fw=
 github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6 h1:krAN+7hGggGDXfAlcC8eni2QxWfW7I5JVNPvhI3vS4U=
 github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6/go.mod h1:uRmT8Q1SJymIzId01v0W1o8mGqrRfrwUF53CgEMsH0U=
 github.com/forPelevin/gomoji v1.3.0 h1:WPIOLWB1bvRYlKZnSSEevLt3IfKlLs+tK+YA9fFYlkE=

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ func (npu *npmPublish) upload() (err error) {`
`26`	`26`
`27`	`27`	`// If requested, perform a Xray binary scan before deployment. If a FailBuildError is returned, skip the deployment.`
`28`	`28`	`if npu.xrayScan {`
`29`		`- err = errors.Join(err, performXrayScan(packedFilePath, npu.repo, npu.serverDetails, npu.scanOutputFormat))`
	`29`	`+ if err = performXrayScan(packedFilePath, npu.repo, npu.serverDetails, npu.scanOutputFormat); err != nil {`
	`30`	`+ return`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`	`err = errors.Join(err, npu.publishPackage(npu.executablePath, packedFilePath, npu.serverDetails, target))`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ func (nru *npmRtUpload) upload() (err error) {`
`28`	`28`
`29`	`29`	`// If requested, perform a Xray binary scan before deployment. If a FailBuildError is returned, skip the deployment.`
`30`	`30`	`if nru.xrayScan {`
`31`		`- err = errors.Join(err, performXrayScan(packedFilePath, nru.repo, nru.serverDetails, nru.scanOutputFormat))`
	`31`	`+ if err = performXrayScan(packedFilePath, nru.repo, nru.serverDetails, nru.scanOutputFormat); err != nil {`
	`32`	`+ return`
	`33`	`+ }`
`32`	`34`	`}`
`33`	`35`	`err = errors.Join(err, nru.doDeploy(target, nru.serverDetails, packedFilePath))`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ require (`
`121`	`121`	`sigs.k8s.io/yaml v1.4.0 // indirect`
`122`	`122`	`)`
`123`	`123`
`124`		`-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb`
	`124`	`+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413220436-b46ff5daaf5e`
`125`	`125`
`126`	`126`	`replace github.com/jfrog/jfrog-client-go => github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6`
`127`	`127`