diff --git a/buildtools/cli.go b/buildtools/cli.go index 60058bc2d..394d5e3a7 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -53,6 +53,7 @@ import ( "github.com/jfrog/jfrog-cli/docs/artifactory/terraformconfig" twinedocs "github.com/jfrog/jfrog-cli/docs/artifactory/twine" "github.com/jfrog/jfrog-cli/docs/buildtools/conan" + "github.com/jfrog/jfrog-cli/docs/buildtools/conanconfig" "github.com/jfrog/jfrog-cli/docs/buildtools/docker" dotnetdocs "github.com/jfrog/jfrog-cli/docs/buildtools/dotnet" "github.com/jfrog/jfrog-cli/docs/buildtools/dotnetconfig" @@ -369,6 +370,19 @@ func GetCommands() []cli.Command { Category: buildToolsCategory, Action: HelmCmd, }, + { + Name: "conan-config", + Flags: cliutils.GetCommandFlags(cliutils.ConanConfig), + Aliases: []string{"conanc"}, + Usage: conanconfig.GetDescription(), + HelpName: corecommon.CreateUsage("conan-config", conanconfig.GetDescription(), conanconfig.Usage), + ArgsUsage: common.CreateEnvVars(), + BashComplete: corecommon.CreateBashCompletionFunc(), + Category: buildToolsCategory, + Action: func(c *cli.Context) error { + return cliutils.CreateConfigCmd(c, project.Conan) + }, + }, { Name: "conan", Hidden: false, diff --git a/docs/buildtools/conanconfig/help.go b/docs/buildtools/conanconfig/help.go new file mode 100644 index 000000000..cca8dfc57 --- /dev/null +++ b/docs/buildtools/conanconfig/help.go @@ -0,0 +1,7 @@ +package conanconfig + +var Usage = []string{"conan-config [command options]"} + +func GetDescription() string { + return "Generate conan build configuration." +} diff --git a/go.mod b/go.mod index 5df9cb3a7..413eeaaf9 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/jfrog/gofrog v1.7.6 github.com/jfrog/jfrog-cli-application v1.0.2-0.20260405065840-c930d515ef34 github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260414085427-0d891fde6d05 - github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260414083544-243b4d55328b + github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260416095827-3d77f8e6d0ee github.com/jfrog/jfrog-cli-evidence v0.9.2 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20260306102152-984d60a80cec github.com/jfrog/jfrog-cli-security v1.27.0 diff --git a/go.sum b/go.sum index 8c572cc44..3560e9f38 100644 --- a/go.sum +++ b/go.sum @@ -420,8 +420,8 @@ github.com/jfrog/jfrog-cli-application v1.0.2-0.20260405065840-c930d515ef34 h1:q github.com/jfrog/jfrog-cli-application v1.0.2-0.20260405065840-c930d515ef34/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260414085427-0d891fde6d05 h1:BNLs4VBRU3UrQTwEQSJw/5CaCgGMc1YDftpUgtb1GUI= github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260414085427-0d891fde6d05/go.mod h1:u2yb7nO6VLxXwHKoICnxd8NEY4OclCk9YAi2n/Sbpn8= -github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260414083544-243b4d55328b h1:PCvNCdTYojr9u5X5TVTj/3oSnHEe8kJ9I50X0Wb5iJg= -github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260414083544-243b4d55328b/go.mod h1:RLLUO+oGDq88e5DPtP/KK2sVgMF32OuoRdVMxSFfb30= +github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260416095827-3d77f8e6d0ee h1:VZQYFVc6ipjW134wEwvB/Qln7TlkfhB1FH8F46WVDHQ= +github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260416095827-3d77f8e6d0ee/go.mod h1:RLLUO+oGDq88e5DPtP/KK2sVgMF32OuoRdVMxSFfb30= github.com/jfrog/jfrog-cli-evidence v0.9.2 h1:huiBzQSI9z3OF3l2RphthdXl1aH9zBsvAt+zLsApORI= github.com/jfrog/jfrog-cli-evidence v0.9.2/go.mod h1:R9faPfyQESBmKrdZCmHvlpmYSHmffswjNnFeT3RMq8I= github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20260306102152-984d60a80cec h1:d8CJ/LUGjNwPDPfYLJkAQJNmu+GCWxFsjZrmTcuV5wY= diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index b31b143d4..9fd46d740 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -83,6 +83,7 @@ const ( HuggingFaceUpload = "hugging-face-upload" HuggingFaceDownload = "hugging-face-download" RubyConfig = "ruby-config" + ConanConfig = "conan-config" Conan = "conan" Ping = "ping" RtCurl = "rt-curl" @@ -2061,6 +2062,9 @@ var commandFlags = map[string][]string{ RubyConfig: { global, serverIdResolve, serverIdDeploy, repoResolve, repoDeploy, }, + ConanConfig: { + global, serverIdResolve, serverIdDeploy, repoResolve, repoDeploy, + }, Conan: { BuildName, BuildNumber, module, Project, },