Follow transitive search limitations (#312)

* Fixed some issues regarding limitations in transitive search: --transitive cannot be used with --sort-by and --offset.

Author: asafgabai

artifactory/commands/generic/download.go

@@ -9,8 +9,6 @@ import (
 
 	buildinfo "github.com/jfrog/build-info-go/entities"
 
-	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
-
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
@@ -240,7 +238,10 @@ func getDownloadParams(f *spec.File, configuration *utils.DownloadConfiguration)
 		return
 	}
 
-	downParams.Transitive = strings.ToLower(os.Getenv(coreutils.TransitiveDownload)) == "true"
+	downParams.Transitive, err = f.IsTransitive(false)
+	if err != nil {
+		return
+	}
 
 	downParams.PublicGpgKey = f.GetPublicGpgKey()
 

common/spec/specfiles.go

@@ -155,7 +155,7 @@ func (f *File) ToCommonParams() (*utils.CommonParams, error) {
 	return params, nil
 }
 
-func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec, isUpload bool) error {
+func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec bool) error {
 	if len(files) == 0 {
 		return errors.New("Spec must include at least one file group")
 	}
@@ -182,6 +182,7 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec, isUpload b
 		isRegexp := file.Regexp == "true"
 		isAnt := file.Ant == "true"
 		isExplode, _ := file.IsExplode(false)
+		isTransitive, _ := file.IsTransitive(false)
 
 		if isTargetMandatory && !isTarget {
 			return errors.New("Spec must include target.")
@@ -192,25 +193,26 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec, isUpload b
 		if isBuild && isBundle {
 			return fileSpecValidationError("build", "bundle")
 		}
-		if isSearchBasedSpec {
-			if !isAql && !isPattern && !isBuild && !isBundle {
-				return errors.New("Spec must include either aql, pattern, build or bundle.")
+		if isSearchBasedSpec && !isAql && !isPattern && !isBuild && !isBundle {
+			return errors.New("Spec must include either aql, pattern, build or bundle.")
+		}
+		if isOffset {
+			if isBuild {
+				return fileSpecValidationError("build", "offset")
 			}
-			if isOffset {
-				if isBuild {
-					return fileSpecValidationError("build", "offset")
-				}
-				if isBundle {
-					return fileSpecValidationError("bundle", "offset")
-				}
+			if isBundle {
+				return fileSpecValidationError("bundle", "offset")
 			}
-			if isLimit {
-				if isBuild {
-					return fileSpecValidationError("build", "limit")
-				}
-				if isBundle {
-					return fileSpecValidationError("bundle", "limit")
-				}
+		}
+		if isTransitive && isOffset {
+			return fileSpecValidationError("transitive", "offset")
+		}
+		if isLimit {
+			if isBuild {
+				return fileSpecValidationError("build", "limit")
+			}
+			if isBundle {
+				return fileSpecValidationError("bundle", "limit")
 			}
 		}
 		if isAql && isPattern {
@@ -228,6 +230,9 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec, isUpload b
 		if isSortOrder && !isValidSortOrder {
 			return errors.New("The value of 'sort-order' can only be 'asc' or 'desc'.")
 		}
+		if isTransitive && isSortBy {
+			return fileSpecValidationError("transitive", "sort-by")
+		}
 		if !isBuild && (isExcludeArtifacts || isIncludeDeps) {
 			return errors.New("Spec cannot include 'exclude-artifacts' or 'include-deps' if 'build' is not included.")
 		}
@@ -248,5 +253,5 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec, isUpload b
 }
 
 func fileSpecValidationError(fieldA, fieldB string) error {
-	return errors.New(fmt.Sprintf("Spec cannot include both '%s' and '%s.'", fieldA, fieldB))
+	return errors.New(fmt.Sprintf("Spec cannot include both '%s' and '%s'.", fieldA, fieldB))
 }

go.mod

@@ -30,7 +30,7 @@ exclude (
 	github.com/pkg/sftp v1.10.1
 )
 
-replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.7.2-0.20220126202552-33ef52e50cde
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.7.2-0.20220130082553-d834a1f73ff0
 
 replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.0.1-0.20220118114459-b944fdc6a593
 

go.sum

@@ -227,8 +227,8 @@ github.com/jfrog/build-info-go v1.0.1-0.20220118114459-b944fdc6a593 h1:QF8ZHXbXX
 github.com/jfrog/build-info-go v1.0.1-0.20220118114459-b944fdc6a593/go.mod h1:QyeMfNGt4W0eWazrd7j6uZVN5KTpB05nxF/MwvGnTqs=
 github.com/jfrog/gofrog v1.1.1 h1:uRjeZWidQl4FmKP4Zpj5hSKJp3gSIWW9VUwbQdVEVRU=
 github.com/jfrog/gofrog v1.1.1/go.mod h1:9YN5v4LlsCfLIXpwQnzSf1wVtgjdHM20FzuIu58RMI4=
-github.com/jfrog/jfrog-client-go v1.7.2-0.20220126202552-33ef52e50cde h1:T6oVCtmCtedMP4oIhMTEKG5UewBeNj3Yoxi396QARqE=
-github.com/jfrog/jfrog-client-go v1.7.2-0.20220126202552-33ef52e50cde/go.mod h1:LjMyvNTaSn8aMqgqCga1Ii5stlX+TBZyt/RD+K+hC7w=
+github.com/jfrog/jfrog-client-go v1.7.2-0.20220130082553-d834a1f73ff0 h1:PTS6i1nG8LPM+Tqx2DrjBCcQi4Xu9Yc67J2VyosNpuQ=
+github.com/jfrog/jfrog-client-go v1.7.2-0.20220130082553-d834a1f73ff0/go.mod h1:LjMyvNTaSn8aMqgqCga1Ii5stlX+TBZyt/RD+K+hC7w=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=