Skip to content

Report usage on jf setup when the target repo fails validation #3609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhanurp wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Report usage on jf setup when the target repo fails validation #3609

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeae6b0
Report usage on jf setup when the target repo fails validation
bhanurp Jul 19, 2026
6729e95
Unhide the setup command from the help menu
bhanurp Jul 19, 2026
4c1078c
Collect setup usage via a single deferred report instead of a one-off…
bhanurp Jul 19, 2026
91c057e
Simplify setup command now that repo validation lives in SetupCommand…
bhanurp Jul 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions buildtools/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python"
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/setup"
artutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
"github.com/jfrog/jfrog-cli-security/utils/techutils"
"github.com/jfrog/jfrog-cli/docs/buildtools/helmcommand"
Expand Down Expand Up @@ -104,8 +103,7 @@ const (
func GetCommands() []cli.Command {
cmds := cliutils.GetSortedCommands(cli.CommandsByName{
{
// Currently, the setup command is hidden from the help menu, till it will be released as GA.
Hidden: true,
Hidden: false,
Name: "setup",
Flags: cliutils.GetCommandFlags(cliutils.Setup),
Usage: setupdocs.GetDescription(),
Expand Down Expand Up @@ -1821,26 +1819,12 @@ func setupCmd(c *cli.Context) (err error) {
if err != nil {
return err
}
repoName := c.String("repo")
if repoName != "" {
// If a repository was provided, validate it exists in Artifactory.
if err = validateRepoExists(repoName, artDetails); err != nil {
return err
}
}
setupCmd.SetServerDetails(artDetails).SetRepoName(repoName).SetProjectKey(cliutils.GetProject(c))
// Repo-existence validation for --repo happens inside SetupCommand.Run(), so every return
// path from here is covered by the single usage-report call site in ExecWithPackageManager.
setupCmd.SetServerDetails(artDetails).SetRepoName(c.String("repo")).SetProjectKey(cliutils.GetProject(c))
return commands.ExecWithPackageManager(setupCmd, packageManager.String())
}

// validateRepoExists checks if the specified repository exists in Artifactory.
func validateRepoExists(repoName string, artDetails *coreConfig.ServerDetails) error {
serviceDetails, err := artDetails.CreateArtAuthConfig()
if err != nil {
return err
}
return utils.ValidateRepoExists(repoName, serviceDetails)
}

func selectPackageManagerInteractively() (selectedPackageManager project.ProjectType, err error) {
var selected string
var selectableItems []ioutils.PromptItem
Expand Down
Loading