Merge branch 'dev' into poetry-install

jfrog · Sep 13, 2024 · f2f603e · f2f603e
2 parents 514324f + 33f3a1e
commit f2f603e
Show file tree

Hide file tree

Showing 62 changed files with 2,510 additions and 829 deletions.
diff --git a/artifactory/commands/buildinfo/publish.go b/artifactory/commands/buildinfo/publish.go
@@ -3,8 +3,7 @@ package buildinfo
 import (
 	"errors"
 	"fmt"
-	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/commandssummaries"
-	"github.com/jfrog/jfrog-cli-core/v2/commandsummary"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/commandsummary"
 	"net/url"
 	"strconv"
 	"strings"
@@ -146,7 +145,7 @@ func (bpc *BuildPublishCommand) Run() error {
 		return err
 	}
 
-	if err = recordCommandSummary(buildInfo, buildLink, bpc.serverDetails.Url, majorVersion); err != nil {
+	if err = recordCommandSummary(buildInfo, buildLink); err != nil {
 		return err
 	}
 
@@ -232,12 +231,12 @@ func (bpc *BuildPublishCommand) getNextBuildNumber(buildName string, servicesMan
 	return strconv.Itoa(latestBuildNumber), nil
 }
 
-func recordCommandSummary(buildInfo *buildinfo.BuildInfo, buildLink, serverUrl string, majorVersion int) (err error) {
+func recordCommandSummary(buildInfo *buildinfo.BuildInfo, buildLink string) (err error) {
 	if !commandsummary.ShouldRecordSummary() {
 		return
 	}
 	buildInfo.BuildUrl = buildLink
-	buildInfoSummary, err := commandsummary.New(commandssummaries.NewBuildInfo(serverUrl, majorVersion), "build-info")
+	buildInfoSummary, err := commandsummary.NewBuildInfoSummary()
 	if err != nil {
 		return
 	}

diff --git a/artifactory/commands/commandssummaries/buildinfosummary.go b/artifactory/commands/commandssummaries/buildinfosummary.go
diff --git a/artifactory/commands/commandssummaries/buildinfosummary_test.go b/artifactory/commands/commandssummaries/buildinfosummary_test.go
diff --git a/artifactory/commands/commandssummaries/testdata/modules.md b/artifactory/commands/commandssummaries/testdata/modules.md
diff --git a/artifactory/commands/commandssummaries/testdata/table.md b/artifactory/commands/commandssummaries/testdata/table.md
diff --git a/artifactory/commands/commandssummaries/utils.go b/artifactory/commands/commandssummaries/utils.go
diff --git a/artifactory/commands/generic/upload.go b/artifactory/commands/generic/upload.go
@@ -2,9 +2,7 @@ package generic
 
 import (
 	"errors"
-	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/commandssummaries"
-	"github.com/jfrog/jfrog-cli-core/v2/commandsummary"
-	"github.com/jfrog/jfrog-client-go/artifactory"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/commandsummary"
 	"os"
 
 	buildInfo "github.com/jfrog/build-info-go/entities"
@@ -159,7 +157,7 @@ func (uc *UploadCommand) upload() (err error) {
 			successCount = summary.TotalSucceeded
 			failCount = summary.TotalFailed
 
-			if err = recordCommandSummary(servicesManager, summary, serverDetails.Url); err != nil {
+			if err = recordCommandSummary(summary); err != nil {
 				return
 			}
 		}
@@ -282,17 +280,11 @@ func createDeleteSpecForSync(deletePattern string, syncDeletesProp string) *spec
 		BuildSpec()
 }
 
-func recordCommandSummary(servicesManager artifactory.ArtifactoryServicesManager, summary *rtServicesUtils.OperationSummary, platformUrl string) (err error) {
+func recordCommandSummary(summary *rtServicesUtils.OperationSummary) (err error) {
 	if !commandsummary.ShouldRecordSummary() {
 		return
 	}
-
-	majorVersion, err := utils.GetRtMajorVersion(servicesManager)
-	if err != nil {
-		return err
-	}
-
-	uploadSummary, err := commandsummary.New(commandssummaries.NewUploadSummary(platformUrl, majorVersion), "upload")
+	uploadSummary, err := commandsummary.NewUploadSummary()
 	if err != nil {
 		return
 	}