Skip to content

Commit 2d277d9

Browse files
authored
Command Summaries (#2552)
1 parent 560584b commit 2d277d9

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

artifactory/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,7 @@ func uploadCmd(c *cli.Context) (err error) {
13441344
if err != nil {
13451345
return
13461346
}
1347-
printDeploymentView, detailedSummary := log.IsStdErrTerminal(), c.Bool("detailed-summary")
1347+
printDeploymentView, detailedSummary := log.IsStdErrTerminal(), cliutils.GetDetailedSummary(c)
13481348
uploadCmd.SetUploadConfiguration(configuration).SetBuildConfiguration(buildConfiguration).SetSpec(uploadSpec).SetServerDetails(rtDetails).SetDryRun(c.Bool("dry-run")).SetSyncDeletesPath(c.String("sync-deletes")).SetQuiet(cliutils.GetQuietValue(c)).SetDetailedSummary(detailedSummary || printDeploymentView).SetRetries(retries).SetRetryWaitMilliSecs(retryWaitTime)
13491349

13501350
if uploadCmd.ShouldPrompt() && !coreutils.AskYesNo("Sync-deletes may delete some artifacts in Artifactory. Are you sure you want to continue?\n"+
@@ -1666,7 +1666,7 @@ func buildPublishCmd(c *cli.Context) error {
16661666
if err != nil {
16671667
return err
16681668
}
1669-
buildPublishCmd := buildinfo.NewBuildPublishCommand().SetServerDetails(rtDetails).SetBuildConfiguration(buildConfiguration).SetConfig(buildInfoConfiguration).SetDetailedSummary(c.Bool("detailed-summary"))
1669+
buildPublishCmd := buildinfo.NewBuildPublishCommand().SetServerDetails(rtDetails).SetBuildConfiguration(buildConfiguration).SetConfig(buildInfoConfiguration).SetDetailedSummary(cliutils.GetDetailedSummary(c))
16701670

16711671
err = commands.Exec(buildPublishCmd)
16721672
if buildPublishCmd.IsDetailedSummary() {

docs/common/env.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ const (
9191
JfrogCliAvoidNewVersionWarning = ` JFROG_CLI_AVOID_NEW_VERSION_WARNING
9292
[Default: false]
9393
Set to true if you'd like to avoid checking the latest available JFrog CLI version and printing warning when it newer than the current one. `
94+
95+
JfrogCliCommandSummaryOutputDirectory = ` JFROG_CLI_COMMAND_SUMMARY_OUTPUT_DIR
96+
Defines the directory path where the command summaries data is stored.
97+
Every command will have its own individual directory within this base directory.
98+
. `
9499
)
95100

96101
var (
@@ -129,7 +134,8 @@ func GetGlobalEnvVars() string {
129134
JfrogCliEnvExclude,
130135
JfrogCliFailNoOp,
131136
JfrogCliEncryptionKey,
132-
JfrogCliAvoidNewVersionWarning)
137+
JfrogCliAvoidNewVersionWarning,
138+
JfrogCliCommandSummaryOutputDirectory)
133139
}
134140

135141
func CreateEnvVars(envVars ...string) string {

go.mod

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/go-git/go-git/v5 v5.12.0
99
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
1010
github.com/jfrog/archiver/v3 v3.6.0
11-
github.com/jfrog/build-info-go v1.9.26
11+
github.com/jfrog/build-info-go v1.9.27
1212
github.com/jfrog/gofrog v1.7.1
13-
github.com/jfrog/jfrog-cli-core/v2 v2.52.0
13+
github.com/jfrog/jfrog-cli-core/v2 v2.53.0
1414
github.com/jfrog/jfrog-cli-platform-services v1.3.0
15-
github.com/jfrog/jfrog-cli-security v1.1.0
15+
github.com/jfrog/jfrog-cli-security v1.2.0
1616
github.com/jfrog/jfrog-client-go v1.40.2
1717
github.com/jszwec/csvutil v1.10.0
1818
github.com/stretchr/testify v1.9.0
@@ -137,11 +137,9 @@ require (
137137
gopkg.in/yaml.v3 v3.0.1 // indirect
138138
)
139139

140-
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240505160419-7173b506c6b7
141-
142140
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240505164307-d12abb9f140e
143141

144-
// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.0.6-0.20240408061620-c9b84da33d5e
142+
// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81
145143

146144
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
147145

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,18 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+
139139
github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
140140
github.com/jfrog/archiver/v3 v3.6.0 h1:OVZ50vudkIQmKMgA8mmFF9S0gA47lcag22N13iV3F1w=
141141
github.com/jfrog/archiver/v3 v3.6.0/go.mod h1:fCAof46C3rAXgZurS8kNRNdSVMKBbZs+bNNhPYxLldI=
142-
github.com/jfrog/build-info-go v1.9.26 h1:1Ddc6+Ecvhc+UMnKhRVG1jGM6fYNwA49207azTBGBc8=
143-
github.com/jfrog/build-info-go v1.9.26/go.mod h1:8T7/ajM9aGshvgpwCtXwIFpyF/R6CEn4W+/FLryNXWw=
142+
github.com/jfrog/build-info-go v1.9.27 h1:7RWJcajqtNNbGHuYkgOLUIG7mmRKF0yxC7mvYAbdVlU=
143+
github.com/jfrog/build-info-go v1.9.27/go.mod h1:8T7/ajM9aGshvgpwCtXwIFpyF/R6CEn4W+/FLryNXWw=
144144
github.com/jfrog/gofrog v1.7.1 h1:ME1Meg4hukAT/7X6HUQCVSe4DNjMZACCP8aCY37EW/w=
145145
github.com/jfrog/gofrog v1.7.1/go.mod h1:X7bjfWoQDN0Z4FQGbE91j3gbPP7Urwzm4Z8tkvrlbRI=
146146
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
147147
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
148-
github.com/jfrog/jfrog-cli-core/v2 v2.52.0 h1:0+kgk9FIJCIMLlJWC2SfMU9vb9Sa0rBtH+CqxW3bsxU=
149-
github.com/jfrog/jfrog-cli-core/v2 v2.52.0/go.mod h1:hB5R+BgmCbOoz5HZyyqEdv408rL26ej7ZSHfXGpLqmw=
148+
github.com/jfrog/jfrog-cli-core/v2 v2.53.0 h1:qdZ1Svb1hGyRx2QviJtarhcA8eet8QtYU054nKzlhDg=
149+
github.com/jfrog/jfrog-cli-core/v2 v2.53.0/go.mod h1:l101ZcbHy/FLieCx1xDtjONgkqsoLDNaqVT7b4KJ5OQ=
150150
github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA=
151151
github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc=
152-
github.com/jfrog/jfrog-cli-security v1.1.0 h1:ifCjFJSa1D1pWyW/ADYPqnMkOddzkAT/WY4vHAufn1g=
153-
github.com/jfrog/jfrog-cli-security v1.1.0/go.mod h1:086t7e/einVAGfBXxRdEGDKovWt67I6SqUb1rcpdiZc=
152+
github.com/jfrog/jfrog-cli-security v1.2.0 h1:4lNl/bbU8qhkpnpMQqZtPlniwtM9rJXDYNEm7VsLRKs=
153+
github.com/jfrog/jfrog-cli-security v1.2.0/go.mod h1:IbP3MiDz5gXXc2+oXSqV688uEhLrtxHapoJ14oYTV20=
154154
github.com/jfrog/jfrog-client-go v1.40.2 h1:zdCWPPT11r0bMGnAXGhZPb3RrIINhiTFCceQABhguZ4=
155155
github.com/jfrog/jfrog-client-go v1.40.2/go.mod h1:m3hIn12eFWk5nJH1swPRtFrjXbiiCscOpX+v/vCdmNI=
156156
github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI=

utils/cliutils/utils.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"encoding/json"
55
"errors"
66
"fmt"
7+
"github.com/jfrog/jfrog-cli-core/v2/commandsummary"
78
"io"
89
"net/http"
910
"os"
@@ -125,7 +126,7 @@ func PrintBriefSummaryReport(success, failed int, failNoOp bool, originalErr err
125126
func PrintDeploymentView(reader *content.ContentReader) error {
126127
tree := artifactoryUtils.NewFileTree()
127128
for transferDetails := new(clientutils.FileTransferDetails); reader.NextRecord(transferDetails) == nil; transferDetails = new(clientutils.FileTransferDetails) {
128-
tree.AddFile(transferDetails.TargetPath)
129+
tree.AddFile(transferDetails.TargetPath, "")
129130
}
130131
if err := reader.GetError(); err != nil {
131132
return err
@@ -690,6 +691,10 @@ func CheckNewCliVersionAvailable(currentVersion string) (warningMessage string,
690691
return
691692
}
692693

694+
func GetDetailedSummary(c *cli.Context) bool {
695+
return c.Bool("detailed-summary") || commandsummary.ShouldRecordSummary()
696+
}
697+
693698
func shouldCheckLatestCliVersion() (shouldCheck bool, err error) {
694699
if strings.ToLower(os.Getenv(JfrogCliAvoidNewVersionWarning)) == "true" {
695700
return

0 commit comments

Comments
 (0)