diff --git a/Jenkinsfile b/Jenkinsfile index 0dd478a19..15be70f56 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ node("docker-ubuntu20-xlarge") { repo = 'jfrog-cli' sh 'rm -rf temp' sh 'mkdir temp' - def goRoot = tool 'go-1.24.6' + def goRoot = tool 'go-1.25.4' env.GOROOT="$goRoot" env.PATH+=":${goRoot}/bin:/tmp/node-${nodeVersion}-linux-x64/bin" env.GO111MODULE="on" diff --git a/README.md b/README.md index 5906a51bf..7f009b707 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Scanned by Frogbot](https://raw.github.com/jfrog/frogbot/master/images/frogbot-badge.svg)](https://github.com/jfrog/frogbot#readme) [![Go Report Card](https://goreportcard.com/badge/github.com/jfrog/jfrog-cli)](https://goreportcard.com/report/github.com/jfrog/jfrog-cli) [![license](https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/jfrog/jfrog-cli/master/LICENSE) [![](https://img.shields.io/badge/Docs-%F0%9F%93%96-blue)](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli) -[![Go version](https://img.shields.io/github/go-mod/go-version/jfrog/jfrog-cli)](https://tip.golang.org/doc/go1.24) +[![Go version](https://img.shields.io/github/go-mod/go-version/jfrog/jfrog-cli)](https://tip.golang.org/doc/go1.25) diff --git a/artifactory/cli.go b/artifactory/cli.go index 47441842e..36187bdb9 100644 --- a/artifactory/cli.go +++ b/artifactory/cli.go @@ -70,7 +70,6 @@ import ( "github.com/jfrog/jfrog-cli/utils/cliutils" "github.com/jfrog/jfrog-client-go/artifactory/services" clientutils "github.com/jfrog/jfrog-client-go/utils" - utilsForLC "github.com/jfrog/jfrog-client-go/utils" "github.com/jfrog/jfrog-client-go/utils/errorutils" "github.com/jfrog/jfrog-client-go/utils/log" "github.com/jszwec/csvutil" @@ -561,7 +560,7 @@ func prepareDownloadCommand(c *cli.Context) (*spec.SpecFiles, error) { if c.NArg() > 0 && c.IsSet("spec") { return nil, cliutils.PrintHelpAndReturnError("No arguments should be sent when the spec option is used.", c) } - if !(c.NArg() == 1 || c.NArg() == 2 || (c.NArg() == 0 && (c.IsSet("spec") || c.IsSet("build") || c.IsSet("bundle")))) { + if c.NArg() != 1 && c.NArg() != 2 && (c.NArg() != 0 || (!c.IsSet("spec") && !c.IsSet("build") && !c.IsSet("bundle"))) { return nil, cliutils.WrongNumberOfArgumentsHandler(c) } @@ -620,16 +619,16 @@ func createLifecycleDetailsByFlags(c *cli.Context) (*coreConfig.ServerDetails, e func PlatformToLifecycleUrls(lcDetails *coreConfig.ServerDetails) { // For tests only. in prod - this "if" will always return false if strings.Contains(lcDetails.Url, "artifactory/") { - lcDetails.ArtifactoryUrl = utilsForLC.AddTrailingSlashIfNeeded(lcDetails.Url) + lcDetails.ArtifactoryUrl = clientutils.AddTrailingSlashIfNeeded(lcDetails.Url) lcDetails.LifecycleUrl = strings.Replace( - utilsForLC.AddTrailingSlashIfNeeded(lcDetails.Url), + clientutils.AddTrailingSlashIfNeeded(lcDetails.Url), "artifactory/", "lifecycle/", 1, ) } else { - lcDetails.ArtifactoryUrl = utilsForLC.AddTrailingSlashIfNeeded(lcDetails.Url) + "artifactory/" - lcDetails.LifecycleUrl = utilsForLC.AddTrailingSlashIfNeeded(lcDetails.Url) + "lifecycle/" + lcDetails.ArtifactoryUrl = clientutils.AddTrailingSlashIfNeeded(lcDetails.Url) + "artifactory/" + lcDetails.LifecycleUrl = clientutils.AddTrailingSlashIfNeeded(lcDetails.Url) + "lifecycle/" } lcDetails.Url = "" } @@ -638,7 +637,7 @@ func prepareCopyMoveCommand(c *cli.Context) (*spec.SpecFiles, error) { if c.NArg() > 0 && c.IsSet("spec") { return nil, cliutils.PrintHelpAndReturnError("No arguments should be sent when the spec option is used.", c) } - if !(c.NArg() == 2 || (c.NArg() == 0 && (c.IsSet("spec")))) { + if c.NArg() != 2 && (c.NArg() != 0 || !c.IsSet("spec")) { return nil, cliutils.WrongNumberOfArgumentsHandler(c) } @@ -663,7 +662,7 @@ func prepareDeleteCommand(c *cli.Context) (*spec.SpecFiles, error) { if c.NArg() > 0 && c.IsSet("spec") { return nil, cliutils.PrintHelpAndReturnError("No arguments should be sent when the spec option is used.", c) } - if !(c.NArg() == 1 || (c.NArg() == 0 && (c.IsSet("spec") || c.IsSet("build") || c.IsSet("bundle")))) { + if c.NArg() != 1 && (c.NArg() != 0 || (!c.IsSet("spec") && !c.IsSet("build") && !c.IsSet("bundle"))) { return nil, cliutils.WrongNumberOfArgumentsHandler(c) } @@ -688,7 +687,7 @@ func prepareSearchCommand(c *cli.Context) (*spec.SpecFiles, error) { if c.NArg() > 0 && c.IsSet("spec") { return nil, cliutils.PrintHelpAndReturnError("No arguments should be sent when the spec option is used.", c) } - if !(c.NArg() == 1 || (c.NArg() == 0 && (c.IsSet("spec") || c.IsSet("build") || c.IsSet("bundle")))) { + if c.NArg() != 1 && (c.NArg() != 0 || (!c.IsSet("spec") && !c.IsSet("build") && !c.IsSet("bundle"))) { return nil, cliutils.WrongNumberOfArgumentsHandler(c) } @@ -713,7 +712,7 @@ func preparePropsCmd(c *cli.Context) (*generic.PropsCommand, error) { if c.NArg() > 1 && c.IsSet("spec") { return nil, cliutils.PrintHelpAndReturnError("Only the 'artifact properties' argument should be sent when the spec option is used.", c) } - if !(c.NArg() == 2 || (c.NArg() == 1 && (c.IsSet("spec") || c.IsSet("build") || c.IsSet("bundle")))) { + if c.NArg() != 2 && (c.NArg() != 1 || (!c.IsSet("spec") && !c.IsSet("build") && !c.IsSet("bundle"))) { return nil, cliutils.WrongNumberOfArgumentsHandler(c) } diff --git a/artifactorybulkrepository_test.go b/artifactorybulkrepository_test.go index 4d2f2c804..905668471 100644 --- a/artifactorybulkrepository_test.go +++ b/artifactorybulkrepository_test.go @@ -2,9 +2,10 @@ package main import ( "fmt" + "testing" + "github.com/jfrog/jfrog-cli/utils/tests" "github.com/stretchr/testify/assert" - "testing" ) func TestRepositoryCreateAndUpdateIntegration(t *testing.T) { @@ -100,6 +101,8 @@ func testMultipleRepositoryUpdate(t *testing.T) { } func testCreateWithDifferentRclass(t *testing.T) { + t.Skip("RTECO-525 - Skipping testCreateWithDifferentRclass") + mvnRepoName := "test-mvn-local1" dockerLocalRepoName := "test-docker-local1" npmRepoName := "test-npm-local" @@ -131,6 +134,8 @@ func testCreateWithDifferentRclass(t *testing.T) { } func testUpdateWithDifferentRclass(t *testing.T) { + t.Skip("RTECO-525 - Skipping testUpdateWithDifferentRclass") + mvnRepoName := "test-mvn-local-1" dockerLocalRepoName := "test-docker-local-1" npmRepoName := "test-npm-local" diff --git a/build/docker/full/Dockerfile b/build/docker/full/Dockerfile index 86fc91b66..0aa50b8cd 100644 --- a/build/docker/full/Dockerfile +++ b/build/docker/full/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.24 as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.25 as builder ARG image_name=jfrog-cli-full ARG cli_executable_name WORKDIR /${image_name} diff --git a/build/docker/slim/Dockerfile b/build/docker/slim/Dockerfile index 31aee0d06..99d6f2ae6 100644 --- a/build/docker/slim/Dockerfile +++ b/build/docker/slim/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.24.6-alpine as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.25.4-alpine as builder ARG image_name=jfrog-cli ARG cli_executable_name WORKDIR /${image_name} diff --git a/buildinfo_test.go b/buildinfo_test.go index 135e38ca7..897e0f80e 100644 --- a/buildinfo_test.go +++ b/buildinfo_test.go @@ -331,8 +331,8 @@ func TestBuildAppend(t *testing.T) { assert.Equal(t, buildinfo.Build, partials[0].ModuleType) assert.NotZero(t, partials[0].Timestamp) assert.NotNil(t, partials[0].Checksum) - assert.NotZero(t, partials[0].Checksum.Md5) - assert.NotZero(t, partials[0].Checksum.Sha1) + assert.NotZero(t, partials[0].Md5) + assert.NotZero(t, partials[0].Sha1) // Publish build RtBuildName2/buildNumber2 runRt(t, "bp", tests.RtBuildName2, buildNumber2) diff --git a/buildtools/cli.go b/buildtools/cli.go index c98722709..082af5afb 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -1090,7 +1090,7 @@ func npmGenericCmd(c *cli.Context, cmdName string, collectBuildInfoIfRequested b if err != nil { return err } - npmCmd.SetConfigFilePath(configFilePath).CommonArgs.SetNpmArgs(args) + npmCmd.SetConfigFilePath(configFilePath).SetNpmArgs(args) if err = npmCmd.Init(); err != nil { return err } diff --git a/go.mod b/go.mod index 066a34779..ad36eec28 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jfrog/jfrog-cli -go 1.24.6 +go 1.25.4 replace ( // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) diff --git a/ide_test.go b/ide_test.go index c9b6a62d6..d8631787d 100644 --- a/ide_test.go +++ b/ide_test.go @@ -119,7 +119,9 @@ func TestVscodeAutoDetection(t *testing.T) { // Set environment to point to our mock installation originalPATH := os.Getenv("PATH") - defer os.Setenv("PATH", originalPATH) + defer func() { + _ = os.Setenv("PATH", originalPATH) + }() // Note: This is a simplified test - real auto-detection would need more complex mocking // The actual command would attempt auto-detection, but we're testing with an explicit path diff --git a/main_test.go b/main_test.go index c7b7c4d66..8feeee219 100644 --- a/main_test.go +++ b/main_test.go @@ -148,7 +148,7 @@ func prepareHomeDir(t *testing.T) (string, string) { } func cleanTestsHomeEnv() { - os.Unsetenv(coreutils.HomeDir) + _ = os.Unsetenv(coreutils.HomeDir) tests.CleanFileSystem() } diff --git a/maven_test.go b/maven_test.go index 26a523b91..4c282e539 100644 --- a/maven_test.go +++ b/maven_test.go @@ -132,7 +132,7 @@ func TestMavenBuildWithFlexPackBuildInfo(t *testing.T) { assert.NotEmpty(t, dep.Type, "Dependency should have type") assert.NotEmpty(t, dep.Scopes, "Dependency should have scopes") // FlexPack should provide checksums - hasChecksum := dep.Checksum.Sha1 != "" || dep.Checksum.Sha256 != "" || dep.Checksum.Md5 != "" + hasChecksum := dep.Sha1 != "" || dep.Sha256 != "" || dep.Md5 != "" assert.True(t, hasChecksum, "Dependency %s should have at least one checksum", dep.Id) } diff --git a/metrics_visibility_test.go b/metrics_visibility_test.go index af41212fa..37ac17f82 100644 --- a/metrics_visibility_test.go +++ b/metrics_visibility_test.go @@ -43,7 +43,9 @@ func startMockServer(t *testing.T) (*httptest.Server, chan capturedRequest) { _, _ = w.Write([]byte("OK")) }) handler.HandleFunc("/jfconnect/api/v1/backoffice/metrics/log", func(w http.ResponseWriter, r *http.Request) { - defer r.Body.Close() + defer func() { + _ = r.Body.Close() + }() body, _ := io.ReadAll(r.Body) ch <- capturedRequest{Method: r.Method, Path: r.URL.Path, Body: body} w.WriteHeader(http.StatusCreated) @@ -67,7 +69,9 @@ func startVisMockServer(t *testing.T) (*httptest.Server, chan visReq) { _, _ = w.Write([]byte("OK")) }) mux.HandleFunc("/jfconnect/api/v1/backoffice/metrics/log", func(w http.ResponseWriter, r *http.Request) { - defer r.Body.Close() + defer func() { + _ = r.Body.Close() + }() b, _ := io.ReadAll(r.Body) ch <- visReq{Method: r.Method, Path: r.URL.Path, Body: b} w.WriteHeader(http.StatusCreated) diff --git a/npm_test.go b/npm_test.go index 7757a183f..80a44a421 100644 --- a/npm_test.go +++ b/npm_test.go @@ -295,7 +295,9 @@ func addNpmScopeRegistryToNpmRc(t *testing.T, projectPath string, packageJsonPat npmrcFilePath := filepath.Join(projectPath, ".npmrc") npmrcFile, err := os.OpenFile(npmrcFilePath, os.O_APPEND|os.O_WRONLY, 0644) assert.NoError(t, err) - defer npmrcFile.Close() + defer func() { + _ = npmrcFile.Close() + }() _, err = npmrcFile.WriteString(scopedRegistry) assert.NoError(t, err) } diff --git a/pip_test.go b/pip_test.go index a59a6b000..4303aaeea 100644 --- a/pip_test.go +++ b/pip_test.go @@ -106,11 +106,11 @@ func TestPipDepsCacheOutput(t *testing.T) { pkgName, expectedDep.Id, generatedDep.Id) // Compare checksums - assert.Equal(t, expectedDep.Checksum.Sha1, generatedDep.Checksum.Sha1, + assert.Equal(t, expectedDep.Sha1, generatedDep.Sha1, "Package %s SHA1 mismatch", pkgName) - assert.Equal(t, expectedDep.Checksum.Sha256, generatedDep.Checksum.Sha256, + assert.Equal(t, expectedDep.Sha256, generatedDep.Sha256, "Package %s SHA256 mismatch", pkgName) - assert.Equal(t, expectedDep.Checksum.Md5, generatedDep.Checksum.Md5, + assert.Equal(t, expectedDep.Md5, generatedDep.Md5, "Package %s MD5 mismatch", pkgName) } diff --git a/poetry_buildinfo_integration_test.go b/poetry_buildinfo_integration_test.go index 5d00ef246..85cd009c1 100644 --- a/poetry_buildinfo_integration_test.go +++ b/poetry_buildinfo_integration_test.go @@ -21,7 +21,9 @@ func TestPoetryBuildInfoCLIIntegration(t *testing.T) { // Setup test environment tempDir := setupPoetryTestProject(t) - defer os.RemoveAll(tempDir) + defer func() { + _ = os.RemoveAll(tempDir) + }() // Change to test directory originalDir, err := os.Getwd() @@ -61,7 +63,9 @@ func TestPoetryBuildInfoCLIIntegration(t *testing.T) { // Set environment for native implementation err := os.Setenv("JFROG_RUN_NATIVE", "true") require.NoError(t, err) - defer os.Unsetenv("JFROG_RUN_NATIVE") + defer func() { + _ = os.Unsetenv("JFROG_RUN_NATIVE") + }() // Test build info collection (simulating jf poetry publish --build-name --build-number) buildInfo := collectPoetryBuildInfoForTest(t, tc.buildName, tc.buildNumber) @@ -85,7 +89,9 @@ func TestPoetryBuildInfoWithoutNativeFlag(t *testing.T) { } tempDir := setupPoetryTestProject(t) - defer os.RemoveAll(tempDir) + defer func() { + _ = os.RemoveAll(tempDir) + }() originalDir, err := os.Getwd() require.NoError(t, err) @@ -99,7 +105,7 @@ func TestPoetryBuildInfoWithoutNativeFlag(t *testing.T) { require.NoError(t, err) // Ensure JFROG_RUN_NATIVE is not set - os.Unsetenv("JFROG_RUN_NATIVE") + _ = os.Unsetenv("JFROG_RUN_NATIVE") // Test that Poetry commands still work (fallback to existing implementation) // This ensures we don't break existing functionality @@ -118,7 +124,9 @@ func TestPoetryTreeParsingRobustness(t *testing.T) { } tempDir := setupPoetryTestProject(t) - defer os.RemoveAll(tempDir) + defer func() { + _ = os.RemoveAll(tempDir) + }() originalDir, err := os.Getwd() require.NoError(t, err) @@ -133,7 +141,9 @@ func TestPoetryTreeParsingRobustness(t *testing.T) { err = os.Setenv("JFROG_RUN_NATIVE", "true") require.NoError(t, err) - defer os.Unsetenv("JFROG_RUN_NATIVE") + defer func() { + _ = os.Unsetenv("JFROG_RUN_NATIVE") + }() buildInfo := collectPoetryBuildInfoForTest(t, "tree-parsing-test", "1") @@ -154,7 +164,9 @@ func TestPoetryRequestedByRelationships(t *testing.T) { } tempDir := setupPoetryTestProject(t) - defer os.RemoveAll(tempDir) + defer func() { + _ = os.RemoveAll(tempDir) + }() originalDir, err := os.Getwd() require.NoError(t, err) @@ -169,7 +181,9 @@ func TestPoetryRequestedByRelationships(t *testing.T) { err = os.Setenv("JFROG_RUN_NATIVE", "true") require.NoError(t, err) - defer os.Unsetenv("JFROG_RUN_NATIVE") + defer func() { + _ = os.Unsetenv("JFROG_RUN_NATIVE") + }() buildInfo := collectPoetryBuildInfoForTest(t, "requested-by-test", "1") diff --git a/poetry_test.go b/poetry_test.go index cc5b307da..6e0077c2d 100644 --- a/poetry_test.go +++ b/poetry_test.go @@ -145,7 +145,7 @@ func testPoetryCmd(t *testing.T, projectPath, buildNumber, module string, expect for _, dep := range buildInfoModules[0].Dependencies { if dep.Type == "pypi" { // Main dependencies should have checksums - assert.NotEmpty(t, dep.Checksum.Sha1, "SHA1 checksum should be present for %s", dep.Id) + assert.NotEmpty(t, dep.Sha1, "SHA1 checksum should be present for %s", dep.Id) } } } @@ -224,8 +224,8 @@ func testPoetryPublishCmd(t *testing.T, projectPath, buildNumber, expectedModule // Validate artifacts have checksums for _, artifact := range buildInfoModules[0].Artifacts { - assert.NotEmpty(t, artifact.Checksum.Sha1, "SHA1 checksum should be present for artifact %s", artifact.Name) - assert.NotEmpty(t, artifact.Checksum.Sha256, "SHA256 checksum should be present for artifact %s", artifact.Name) + assert.NotEmpty(t, artifact.Sha1, "SHA1 checksum should be present for artifact %s", artifact.Name) + assert.NotEmpty(t, artifact.Sha256, "SHA256 checksum should be present for artifact %s", artifact.Name) } } @@ -288,7 +288,7 @@ func TestPoetryBuildInfoCollection(t *testing.T) { // Validate FlexPack-specific features for _, dep := range module.Dependencies { if dep.Type == "pypi" { - t.Logf("Dependency: %s (SHA1: %s)", dep.Id, dep.Checksum.Sha1) + t.Logf("Dependency: %s (SHA1: %s)", dep.Id, dep.Sha1) } } } @@ -408,9 +408,9 @@ func TestPoetryFlexPackFeatures(t *testing.T) { if found && len(publishedBuildInfo.BuildInfo.Modules) > 0 { checksumCount := 0 for _, dep := range publishedBuildInfo.BuildInfo.Modules[0].Dependencies { - if dep.Checksum.Sha1 != "" { + if dep.Sha1 != "" { checksumCount++ - t.Logf("Dependency %s has checksum: %s", dep.Id, dep.Checksum.Sha1) + t.Logf("Dependency %s has checksum: %s", dep.Id, dep.Sha1) } } assert.Greater(t, checksumCount, 0, "At least some dependencies should have checksums") diff --git a/transfer_test.go b/transfer_test.go index 2fe91bd22..f4859c668 100644 --- a/transfer_test.go +++ b/transfer_test.go @@ -415,12 +415,8 @@ func TestTransferConfigMerge(t *testing.T) { rtVersion, err := getArtifactoryVersion() assert.NoError(t, err) - projectsSupported := false - if rtVersion.AtLeast("7.0.0") { - // The module type only exist in Artifactory 7 - projectsSupported = true - } - + projectsSupported := rtVersion.AtLeast("7.0.0") + // The module type only exist in Artifactory 7 if projectsSupported { // Create project on Source server deleteProject := createTestProject(t) @@ -508,10 +504,7 @@ func updateDockerRepoParams(t *testing.T, targetServicesManager artifactory.Arti } func inverseBooleanPointer(boolPtr *bool) *bool { - boolValue := true - if boolPtr != nil && *boolPtr { - boolValue = false - } + boolValue := boolPtr == nil || !*boolPtr return &boolValue } diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index d73aec8a9..fb391b77c 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -21,7 +21,6 @@ import ( commandUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils" artifactoryUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" buildUtils "github.com/jfrog/jfrog-cli-core/v2/common/build" - "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" commonCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands" "github.com/jfrog/jfrog-cli-core/v2/common/project" @@ -398,23 +397,23 @@ func overrideIntIfSet(field *int, c *cli.Context, fieldName string) { // Exclude refreshable tokens parameter should be true when working with external tools (build tools, curl, etc) // or when sending requests not via ArtifactoryHttpClient. -func CreateServerDetailsWithConfigOffer(c *cli.Context, excludeRefreshableTokens bool, domain cliutils.CommandDomain) (*coreConfig.ServerDetails, error) { - return cliutils.CreateServerDetailsWithConfigOffer(func() (*coreConfig.ServerDetails, error) { return createServerDetailsFromFlags(c, domain) }, excludeRefreshableTokens) +func CreateServerDetailsWithConfigOffer(c *cli.Context, excludeRefreshableTokens bool, domain commonCliUtils.CommandDomain) (*coreConfig.ServerDetails, error) { + return commonCliUtils.CreateServerDetailsWithConfigOffer(func() (*coreConfig.ServerDetails, error) { return createServerDetailsFromFlags(c, domain) }, excludeRefreshableTokens) } -func createServerDetailsFromFlags(c *cli.Context, domain cliutils.CommandDomain) (details *coreConfig.ServerDetails, err error) { +func createServerDetailsFromFlags(c *cli.Context, domain commonCliUtils.CommandDomain) (details *coreConfig.ServerDetails, err error) { details, err = CreateServerDetailsFromFlags(c) if err != nil { return } switch domain { - case cliutils.Rt: + case commonCliUtils.Rt: details.ArtifactoryUrl = details.Url - case cliutils.Xr: + case commonCliUtils.Xr: details.XrayUrl = details.Url - case cliutils.Ds: + case commonCliUtils.Ds: details.DistributionUrl = details.Url - case cliutils.Platform: + case commonCliUtils.Platform: return } details.Url = "" @@ -485,7 +484,7 @@ func CreateConfigCmd(c *cli.Context, confType project.ProjectType) error { } func RunNativeCmdWithDeprecationWarning(cmdName string, projectType project.ProjectType, c *cli.Context, cmd func(c *cli.Context) error) error { - if cliutils.ShouldLogWarning() { + if commonCliUtils.ShouldLogWarning() { LogNativeCommandDeprecation(cmdName, projectType.String()) } return cmd(c) @@ -534,7 +533,7 @@ func CreateBuildConfigurationWithModule(c *cli.Context) (buildConfigConfiguratio } func CreateArtifactoryDetailsByFlags(c *cli.Context) (*coreConfig.ServerDetails, error) { - artDetails, err := CreateServerDetailsWithConfigOffer(c, false, cliutils.Rt) + artDetails, err := CreateServerDetailsWithConfigOffer(c, false, commonCliUtils.Rt) if err != nil { return nil, err }