Artifactory Command migration (#2936)

Author: fluxxBot

artifactory/cli.go

@@ -2,6 +2,7 @@ package artifactory
 
 import (
 	"bytes"
+	"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
 	"path/filepath"
 	"testing"
 
@@ -132,12 +133,12 @@ var createUploadConfigurationCases = []struct {
 	expectedDeb        string
 	expectedChunkSize  int64
 }{
-	{"empty", []string{}, cliutils.UploadMinSplitMb, cliutils.UploadSplitCount, commonCliUtils.Threads, "", cliutils.UploadChunkSizeMb},
-	{"min-split", []string{"min-split=101"}, 101, cliutils.UploadSplitCount, commonCliUtils.Threads, "", cliutils.UploadChunkSizeMb},
-	{"split-count", []string{"split-count=6"}, cliutils.UploadMinSplitMb, 6, commonCliUtils.Threads, "", cliutils.UploadChunkSizeMb},
-	{"threads", []string{"threads=6"}, cliutils.UploadMinSplitMb, cliutils.UploadSplitCount, 6, "", cliutils.UploadChunkSizeMb},
-	{"deb", []string{"deb=jammy/main/i386"}, cliutils.UploadMinSplitMb, cliutils.UploadSplitCount, commonCliUtils.Threads, "jammy/main/i386", cliutils.UploadChunkSizeMb},
-	{"chunk-size", []string{"chunk-size=123"}, cliutils.UploadMinSplitMb, cliutils.UploadSplitCount, commonCliUtils.Threads, "", 123},
+	{"empty", []string{}, flagkit.UploadMinSplitMb, flagkit.UploadSplitCount, commonCliUtils.Threads, "", flagkit.UploadChunkSizeMb},
+	{"min-split", []string{"min-split=101"}, 101, flagkit.UploadSplitCount, commonCliUtils.Threads, "", flagkit.UploadChunkSizeMb},
+	{"split-count", []string{"split-count=6"}, flagkit.UploadMinSplitMb, 6, commonCliUtils.Threads, "", flagkit.UploadChunkSizeMb},
+	{"threads", []string{"threads=6"}, flagkit.UploadMinSplitMb, flagkit.UploadSplitCount, 6, "", flagkit.UploadChunkSizeMb},
+	{"deb", []string{"deb=jammy/main/i386"}, flagkit.UploadMinSplitMb, flagkit.UploadSplitCount, commonCliUtils.Threads, "jammy/main/i386", flagkit.UploadChunkSizeMb},
+	{"chunk-size", []string{"chunk-size=123"}, flagkit.UploadMinSplitMb, flagkit.UploadSplitCount, commonCliUtils.Threads, "", 123},
 }
 
 func TestCreateUploadConfiguration(t *testing.T) {

artifactory/cli_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
 	"io"
 	"net"
 	"net/http"
@@ -40,7 +41,6 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/dependencies"
 	coretests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/jfrog/jfrog-cli/inttestutils"
-	"github.com/jfrog/jfrog-cli/utils/cliutils"
 	"github.com/jfrog/jfrog-cli/utils/tests"
 	cliproxy "github.com/jfrog/jfrog-cli/utils/tests/proxy/server"
 	"github.com/jfrog/jfrog-cli/utils/tests/proxy/server/certificate"
@@ -448,11 +448,11 @@ func TestArtifactoryDownloadPatternWithUnicodeChars(t *testing.T) {
 }
 
 func TestArtifactoryConcurrentDownload(t *testing.T) {
-	testArtifactoryDownload(cliutils.DownloadMinSplitKb*1000, t)
+	testArtifactoryDownload(flagkit.DownloadMinSplitKb*1000, t)
 }
 
 func TestArtifactoryBulkDownload(t *testing.T) {
-	testArtifactoryDownload(cliutils.DownloadMinSplitKb*1000-1, t)
+	testArtifactoryDownload(flagkit.DownloadMinSplitKb*1000-1, t)
 }
 
 func testArtifactoryDownload(fileSize int, t *testing.T) {

artifactory_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	coretests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/jfrog/jfrog-cli/inttestutils"
-	"github.com/jfrog/jfrog-cli/utils/cliutils"
 	"github.com/jfrog/jfrog-cli/utils/tests"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	rtutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
@@ -532,7 +531,7 @@ func TestArtifactoryPublishBuildInfoBuildUrl(t *testing.T) {
 	// jfrog-ignore - false positive not a real URL.
 	buildUrl := "http://example.ci.com"
 	// jfrog-ignore - false positive not a real URL.
-	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, cliutils.BuildUrl, "http://override-me.ci.com")
+	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, coreutils.BuildUrl, "http://override-me.ci.com")
 	defer setEnvCallBack()
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
 
@@ -555,7 +554,7 @@ func TestArtifactoryPublishBuildInfoBuildUrlFromEnv(t *testing.T) {
 	// jfrog-ignore - false positive not a real URL.
 	buildUrl := "http://example-env.ci.com"
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
-	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, cliutils.BuildUrl, buildUrl)
+	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, coreutils.BuildUrl, buildUrl)
 	defer setEnvCallBack()
 	bi, err := uploadFilesAndGetBuildInfo(t, tests.RtBuildName1, buildNumber, "")
 	if err != nil {