Artifactory Release Lifecycle Management - Add Import bundle command

docs/lifecycle/importbundle/help.go

@@ -0,0 +1,13 @@
+package importbundle
+
+var Usage = []string{"rbi [command options] <path to bundle>"}
+
+func GetDescription() string {
+	return "Import a Release Bundle archive"
+}
+
+func GetArguments() string {
+	return `	path to bundle
+		Path for the desired imported bundle
+`
+}

go.mod

@@ -137,9 +137,9 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240320104952-b5807fd0102d
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240320111241-791602b8384c
 
-replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240320102352-af2f392bb490
+replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.1-0.20240320110623-caee2e79e94b
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
 

go.sum

@@ -78,6 +78,10 @@ github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdf
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240320111241-791602b8384c h1:RhpxHS2taMNKidLT8HkK0nybh5a6+Wp5bDa1hhqdCVo=
+github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240320111241-791602b8384c/go.mod h1:zFSoWiE3TulQvpOA222I2IhccOjjJ6C80sPzYnG2Cng=
+github.com/eyaldelarea/jfrog-client-go v1.28.1-0.20240320110623-caee2e79e94b h1:8jtFK0maAqV+bGn8Iv2I22AmRvJzNkEJ9xkdHthwSS0=
+github.com/eyaldelarea/jfrog-client-go v1.28.1-0.20240320110623-caee2e79e94b/go.mod h1:8z6in1qalzL1DqchUCrDKVgz2gKoPRhJpzm2Ww+VWYI=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ=
@@ -135,12 +139,8 @@ github.com/jfrog/gofrog v1.6.3 h1:F7He0+75HcgCe6SGTSHLFCBDxiE2Ja0tekvvcktW6wc=
 github.com/jfrog/gofrog v1.6.3/go.mod h1:SZ1EPJUruxrVGndOzHd+LTiwWYKMlHqhKD+eu+v5Hqg=
 github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
-github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240320104952-b5807fd0102d h1:DEMgTYNfXlJbrTjBWOJo1twLGTztJJ26RFZhL6J1u/Q=
-github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240320104952-b5807fd0102d/go.mod h1:XZP7fmNBBoieQTUE2p2mvA8h/CFO5z4PE7KW1s2cdNk=
 github.com/jfrog/jfrog-cli-security v1.0.4 h1:wJwvpaozhzvMCwJA/puU5jQCnjFPqMUeZAntndgYuB0=
 github.com/jfrog/jfrog-cli-security v1.0.4/go.mod h1:jtRSzr/E2s7LnwUzKX5w4vtJxHFHCKGmuo8qm8HSy2o=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20240320102352-af2f392bb490 h1:oGgwRJatirSNZyqO3e4FtHCe5W30VNgULCW/GYhHdao=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20240320102352-af2f392bb490/go.mod h1:8z6in1qalzL1DqchUCrDKVgz2gKoPRhJpzm2Ww+VWYI=
 github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI=
 github.com/jszwec/csvutil v1.10.0/go.mod h1:/E4ONrmGkwmWsk9ae9jpXnv9QT8pLHEPcCirMFhxG9I=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

lifecycle/cli.go

@@ -15,6 +15,7 @@ import (
 	rbDeleteRemote "github.com/jfrog/jfrog-cli/docs/lifecycle/deleteremote"
 	rbDistribute "github.com/jfrog/jfrog-cli/docs/lifecycle/distribute"
 	rbExport "github.com/jfrog/jfrog-cli/docs/lifecycle/export"
+	rbImport "github.com/jfrog/jfrog-cli/docs/lifecycle/importbundle"
 	rbPromote "github.com/jfrog/jfrog-cli/docs/lifecycle/promote"
 	"github.com/jfrog/jfrog-cli/utils/cliutils"
 	"github.com/jfrog/jfrog-cli/utils/distribution"
@@ -102,6 +103,18 @@ func GetCommands() []cli.Command {
 			Category:     lcCategory,
 			Action:       deleteRemote,
 		},
+		{
+			Name:         "release-bundle-import",
+			Aliases:      []string{"rbi"},
+			Flags:        cliutils.GetCommandFlags(cliutils.ReleaseBundleImport),
+			Usage:        rbImport.GetDescription(),
+			HelpName:     coreCommon.CreateUsage("rbi", rbImport.GetDescription(), rbImport.Usage),
+			UsageText:    rbImport.GetArguments(),
+			ArgsUsage:    common.CreateEnvVars(),
+			BashComplete: coreCommon.CreateBashCompletionFunc(),
+			Category:     lcCategory,
+			Action:       releaseBundleImport,
+		},
 	})
 }
 
@@ -296,6 +309,22 @@ func export(c *cli.Context) error {
 	return commands.Exec(exportCmd)
 }
 
+func releaseBundleImport(c *cli.Context) error {
+	lcDetails, err := createLifecycleDetailsByFlags(c)
+	if err != nil {
+		return err
+	}
+	importCmd := lifecycle.NewReleaseBundleImportCommand()
+	if err != nil {
+		return err
+	}
+	importCmd.
+		SetServerDetails(lcDetails).
+		SetFilepath(c.Args().Get(0))
+
+	return commands.Exec(importCmd)
+}
+
 func validateDistributeCommand(c *cli.Context) error {
 	if err := distribution.ValidateReleaseBundleDistributeCmd(c); err != nil {
 		return err

lifecycle_test.go

@@ -148,6 +148,9 @@ func TestLifecycleFullFlow(t *testing.T) {
 	exportRb(t, tests.LcRbName2, number2, tempDir)
 	defer deleteExportedReleaseBundle(t, tests.LcRbName2)
 
+	// Test import
+	importRb(t, tests.LcRbName2, number2)
+
 	// TODO Temporarily disabling till distribution on testing suite is stable.
 	/*
 		distributeRb(t)
@@ -446,6 +449,19 @@ func sendGpgKeyPair() {
 	coreutils.ExitOnErr(errorutils.CheckResponseStatusWithBody(resp, body, http.StatusCreated))
 }
 
+func importRb(t *testing.T, rbName, rbVersion string) {
+	wd, err := os.Getwd()
+	assert.NoError(t, err)
+	exportedFileName := rbName + "-" + rbVersion + ".zip"
+	exportedFilePath := path.Join(wd, rbName, rbVersion, exportedFileName)
+	output := lcCli.RunCliCmdWithOutput(t, "rbi", exportedFilePath)
+	var importResp string
+	if !assert.NoError(t, json.Unmarshal([]byte(output), &importResp)) {
+		return
+	}
+	assert.Equal(t, "", importResp)
+}
+
 type KeyPairPayload struct {
 	PairName   string `json:"pairName,omitempty"`
 	PairType   string `json:"pairType,omitempty"`

utils/cliutils/commandsflags.go

@@ -124,6 +124,7 @@ const (
 	ReleaseBundleDeleteLocal  = "release-bundle-delete-local"
 	ReleaseBundleDeleteRemote = "release-bundle-delete-remote"
 	ReleaseBundleExport       = "release-bundle-export"
+	ReleaseBundleImport       = "release-bundle-import"
 
 	// Access Token Create commands keys
 	AccessTokenCreate = "access-token-create"
@@ -2024,6 +2025,9 @@ var commandFlags = map[string][]string{
 		platformUrl, user, password, accessToken, serverId, lcPathMappingTarget, lcPathMappingPattern, Project,
 		downloadMinSplit, downloadSplitCount,
 	},
+	ReleaseBundleImport: {
+		user, password, accessToken, serverId, lcDryRun,
+	},
 	// Mission Control's commands
 	McConfig: {
 		mcUrl, mcAccessToken, mcInteractive,