Merge remote-tracking branch 'upstream/master' into feature/JFMIG-13

Author: deepakkjfrog

artifactory/commands/transferfiles/status.go

@@ -108,7 +108,7 @@ func setRepositoryStatus(stateManager *state.TransferStateManager, output *strin
 	switch stateManager.CurrentRepoPhase {
 	case api.Phase1, api.Phase3:
 		if stateManager.CurrentRepoPhase == api.Phase1 {
-			addString(output, "🔢", "Phase", "Transferring all files in the repository (1/3)", 3)
+			addString(output, "🔢", "Phase", "Transferring files in the repository (1/3)", 3)
 		} else {
 			addString(output, "🔢", "Phase", "Retrying transfer failures and transfer delayed files (3/3)", 3)
 		}

artifactory/commands/transferfiles/status_test.go

@@ -74,7 +74,7 @@ func TestShowStatus(t *testing.T) {
 	// Check repository status
 	assert.Contains(t, results, "Current Repository Status")
 	assert.Contains(t, results, "Name:			repo1")
-	assert.Contains(t, results, "Phase:			Transferring all files in the repository (1/3)")
+	assert.Contains(t, results, "Phase:			Transferring files in the repository (1/3)")
 	assert.Contains(t, results, "Visited folders:		15")
 	assert.Contains(t, results, "Delayed files:		20 (Files to be transferred last, after all other files)")
 	assert.Contains(t, results, "Storage:			4.9 KiB / 9.8 KiB (50.0%)")

artifactory/commands/transferfiles/transferfileprogress.go

@@ -12,7 +12,7 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
 
-const phase1HeadLine = "Phase 1: Transferring all files in the repository"
+const phase1HeadLine = "Phase 1: Transferring files in the repository"
 
 // TransferProgressMng provides progress indication for the jf rt transfer-files command.
 // Transferring one repository's data at a time.

common/cliutils/spec.go

@@ -1,11 +1,12 @@
 package cliutils
 
 import (
+	"strconv"
+	"strings"
+
 	speccore "github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
-	"strconv"
-	"strings"
 )
 
 func GetSpec(c *components.Context, isDownload, overrideFieldsIfSet bool) (specFiles *speccore.SpecFiles, err error) {
@@ -58,6 +59,14 @@ func OverrideFieldsIfSet(spec *speccore.File, c *components.Context) {
 	overrideStringIfSet(&spec.Symlinks, c, "symlinks")
 	overrideStringIfSet(&spec.Transitive, c, "transitive")
 	overrideStringIfSet(&spec.PublicGpgKey, c, "gpg-key")
+	overrideIncludeIfSet(spec, c)
+}
+
+// If `include` exist in the cli args, read it to spec.Include as an array split by `;`.
+func overrideIncludeIfSet(spec *speccore.File, c *components.Context) {
+	if c.IsFlagSet("include") {
+		spec.Include = strings.Split(c.GetStringFlagValue("include"), ";")
+	}
 }
 
 // If `fieldName` exist in the cli args, read it to `field` as a string.

common/commands/curl.go

@@ -146,34 +146,107 @@ func (curlCmd *CurlCommand) GetServerDetails() (*config.ServerDetails, error) {
 // Use this method ONLY after removing all JFrog-CLI flags, i.e. flags in the form: '--my-flag=value' are not allowed.
 // An argument is any provided candidate which is not a flag or a flag value.
 func (curlCmd *CurlCommand) findUriValueAndIndex() (int, string) {
-	skipThisArg := false
+	// curlBooleanFlags is a set of curl flags that do NOT take a value.
+	curlBooleanFlags := map[string]struct{}{
+		"-#": {}, "-:": {}, "-0": {}, "-1": {}, "-2": {}, "-3": {}, "-4": {}, "-6": {},
+		"-a": {}, "-B": {}, "-f": {}, "-g": {}, "-G": {}, "-I": {}, "-i": {},
+		"-j": {}, "-J": {}, "-k": {}, "-l": {}, "-L": {}, "-M": {}, "-n": {},
+		"-N": {}, "-O": {}, "-p": {}, "-q": {}, "-R": {}, "-s": {}, "-S": {},
+		"-v": {}, "-V": {}, "-Z": {},
+		"--anyauth": {}, "--append": {}, "--basic": {}, "--ca-native": {},
+		"--cert-status": {}, "--compressed": {}, "--compressed-ssh": {},
+		"--create-dirs": {}, "--crlf": {}, "--digest": {}, "--disable": {},
+		"--disable-eprt": {}, "--disable-epsv": {}, "--disallow-username-in-url": {},
+		"--doh-cert-status": {}, "--doh-insecure": {}, "--fail": {},
+		"--fail-early": {}, "--fail-with-body": {}, "--false-start": {},
+		"--form-escape": {}, "--ftp-create-dirs": {}, "--ftp-pasv": {},
+		"--ftp-pret": {}, "--ftp-skip-pasv-ip": {}, "--ftp-ssl-ccc": {},
+		"--ftp-ssl-control": {}, "--get": {}, "--globoff": {},
+		"--haproxy-protocol": {}, "--head": {}, "--http0.9": {}, "--http1.0": {},
+		"--http1.1": {}, "--http2": {}, "--http2-prior-knowledge": {},
+		"--http3": {}, "--http3-only": {}, "--ignore-content-length": {},
+		"--include": {}, "--insecure": {}, "--ipv4": {}, "--ipv6": {},
+		"--junk-session-cookies": {}, "--list-only": {}, "--location": {},
+		"--location-trusted": {}, "--mail-rcpt-allowfails": {}, "--manual": {},
+		"--metalink": {}, "--negotiate": {}, "--netrc": {}, "--netrc-optional": {},
+		"--next": {}, "--no-alpn": {}, "--no-buffer": {}, "--no-clobber": {},
+		"--no-keepalive": {}, "--no-npn": {}, "--no-progress-meter": {},
+		"--no-sessionid": {}, "--ntlm": {}, "--ntlm-wb": {}, "--parallel": {},
+		"--parallel-immediate": {}, "--path-as-is": {}, "--post301": {},
+		"--post302": {}, "--post303": {}, "--progress-bar": {},
+		"--proxy-anyauth": {}, "--proxy-basic": {}, "--proxy-ca-native": {},
+		"--proxy-digest": {}, "--proxy-http2": {}, "--proxy-insecure": {},
+		"--proxy-negotiate": {}, "--proxy-ntlm": {}, "--proxy-ssl-allow-beast": {},
+		"--proxy-ssl-auto-client-cert": {}, "--proxy-tlsv1": {}, "--proxytunnel": {},
+		"--raw": {}, "--remote-header-name": {}, "--remote-name": {},
+		"--remote-name-all": {}, "--remote-time": {}, "--remove-on-error": {},
+		"--retry-all-errors": {}, "--retry-connrefused": {}, "--sasl-ir": {},
+		"--show-error": {}, "--silent": {}, "--socks5-basic": {},
+		"--socks5-gssapi": {}, "--socks5-gssapi-nec": {}, "--ssl": {},
+		"--ssl-allow-beast": {}, "--ssl-auto-client-cert": {}, "--ssl-no-revoke": {},
+		"--ssl-reqd": {}, "--ssl-revoke-best-effort": {}, "--sslv2": {},
+		"--sslv3": {}, "--styled-output": {}, "--suppress-connect-headers": {},
+		"--tcp-fastopen": {}, "--tcp-nodelay": {}, "--tftp-no-options": {},
+		"--tlsv1": {}, "--tlsv1.0": {}, "--tlsv1.1": {}, "--tlsv1.2": {},
+		"--tlsv1.3": {}, "--tr-encoding": {}, "--trace-ids": {},
+		"--trace-time": {}, "--use-ascii": {}, "--verbose": {}, "--version": {},
+		"--xattr": {},
+	}
+
+	// isBooleanFlag checks if a flag is in the boolean flags
+	isBooleanFlag := func(flag string) bool {
+		_, exists := curlBooleanFlags[flag]
+		return exists
+	}
+
+	skipNextArg := false
 	for index, arg := range curlCmd.arguments {
-		// Check if shouldn't check current arg.
-		if skipThisArg {
-			skipThisArg = false
+		// Check if this arg should be skipped (it's a value for the previous flag)
+		if skipNextArg {
+			skipNextArg = false
 			continue
 		}
-		// If starts with '--', meaning a flag which its value is at next slot.
-		if strings.HasPrefix(arg, "--") {
-			skipThisArg = true
-			continue
-		}
-		// Check if '-'.
+
+		// Check if this is a flag
 		if strings.HasPrefix(arg, "-") {
-			if len(arg) > 2 {
-				// Meaning that this flag also contains its value.
+			// Check for flags with inline values like --header=value
+			if strings.HasPrefix(arg, "--") && strings.Contains(arg, "=") {
 				continue
 			}
-			// If reached here, means that the flag value is at the next arg.
-			skipThisArg = true
+
+			// Check if it a boolean flag
+			if isBooleanFlag(arg) {
+				continue
+			}
+
+			// For short flags
+			if !strings.HasPrefix(arg, "--") && len(arg) > 2 {
+				// find a flag that takes a value, everything after it is the inline value
+				for i := 1; i < len(arg); i++ {
+					charFlag := "-" + string(arg[i])
+					if !isBooleanFlag(charFlag) {
+						// Found a flag that takes a value
+						if i < len(arg)-1 {
+							// Inline value exists (e.g., -XGET, -Lotest.txt)
+							break
+						}
+						// No inline value (e.g., -Lo, -sX), next arg is the value
+						skipNextArg = true
+						break
+					}
+				}
+				continue
+			}
+
+			// Flag takes a value in the next argument
+			skipNextArg = true
 			continue
 		}
 
-		// Found an argument
+		// Found a non-flag argument - this is the URL/API path
 		return index, arg
 	}
 
-	// If reached here, didn't find an argument.
 	return -1, ""
 }