diff --git a/distribution_test.go b/distribution_test.go index c1d5751a7..3c232c3c0 100644 --- a/distribution_test.go +++ b/distribution_test.go @@ -598,7 +598,7 @@ func TestDistributeSyncTimeout(t *testing.T) { if r.RequestURI == "/api/v1/release_bundle/"+tests.BundleName+"/"+bundleVersion+"/distribution/"+trackerId { statusRequestsReceived++ w.WriteHeader(http.StatusOK) - content, err := json.Marshal(distributionServices.DistributionStatusResponse{Status: distributionServices.InProgress}) + content, err := json.Marshal(distribution.DistributionStatusResponse{Status: distribution.InProgress}) assert.NoError(t, err) _, err = w.Write(content) assert.NoError(t, err) diff --git a/go.mod b/go.mod index 722196ef6..40aad73e2 100644 --- a/go.mod +++ b/go.mod @@ -130,9 +130,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.20240317161137-662abefabe8e +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240318065853-b785b7d7f693 -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240317160615-e419c2a9e723 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240318065424-90669dbbcc54 replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.0.4-0.20240303113253-d82ecc02d9eb diff --git a/go.sum b/go.sum index 191ccceb6..6fe01a346 100644 --- a/go.sum +++ b/go.sum @@ -127,12 +127,12 @@ 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.20240317161137-662abefabe8e h1:mmM8VzqO3Qc/bzvw4onPEoMV96QfOijnZpNMr8AOFEs= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240317161137-662abefabe8e/go.mod h1:EIVjqkE5U1AMpZMLhL814Xpxc5hOqbPxxGiXHeojg7A= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240318065853-b785b7d7f693 h1:VgaSrFtNNfgSzRFxg7kzQeqm6q/ZeetaH4uSPt0YP+Q= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240318065853-b785b7d7f693/go.mod h1:mWr+fwcpgoNDTqBeYmXN0AU4FwC/a90MlzL0SoNrMC0= github.com/jfrog/jfrog-cli-security v1.0.4-0.20240303113253-d82ecc02d9eb h1:JUqwNOqzwj+1oZQXY1p/xnnH97BEMfOKGG505vGVIe4= github.com/jfrog/jfrog-cli-security v1.0.4-0.20240303113253-d82ecc02d9eb/go.mod h1:pOqg/hGw6eHWNyLDHeOCyq/Ntuc+wLJTV2Z8XuwXspU= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240317160615-e419c2a9e723 h1:0N/fdI2PXLjdWZieh7ib+6gb87yw3x22V7t1YZJvWOA= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240317160615-e419c2a9e723/go.mod h1:NB8tYFgkWtn+wHsKC+aYC75aLnS6yW81d8JAFTBxsi0= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240318065424-90669dbbcc54 h1:FTrss/ffJPjTHOOhQ8P+8DrkGYkxcaHlxp12nOfeZJQ= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240318065424-90669dbbcc54/go.mod h1:NB8tYFgkWtn+wHsKC+aYC75aLnS6yW81d8JAFTBxsi0= 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= diff --git a/lifecycle/cli.go b/lifecycle/cli.go index a29a01882..345639cae 100644 --- a/lifecycle/cli.go +++ b/lifecycle/cli.go @@ -160,19 +160,23 @@ func distribute(c *cli.Context) error { if err != nil { return err } - distributionRules, _, params, err := distribution.InitReleaseBundleDistributeCmd(c) + distributionRules, maxWaitMinutes, _, err := distribution.InitReleaseBundleDistributeCmd(c) if err != nil { return err } distributeCmd := lifecycle.NewReleaseBundleDistributeCommand() distributeCmd.SetServerDetails(lcDetails). - SetDistributeBundleParams(params). + SetReleaseBundleName(c.Args().Get(0)). + SetReleaseBundleVersion(c.Args().Get(1)). + SetReleaseBundleProject(cliutils.GetProject(c)). SetDistributionRules(distributionRules). SetDryRun(c.Bool("dry-run")). SetAutoCreateRepo(c.Bool(cliutils.CreateRepo)). SetPathMappingPattern(c.String(cliutils.PathMappingPattern)). - SetPathMappingTarget(c.String(cliutils.PathMappingTarget)) + SetPathMappingTarget(c.String(cliutils.PathMappingTarget)). + SetSync(c.Bool(cliutils.Sync)). + SetMaxWaitMinutes(maxWaitMinutes) return commands.Exec(distributeCmd) } diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index 27a6b1831..2c743454d 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -2006,8 +2006,8 @@ var commandFlags = map[string][]string{ platformUrl, user, password, accessToken, serverId, lcSigningKey, lcSync, lcProject, lcIncludeRepos, lcExcludeRepos, }, ReleaseBundleDistribute: { - platformUrl, user, password, accessToken, serverId, lcDryRun, DistRules, site, city, countryCodes, - InsecureTls, CreateRepo, lcPathMappingPattern, lcPathMappingTarget, + platformUrl, user, password, accessToken, serverId, lcProject, DistRules, site, city, countryCodes, + lcDryRun, CreateRepo, lcPathMappingPattern, lcPathMappingTarget, lcSync, maxWaitMinutes, }, ReleaseBundleDeleteLocal: { platformUrl, user, password, accessToken, serverId, deleteQuiet, lcSync, lcProject,