Merge branch 'main' into add-workflow-to-trigger-integration-tests

Author: reshmifrog

artifactory/commands/generic/upload.go

@@ -122,7 +122,7 @@ func (uc *UploadCommand) upload() (err error) {
 		file.Props += syncDeletesProp
 		// Add CI VCS properties if in CI environment (respects user precedence)
 		file.TargetProps = civcs.MergeWithUserProps(file.TargetProps)
-		uploadParams, err := getUploadParams(file, uc.uploadConfiguration, buildProps, addVcsProps)
+		uploadParams, err := getUploadParams(file, uc.uploadConfiguration, buildProps, addVcsProps, uc.DryRun())
 		if err != nil {
 			errorOccurred = true
 			log.Error(err)
@@ -202,7 +202,7 @@ func (uc *UploadCommand) upload() (err error) {
 	return
 }
 
-func getUploadParams(f *spec.File, configuration *utils.UploadConfiguration, buildProps string, addVcsProps bool) (uploadParams services.UploadParams, err error) {
+func getUploadParams(f *spec.File, configuration *utils.UploadConfiguration, buildProps string, addVcsProps bool, dryRun bool) (uploadParams services.UploadParams, err error) {
 	uploadParams = services.NewUploadParams()
 	uploadParams.CommonParams, err = f.ToCommonParams()
 	if err != nil {
@@ -233,11 +233,15 @@ func getUploadParams(f *spec.File, configuration *utils.UploadConfiguration, bui
 		return
 	}
 
-	uploadParams.IncludeDirs, err = f.IsIncludeDirs(false)
+	includeDirs, err := f.IsIncludeDirs(false)
 	if err != nil {
 		return
 	}
 
+	// Disable IncludeDirs in dry-run mode to prevent directory structure creation
+	uploadParams.IncludeDirs = includeDirs && !dryRun
+	log.Debug("In Dry-run mode, include-dir flag will be ignored.")
+
 	uploadParams.Flat, err = f.IsFlat(true)
 	if err != nil {
 		return

cliutils/cmddefs/commands.go

@@ -10,6 +10,7 @@ const (
 
 	// Lifecycle Commands
 	ReleaseBundleCreate       = "release-bundle-create"
+	ReleaseBundleUpdate       = "release-bundle-update"
 	ReleaseBundlePromote      = "release-bundle-promote"
 	ReleaseBundleDistribute   = "release-bundle-distribute"
 	ReleaseBundleDeleteLocal  = "release-bundle-delete-local"

cliutils/flagkit/flags.go

@@ -490,6 +490,8 @@ const (
 	lcDeleteProperties       = lifecyclePrefix + DeleteProperty
 	SourceTypeReleaseBundles = "source-type-release-bundles"
 	SourceTypeBuilds         = "source-type-builds"
+	Draft                    = "draft"
+	AddSources               = "add"
 )
 
 var commandFlags = map[string][]string{
@@ -515,7 +517,11 @@ var commandFlags = map[string][]string{
 	},
 	cmddefs.ReleaseBundleCreate: {
 		platformUrl, user, password, accessToken, serverId, lcSigningKey, lcSync, lcProject, lcBuilds, lcReleaseBundles,
-		specFlag, specVars, BuildName, BuildNumber, SourceTypeReleaseBundles, SourceTypeBuilds,
+		specFlag, specVars, BuildName, BuildNumber, SourceTypeReleaseBundles, SourceTypeBuilds, Draft,
+	},
+	cmddefs.ReleaseBundleUpdate: {
+		platformUrl, user, password, accessToken, serverId, lcSync, lcProject,
+		specFlag, specVars, SourceTypeReleaseBundles, SourceTypeBuilds, AddSources,
 	},
 	cmddefs.ReleaseBundlePromote: {
 		platformUrl, user, password, accessToken, serverId, lcSigningKey, lcSync, lcProject, lcIncludeRepos,
@@ -1103,6 +1109,8 @@ var flagsMap = map[string]components.Flag{
 	lcDeleteProperties:       components.NewStringFlag(DeleteProperty, "Properties to be deleted on the of Manifest Release Bundle version.", components.SetMandatoryFalse()),
 	SourceTypeReleaseBundles: components.NewStringFlag(SourceTypeReleaseBundles, "List of semicolon-seperated(;) release bundles in the form of 'name=releaseBundleName1, version=version1; name=releaseBundleName2, version=version2' to be included in the new bundle.", components.SetMandatoryFalse()),
 	SourceTypeBuilds:         components.NewStringFlag(SourceTypeBuilds, "List of semicolon-separated(;) builds in the form of 'name=buildName1, id=runID1, include-deps=true; name=buildName2, id=runID2' to be included in the new bundle.", components.SetMandatoryFalse()),
+	Draft:                    components.NewBoolFlag(Draft, "Set to true to create the release bundle as a draft. A draft release bundle can be updated and finalized later.", components.WithBoolDefaultValueFalse()),
+	AddSources:               components.NewBoolFlag(AddSources, "Add sources to an existing draft release bundle.", components.WithBoolDefaultValueFalse()),
 }
 
 func GetCommandFlags(cmdKey string) []components.Flag {

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/jfrog/build-info-go v1.13.1-0.20260119231731-3cc4a0771bbd
 	github.com/jfrog/gofrog v1.7.6
 	github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b
-	github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23
+	github.com/jfrog/jfrog-client-go v1.55.1-0.20260128141727-bd34d78a3e48
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/viper v1.21.0
 	github.com/stretchr/testify v1.11.1

go.sum

@@ -168,8 +168,8 @@ 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-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b h1:gGGmYXuYvcNns1BnLQI13lC+pgMxrmenx+ramtolQuA=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b/go.mod h1:+Hnaikp/xCSPD/q7txxRy4Zc0wzjW/usrCSf+6uONSQ=
-github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23 h1:tL4NUrnSiFN6MeK27z96ehiKXhYZDY2DyH95ogNRHrY=
-github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
+github.com/jfrog/jfrog-client-go v1.55.1-0.20260128141727-bd34d78a3e48 h1:HY4b9DsUe0Lox1rScYHKmfIZY9PQvy0kfkOefqc/QdQ=
+github.com/jfrog/jfrog-client-go v1.55.1-0.20260128141727-bd34d78a3e48/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=

lifecycle/cli.go

@@ -3,12 +3,13 @@ package lifecycle
 import (
 	"errors"
 	"fmt"
-	"github.com/jfrog/jfrog-cli-artifactory/artifactory/cli"
-	rbsearch "github.com/jfrog/jfrog-cli-artifactory/lifecycle/docs/rbsearch"
 	"os"
 	"strconv"
 	"strings"
 
+	"github.com/jfrog/jfrog-cli-artifactory/artifactory/cli"
+	rbsearch "github.com/jfrog/jfrog-cli-artifactory/lifecycle/docs/rbsearch"
+
 	"github.com/jfrog/jfrog-cli-artifactory/cliutils/cmddefs"
 	"github.com/jfrog/jfrog-cli-artifactory/cliutils/distribution"
 	"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
@@ -21,6 +22,7 @@ import (
 	rbExport "github.com/jfrog/jfrog-cli-artifactory/lifecycle/docs/export"
 	rbImport "github.com/jfrog/jfrog-cli-artifactory/lifecycle/docs/importbundle"
 	rbPromote "github.com/jfrog/jfrog-cli-artifactory/lifecycle/docs/promote"
+	rbUpdate "github.com/jfrog/jfrog-cli-artifactory/lifecycle/docs/update"
 	artifactoryUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
 	"github.com/jfrog/jfrog-cli-core/v2/common/commands"
@@ -51,6 +53,15 @@ func GetCommands() []components.Command {
 			Category:    lcCategory,
 			Action:      create,
 		},
+		{
+			Name:        cmddefs.ReleaseBundleUpdate,
+			Aliases:     []string{"rbu"},
+			Flags:       flagkit.GetCommandFlags(cmddefs.ReleaseBundleUpdate),
+			Description: rbUpdate.GetDescription(),
+			Arguments:   rbUpdate.GetArguments(),
+			Category:    lcCategory,
+			Action:      update,
+		},
 		{
 			Name:        "release-bundle-promote",
 			Aliases:     []string{"rbp"},
@@ -230,7 +241,7 @@ func create(c *components.Context) (err error) {
 	}
 	createCmd := lifecycle.NewReleaseBundleCreateCommand().SetServerDetails(lcDetails).SetReleaseBundleName(c.GetArgumentAt(0)).
 		SetReleaseBundleVersion(c.GetArgumentAt(1)).SetSigningKeyName(c.GetStringFlagValue(flagkit.SigningKey)).
-		SetSync(c.GetBoolFlagValue(flagkit.Sync)).
+		SetSync(c.GetBoolFlagValue(flagkit.Sync)).SetDraft(c.GetBoolFlagValue(flagkit.Draft)).
 		SetReleaseBundleProject(pluginsCommon.GetProject(c)).SetSpec(creationSpec).
 		SetBuildsSpecPath(c.GetStringFlagValue(flagkit.Builds)).SetReleaseBundlesSpecPath(c.GetStringFlagValue(flagkit.ReleaseBundles))
 
@@ -244,6 +255,63 @@ func create(c *components.Context) (err error) {
 	return commands.Exec(createCmd)
 }
 
+func validateUpdateReleaseBundleContext(c *components.Context) error {
+	if show, err := pluginsCommon.ShowCmdHelpIfNeeded(c, c.Arguments); show || err != nil {
+		return err
+	}
+
+	if len(c.Arguments) != 2 {
+		return pluginsCommon.WrongNumberOfArgumentsHandler(c)
+	}
+
+	// Check that an operation flag is provided (--add is mandatory)
+	if !c.GetBoolFlagValue(flagkit.AddSources) {
+		return errorutils.CheckErrorf("at least one operation flag must be provided: --%s", flagkit.AddSources)
+	}
+
+	// Check that at least one source method is provided
+	hasSpec := c.IsFlagSet("spec")
+	hasSourceTypeFlags := c.IsFlagSet(flagkit.SourceTypeReleaseBundles) || c.IsFlagSet(flagkit.SourceTypeBuilds)
+
+	if !hasSpec && !hasSourceTypeFlags {
+		return errorutils.CheckErrorf("either --spec or source type flags (--%s, --%s) must be provided",
+			flagkit.SourceTypeReleaseBundles, flagkit.SourceTypeBuilds)
+	}
+
+	return nil
+}
+
+func update(c *components.Context) (err error) {
+	if err = validateUpdateReleaseBundleContext(c); err != nil {
+		return err
+	}
+
+	lcDetails, err := createLifecycleDetailsByFlags(c)
+	if err != nil {
+		return
+	}
+
+	var updateSpec *speccore.SpecFiles
+	if c.IsFlagSet("spec") {
+		updateSpec, err = commonCliUtils.GetSpec(c, true, false)
+		if err != nil {
+			return
+		}
+	}
+
+	updateCmd := lifecycle.NewReleaseBundleUpdateCommand().
+		SetServerDetails(lcDetails).
+		SetReleaseBundleName(c.GetArgumentAt(0)).
+		SetReleaseBundleVersion(c.GetArgumentAt(1)).
+		SetReleaseBundleProject(pluginsCommon.GetProject(c)).
+		SetSpec(updateSpec).
+		SetSync(c.GetBoolFlagValue(flagkit.Sync)).
+		SetReleaseBundlesSources(c.GetStringFlagValue(flagkit.SourceTypeReleaseBundles)).
+		SetBuildsSources(c.GetStringFlagValue(flagkit.SourceTypeBuilds))
+
+	return commands.Exec(updateCmd)
+}
+
 // the function validates that the current artifactory version supports multiple source feature
 func multipleSourcesSupported(c *components.Context) error {
 	lcDetails, err := createLifecycleDetailsByFlags(c)