From 1f43bbab19395795f28fa8bb2f67bce5fbf626c8 Mon Sep 17 00:00:00 2001 From: Reshmi Date: Fri, 12 Dec 2025 06:14:54 +0530 Subject: [PATCH 1/2] add conan build info support --- buildtools/cli.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/buildtools/cli.go b/buildtools/cli.go index bc029d45a..129ee582a 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -20,6 +20,7 @@ import ( "github.com/jfrog/jfrog-cli/docs/buildtools/rubyconfig" setupdocs "github.com/jfrog/jfrog-cli/docs/buildtools/setup" + conancommand "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/conan" "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container" "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet" "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/golang" @@ -1365,18 +1366,21 @@ func ConanCmd(c *cli.Context) error { } args := cliutils.ExtractCommand(c) - cmdName, conanArgs := getCommandName(args) + filteredArgs, buildConfiguration, err := build.ExtractBuildDetailsFromArgs(args) + if err != nil { + return err + } + cmdName, conanArgs := getCommandName(filteredArgs) - // Execute native conan command directly - log.Info(fmt.Sprintf("Running Conan %s.", cmdName)) - conanCmd := exec.Command("conan", append([]string{cmdName}, conanArgs...)...) - conanCmd.Stdout = os.Stdout - conanCmd.Stderr = os.Stderr - if err := conanCmd.Run(); err != nil { - return fmt.Errorf("conan %s failed: %w", cmdName, err) + // Create and configure Conan command + conanCmd := conancommand.NewConanCommand() + conanCmd.SetCommandName(cmdName).SetArgs(conanArgs) + + if buildConfiguration != nil { + conanCmd.SetBuildConfiguration(buildConfiguration) } - return nil + return conanCmd.Run() } func pythonCmd(c *cli.Context, projectType project.ProjectType) error { From c6bc9532ab9947352a17cb5e5f351b61daa213df Mon Sep 17 00:00:00 2001 From: Reshmi Date: Fri, 12 Dec 2025 10:41:52 +0530 Subject: [PATCH 2/2] update dependencies: --- go.mod | 5 ++++- go.sum | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d5597be37..9b344f205 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,9 @@ 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) github.com/c-bata/go-prompt => github.com/c-bata/go-prompt v0.2.5 + + github.com/jfrog/build-info-go => github.com/reshmifrog/build-info-go v1.9.10-0.20251212003940-e0fb71e835f5 + github.com/jfrog/jfrog-cli-artifactory => github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20251212003653-314e872ec118 // Should not be updated to 0.2.0-beta.2 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) github.com/pkg/term => github.com/pkg/term v1.1.0 ) @@ -24,7 +27,7 @@ require ( github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e github.com/jfrog/jfrog-cli-security v1.24.0 - github.com/jfrog/jfrog-client-go v1.55.1-0.20251209032636-8966184db185 + github.com/jfrog/jfrog-client-go v1.55.1-0.20251209090954-d6b1c70d3a5e github.com/jszwec/csvutil v1.10.0 github.com/manifoldco/promptui v0.9.0 github.com/spf13/viper v1.21.0 diff --git a/go.sum b/go.sum index a5d93bde7..12af89fbb 100644 --- a/go.sum +++ b/go.sum @@ -1175,8 +1175,6 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.12.5-0.20251209120002-025bda5ff78b h1:wf8u5g84GW8ZYsM59UGk+1vvcUOCaP75NiGZeOatkC8= -github.com/jfrog/build-info-go v1.12.5-0.20251209120002-025bda5ff78b/go.mod h1:9W4U440fdTHwW1HiB/R0VQvz/5q8ZHsms9MWcq+JrdY= github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ= github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88= github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8= @@ -1187,8 +1185,6 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251208114900-b3cc968c8e3d h1:0o6tj4nPP9uCscyfPbKBUcCaIYof42irwii6XsBB8zM= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251208114900-b3cc968c8e3d/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251209121625-98f7b22a08c1 h1:vT9QWrwW6pJPcHewSVsDWWoCHq+Nt3UqnEaJjyMqFMU= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251209121625-98f7b22a08c1/go.mod h1:b/Sf+FOjWwoQOZ00r+fXMbDqpts8L0q1lMNgS5cofAs= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251125083543-e689762c4ff0 h1:EsasTBE5i2MyCESS/icZxKIlObpGiOyW9K67MAaEWco= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251125083543-e689762c4ff0/go.mod h1:d9aADumiyjCBvZLffp8wldvP9XFHxcvk2PoOSUYms2g= github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug= @@ -1197,8 +1193,8 @@ github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b000 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok= github.com/jfrog/jfrog-cli-security v1.24.0 h1:APqx0VezzpH7ppEyBu8dn5/QbxMAI4M7Tw8qopEkAgI= github.com/jfrog/jfrog-cli-security v1.24.0/go.mod h1:qBAvU9kN41nReJk/O4V9Q/xwiXfAdyhqRIYaOjVm8nE= -github.com/jfrog/jfrog-client-go v1.55.1-0.20251209032636-8966184db185 h1:Lz7sUxTzyf331TWE84jtAEwdAV0Obfx3ZAtBfrlTnNw= -github.com/jfrog/jfrog-client-go v1.55.1-0.20251209032636-8966184db185/go.mod h1:WQ5Y+oKYyHFAlCbHN925bWhnShTd2ruxZ6YTpb76fpU= +github.com/jfrog/jfrog-client-go v1.55.1-0.20251209090954-d6b1c70d3a5e h1:9le3a99UGdBHZXv7vZ7aqxLyBpwMq+sbTWiOaI9pwCU= +github.com/jfrog/jfrog-client-go v1.55.1-0.20251209090954-d6b1c70d3a5e/go.mod h1:WQ5Y+oKYyHFAlCbHN925bWhnShTd2ruxZ6YTpb76fpU= github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94= github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8= github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY= @@ -1341,6 +1337,10 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/reshmifrog/build-info-go v1.9.10-0.20251212003940-e0fb71e835f5 h1:UVo5H0ve3VlGceQLDKG5prjnjB1bvKzUBeLrki9U0+U= +github.com/reshmifrog/build-info-go v1.9.10-0.20251212003940-e0fb71e835f5/go.mod h1:9W4U440fdTHwW1HiB/R0VQvz/5q8ZHsms9MWcq+JrdY= +github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20251212003653-314e872ec118 h1:8ZTbLGjIHsDiRclXoBW8l99r0iVQio9mZQTMcDtPPLQ= +github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20251212003653-314e872ec118/go.mod h1:wKTWZqomaLxrHuvVF4iryZ8V4rn6h2y09jbuOBVRQUY= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=