Command Summary - New record functionality

artifactory/commands/buildinfo/publish.go

@@ -146,7 +146,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 +232,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.New(commandssummaries.NewBuildInfo(), "build-info")
 	if err != nil {
 		return
 	}

artifactory/commands/commandssummaries/buildinfosummary.go

@@ -15,18 +15,23 @@ const (
 )
 
 type BuildInfoSummary struct {
-	platformUrl  string
-	majorVersion int
+	platformUrl     string
+	majorVersion    int
+	nestedFilePaths map[commandsummary.Index]map[string]string
 }
 
-func NewBuildInfo(platformUrl string, majorVersion int) *BuildInfoSummary {
+func NewBuildInfoWithUrl(platformUrl string, majorVersion int) *BuildInfoSummary {
 	return &BuildInfoSummary{
 		platformUrl:  platformUrl,
 		majorVersion: majorVersion,
 	}
 }
+func NewBuildInfo() *BuildInfoSummary {
+	return &BuildInfoSummary{}
+}
 
-func (bis *BuildInfoSummary) GenerateMarkdownFromFiles(dataFilePaths []string) (finalMarkdown string, err error) {
+func (bis *BuildInfoSummary) GenerateMarkdownFromFiles(dataFilePaths []string, nestedFilePaths map[commandsummary.Index]map[string]string) (finalMarkdown string, err error) {
+	bis.nestedFilePaths = nestedFilePaths
 	// Aggregate all the build info files into a slice
 	var builds []*buildInfo.BuildInfo
 	for _, path := range dataFilePaths {
@@ -46,8 +51,8 @@ func (bis *BuildInfoSummary) GenerateMarkdownFromFiles(dataFilePaths []string) (
 func (bis *BuildInfoSummary) buildInfoTable(builds []*buildInfo.BuildInfo) string {
 	// Generate a string that represents a Markdown table
 	var tableBuilder strings.Builder
-	tableBuilder.WriteString("\n\n ### Published Build Infos  \n\n")
-	tableBuilder.WriteString("\n\n|  Build Info |  Time Stamp | \n")
+	tableBuilder.WriteString("\n\n### Published Build Infos\n\n")
+	tableBuilder.WriteString("\n\n|  Build Info |  Time Stamp |\n")
 	tableBuilder.WriteString("|---------|------------| \n")
 	for _, build := range builds {
 		buildTime := parseBuildTime(build.Started)
@@ -59,7 +64,7 @@ func (bis *BuildInfoSummary) buildInfoTable(builds []*buildInfo.BuildInfo) strin
 
 func (bis *BuildInfoSummary) buildInfoModules(builds []*buildInfo.BuildInfo) string {
 	var markdownBuilder strings.Builder
-	markdownBuilder.WriteString("\n\n ### Modules Published As Part of This Build  \n\n")
+	markdownBuilder.WriteString("\n\n### Modules Published As Part of This Build\n\n")
 	var shouldGenerate bool
 	for _, build := range builds {
 		for _, module := range build.Modules {
@@ -97,7 +102,7 @@ func parseBuildTime(timestamp string) string {
 
 func (bis *BuildInfoSummary) generateModuleMarkdown(module buildInfo.Module) string {
 	var moduleMarkdown strings.Builder
-	moduleMarkdown.WriteString(fmt.Sprintf("\n #### %s \n", module.Id))
+	moduleMarkdown.WriteString(fmt.Sprintf("\n#### %s\n", module.Id))
 	artifactsTree := utils.NewFileTree()
 	for _, artifact := range module.Artifacts {
 		artifactUrlInArtifactory := bis.generateArtifactUrl(artifact)

artifactory/commands/commandssummaries/buildinfosummary_test.go

@@ -34,6 +34,7 @@ func TestBuildInfoModules(t *testing.T) {
 			Modules: []buildinfo.Module{
 				{
 					Type: buildinfo.Maven,
+					Id:   "maven",
 					Artifacts: []buildinfo.Artifact{{
 						Name:                   "artifact1",
 						Path:                   "path/to/artifact1",
@@ -47,6 +48,7 @@ func TestBuildInfoModules(t *testing.T) {
 				},
 				{
 					Type: buildinfo.Generic,
+					Id:   "generic",
 					Artifacts: []buildinfo.Artifact{{
 						Name:                   "artifact2",
 						Path:                   "path/to/artifact2",

artifactory/commands/commandssummaries/testdata/modules.md

@@ -1,9 +1,9 @@
 
 
- ### Modules Published As Part of This Build  
+### Modules Published As Part of This Build
 
 
- ####  
+#### maven
 
 
  <pre>📦 libs-release
@@ -12,7 +12,7 @@
         └── <a href=https://myplatform.com/ui/repos/tree/General/libs-release/path/to/artifact1?clearFilter=true target="_blank">artifact1</a>
 
 </pre>
- ####  
+#### generic
 
 
  <pre>📦 generic-local

artifactory/commands/commandssummaries/testdata/table.md

@@ -1,10 +1,10 @@
 
 
- ### Published Build Infos  
+### Published Build Infos
 
 
 
-|  Build Info |  Time Stamp | 
+|  Build Info |  Time Stamp |
 |---------|------------| 
 | [buildName 123](http://myJFrogPlatform/builds/buildName/123) | May 5, 2024 , 12:47:20 |
 

artifactory/commands/commandssummaries/uploadsummary.go

@@ -30,12 +30,12 @@ func NewUploadSummary(platformUrl string, majorVersion int) *UploadSummary {
 	}
 }
 
-func (us *UploadSummary) GenerateMarkdownFromFiles(dataFilePaths []string) (markdown string, err error) {
+func (us *UploadSummary) GenerateMarkdownFromFiles(dataFilePaths []string, _ map[commandsummary.Index]map[string]string) (markdown string, err error) {
 	if err = us.loadResults(dataFilePaths); err != nil {
 		return
 	}
-	// Wrap the markdown in a <pre> tags to preserve spaces
-	markdown = fmt.Sprintf("\n<pre>\n\n\n" + us.generateFileTreeMarkdown() + "</pre>\n\n")
+	// Wrap the Markdown in a <pre> tags to preserve spaces
+	markdown = fmt.Sprintf("\n<pre>\n\n\n%s</pre>\n\n", us.generateFileTreeMarkdown())
 	return
 }