Merge branch 'dev' into v2

jfrog · Jul 12, 2023 · e9cb8b6 · e9cb8b6
2 parents 24d903d + 752410f
commit e9cb8b6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -411,9 +411,9 @@ def publishNpmPackage(jfrogCliRepoDir) {
 }
 
 def publishChocoPackageWithRetries(version, jfrogCliRepoDir, architectures) {
-    def maxAttempts = 3
+    def maxAttempts = 10
     def currentAttempt = 1
-    def waitSeconds = 20
+    def waitSeconds = 18
 
     while (currentAttempt <= maxAttempts) {
         try {

diff --git a/scan/cli.go b/scan/cli.go
@@ -48,7 +48,6 @@ func GetCommands() []cli.Command {
 			ArgsUsage:    common.CreateEnvVars(),
 			BashComplete: corecommondocs.CreateBashCompletionFunc(),
 			Action:       CurationCmd,
-			Hidden:       true,
 		},
 		{
 			Name:         "audit",

diff --git a/xray_test.go b/xray_test.go
@@ -725,8 +725,16 @@ func getCurationExpectedResponse(config *config.ServerDetails) []coreCuration.Pa
 			PkgType:           "npm",
 			Policy: []coreCuration.Policy{
 				{
-					Policy:    "pol1",
-					Condition: "cond1",
+					Policy:         "pol1",
+					Condition:      "cond1",
+					Explanation:    "explanation",
+					Recommendation: "recommendation",
+				},
+				{
+					Policy:         "pol2",
+					Condition:      "cond2",
+					Explanation:    "explanation2",
+					Recommendation: "recommendation2",
 				},
 			},
 		},
@@ -752,7 +760,7 @@ func curationServer(t *testing.T, expectedRequest map[string]bool, requestToFail
 				w.WriteHeader(http.StatusForbidden)
 				_, err := w.Write([]byte("{\n    \"errors\": [\n        {\n            \"status\": 403,\n            " +
 					"\"message\": \"Package download was blocked by JFrog Packages " +
-					"Curation service due to the following policies violated {pol1, cond1}\"\n        }\n    ]\n}"))
+					"Curation service due to the following policies violated {pol1, cond1, explanation, recommendation}, {pol2, cond2, explanation2, recommendation2}\"\n        }\n    ]\n}"))
 				require.NoError(t, err)
 			}
 		}