Merge remote-tracking branch 'upstream/dev' into cyclonedx

Author: attiasas

artifactory/utils/search.go

@@ -166,7 +166,18 @@ func SearchResultNoDate(reader *content.ContentReader) (contentReader *content.C
 	return
 }
 
+// SearchFiles performs a search operation using the provided spec files.
+// This is a wrapper around SearchFilesBySpecs for backward compatibility.
 func SearchFiles(servicesManager artifactory.ArtifactoryServicesManager, spec *spec.SpecFiles) (searchResults []*content.ContentReader, callbackFunc func() error, err error) {
+	return SearchFilesBySpecs(servicesManager, spec.Files)
+}
+
+// SearchFilesBySpecs performs a search operation using the provided file specifications.
+// It supports multiple source types including artifacts, packages, and release bundles.
+func SearchFilesBySpecs(servicesManager artifactory.ArtifactoryServicesManager, files []spec.File) (searchResults []*content.ContentReader, callbackFunc func() error, err error) {
+	if len(files) == 0 {
+		return nil, nil, errorutils.CheckErrorf("no files provided for search")
+	}
 	callbackFunc = func() error {
 		var errs error
 		for _, reader := range searchResults {
@@ -177,8 +188,8 @@ func SearchFiles(servicesManager artifactory.ArtifactoryServicesManager, spec *s
 
 	var curSearchParams services.SearchParams
 	var curReader *content.ContentReader
-	for i := 0; i < len(spec.Files); i++ {
-		curSearchParams, err = GetSearchParams(spec.Get(i))
+	for i := 0; i < len(files); i++ {
+		curSearchParams, err = GetSearchParams(&files[i])
 		if err != nil {
 			return
 		}

artifactory/utils/weblogin.go

@@ -35,17 +35,25 @@ func DoWebLogin(serverDetails *config.ServerDetails) (token auth.CommonTokenPara
 		return
 	}
 	log.Info("After logging in via your web browser, please enter the code if prompted: " + coreutils.PrintBoldTitle(uuidStr[len(uuidStr)-4:]))
-	if err = browser.OpenURL(clientUtils.AddTrailingSlashIfNeeded(serverDetails.Url) + "ui/login?jfClientSession=" + uuidStr + "&jfClientName=JFrog-CLI&jfClientCode=1"); err != nil {
-		return
+
+	loginUrl := clientUtils.AddTrailingSlashIfNeeded(serverDetails.Url) + "ui/login?jfClientSession=" + uuidStr + "&jfClientName=JFrog-CLI&jfClientCode=1"
+	log.Info("Please open the following URL in your browser to authenticate:")
+	log.Info(loginUrl)
+
+	// Attempt to open in browser if available
+	if err = browser.OpenURL(loginUrl); err != nil {
+		log.Warn("Failed to automatically open the browser. Please open the URL manually.")
+		// Do not return, continue the flow
 	}
+
 	time.Sleep(1 * time.Second)
 	log.Debug("Attempting to get the authentication token...")
 	token, err = accessManager.GetLoginAuthenticationToken(uuidStr)
 	if err != nil {
 		return
 	}
 	if token.AccessToken == "" {
-		return token, errorutils.CheckErrorf("failed getting authentication token after web log")
+		return token, errorutils.CheckErrorf("failed getting authentication token after web login")
 	}
 	log.Info("You're now logged in!")
 	return

common/spec/specfiles.go

@@ -7,6 +7,7 @@ import (
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
+	"strings"
 )
 
 type SpecFiles struct {
@@ -43,7 +44,10 @@ func CreateSpecFromBuildNameNumberAndProject(buildName, buildNumber, projectKey
 		return nil, errorutils.CheckErrorf("build name and build number must be provided")
 	}
 
-	buildString := buildName + "/" + buildNumber
+	escapedBuildName := strings.ReplaceAll(buildName, "/", "\\/")
+	escapedBuildNumber := strings.ReplaceAll(buildNumber, "/", "\\/")
+
+	buildString := escapedBuildName + "/" + escapedBuildNumber
 	specFile := &SpecFiles{
 		Files: []File{
 			{
@@ -89,6 +93,10 @@ type File struct {
 	Transitive              string
 	TargetPathInArchive     string
 	include                 []string
+	Package                 string `json:"package,omitempty"`
+	Version                 string `json:"version,omitempty"`
+	Type                    string `json:"type,omitempty"`
+	RepoKey                 string `json:"repoKey,omitempty"`
 }
 
 func (f File) GetInclude() []string {
@@ -213,6 +221,11 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec bool) error
 		isExplode, _ := file.IsExplode(false)
 		isBypassArchiveInspection, _ := file.IsBypassArchiveInspection(false)
 		isTransitive, _ := file.IsTransitive(false)
+		isPackage := len(file.Package) > 0
+		isVersion := len(file.Version) > 0
+		isType := len(file.Type) > 0
+		isRepoKey := len(file.RepoKey) > 0
+
 		if isPathMapping {
 			if !isAql {
 				return errorutils.CheckErrorf("pathMapping is supported only with aql")
@@ -230,11 +243,9 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec bool) error
 		if !isSearchBasedSpec && !isPattern {
 			return errorutils.CheckErrorf("spec must include a pattern")
 		}
-		if isBuild && isBundle {
-			return fileSpecValidationError("build", "bundle")
-		}
-		if isSearchBasedSpec && !isAql && !isPattern && !isBuild && !isBundle {
-			return errorutils.CheckErrorf("spec must include either aql, pattern, build or bundle")
+
+		if isSearchBasedSpec && !isAql && !isPattern && !isBuild && !isBundle && !isPackage {
+			return errorutils.CheckErrorf("spec must include either aql, pattern, build, bundle or package")
 		}
 		if isOffset {
 			if isBuild {
@@ -255,9 +266,6 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec bool) error
 				return fileSpecValidationError("bundle", "limit")
 			}
 		}
-		if isAql && isPattern {
-			return fileSpecValidationError("aql", "pattern")
-		}
 		if isAql && isExclusions {
 			return fileSpecValidationError("aql", "exclusions")
 		}
@@ -291,6 +299,11 @@ func ValidateSpec(files []File, isTargetMandatory, isSearchBasedSpec bool) error
 		if isBypassArchiveInspection && !isExplode {
 			return errorutils.CheckErrorf("spec cannot include 'bypass-archive-inspection' if 'explode' is not included")
 		}
+		if isPackage {
+			if !isVersion || !isType || !isRepoKey {
+				return errorutils.CheckErrorf("spec with type 'package' must include 'version', 'type' and 'repo_key'")
+			}
+		}
 	}
 	return nil
 }

common/spec/specfiles_test.go

@@ -45,4 +45,13 @@ func TestCreateSpecFromBuildNameAndNumber(t *testing.T) {
 		assert.Nil(t, spec)
 		assert.EqualError(t, err, "build name and build number must be provided")
 	})
+
+	t.Run("Build Name and Number with Slashes", func(t *testing.T) {
+		spec, err := CreateSpecFromBuildNameNumberAndProject("my/build/name", "1/2/3", "test")
+
+		assert.NoError(t, err)
+		assert.NotNil(t, spec)
+		assert.Equal(t, "my\\/build\\/name/1\\/2\\/3", spec.Files[0].Build)
+		assert.Equal(t, "test", spec.Files[0].Project)
+	})
 }

general/token/oidctokenexchange.go

@@ -191,6 +191,5 @@ func (otc *OidcTokenExchangeCommand) getOidcTokenParams() services.CreateOidcTok
 	oidcTokenParams.Repo = otc.Repository
 	oidcTokenParams.Audience = otc.Audience
 	oidcTokenParams.ProviderName = otc.ProviderName
-	oidcTokenParams.ProviderType = otc.ProviderType.String()
 	return oidcTokenParams
 }

go.mod

@@ -114,7 +114,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250619121353-6ff3439c999d
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250611113558-c1a092f216fd
 

go.sum

@@ -113,8 +113,8 @@ github.com/jfrog/build-info-go v1.10.14 h1:PWnw+rBwiQTHZ5q+84+E8MHFjtAQkB3+Oc2sK
 github.com/jfrog/build-info-go v1.10.14/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
 github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
 github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
-github.com/jfrog/jfrog-client-go v1.54.1 h1:IvobRCmwFS/HDht6Vv1JtGzPPytmOX3qS57hRC5fU98=
-github.com/jfrog/jfrog-client-go v1.54.1/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20250619121353-6ff3439c999d h1:0TNgRnYr92lmxC4my2P07MqaWmYBuLP/sgoCD5k/fhA=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20250619121353-6ff3439c999d/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

plugins/components/conversionlayer.go

@@ -44,6 +44,7 @@ func convertSubcommands(subcommands []Namespace, nameSpaces ...string) ([]cli.Co
 	for _, ns := range subcommands {
 		nameSpaceCommand := cli.Command{
 			Name:     ns.Name,
+			Aliases:  ns.Aliases,
 			Usage:    ns.Description,
 			Hidden:   ns.Hidden,
 			Category: ns.Category,

plugins/components/structure.go

@@ -30,6 +30,7 @@ func CreateEmbeddedApp(name string, commands []Command, namespaces ...Namespace)
 
 type Namespace struct {
 	Name        string
+	Aliases     []string
 	Description string
 	Hidden      bool
 	Category    string