Skip to content

Commit

Permalink
Update Summaries extended page link & Add logs (#1256)
Browse files Browse the repository at this point in the history
  • Loading branch information
EyalDelarea authored Sep 4, 2024
1 parent 3293aac commit ebf2092
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions artifactory/utils/commandsummary/buildinfosummary.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
buildInfo "github.com/jfrog/build-info-go/entities"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
"github.com/jfrog/jfrog-client-go/utils/log"
"path"
"strings"
)
Expand Down Expand Up @@ -273,9 +274,11 @@ func fitInsideMarkdownTable(str string) string {
}

func getScanResults(scannedEntity string) (sc ScanResult) {
log.Debug("Getting scan results for: ", scannedEntity)
if sc = StaticMarkdownConfig.scanResultsMapping[fileNameToSha1(scannedEntity)]; sc != nil {
return sc
}
log.Debug("No scan results found for: ", scannedEntity)
return StaticMarkdownConfig.scanResultsMapping[NonScannedResult]
}

Expand Down
2 changes: 1 addition & 1 deletion artifactory/utils/commandsummary/commandsummary.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (cs *CommandSummary) Record(data any) (err error) {
// SummaryIndex: The name of the index under which the data will be stored.
// Args: Additional arguments used to determine the file name.
func (cs *CommandSummary) RecordWithIndex(data any, summaryIndex Index, args ...string) (err error) {
log.Debug("Recording data with index:", summaryIndex)
log.Debug("Recording data with index:", summaryIndex, "and args:", args)
return cs.recordInternal(data, summaryIndex, args)
}

Expand Down
2 changes: 1 addition & 1 deletion artifactory/utils/commandsummary/markdownConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type MarkdownConfig struct {
scanResultsMapping map[string]ScanResult
}

const extendedSummaryLandPage = "https://jfrog.com/help/r/jfrog-and-github-integration-guide/jfrog-and-github-integration-features-matrix"
const extendedSummaryLandPage = "https://jfrog.com/help/access?xinfo:appid=csh-gen-gitbook"

var StaticMarkdownConfig = MarkdownConfig{}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

| Build Info | Security Violations | Security Issues |
| :--------- | :------------ | :------------ |
| <a href="https://jfrog.com/help/r/jfrog-and-github-integration-guide/jfrog-and-github-integration-features-matrix">🐸 Enable the linkage to Artifactory</a><br><br> buildName 123 | Not scanned | Not scanned |
| <a href="https://jfrog.com/help/access?xinfo:appid=csh-gen-gitbook">🐸 Enable the linkage to Artifactory</a><br><br> buildName 123 | Not scanned | Not scanned |


Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

| Artifacts | Security Violations | Security Issues |
| :------------ | :--------------------- | :------------------ |
| <a href="https://jfrog.com/help/r/jfrog-and-github-integration-guide/jfrog-and-github-integration-features-matrix">🐸 Enable the linkage to Artifactory</a><br><br><pre>πŸ“¦ docker-local<br>└── πŸ“ image2<br> └── πŸ“ sha256:552c<br> └── πŸ“„ sha256__aae9<br><br></pre> | Not scanned | Not scanned |
| <a href="https://jfrog.com/help/access?xinfo:appid=csh-gen-gitbook">🐸 Enable the linkage to Artifactory</a><br><br><pre>πŸ“¦ docker-local<br>└── πŸ“ image2<br> └── πŸ“ sha256:552c<br> └── πŸ“„ sha256__aae9<br><br></pre> | Not scanned | Not scanned |
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

| Artifacts | Security Violations | Security Issues |
| :------------ | :--------------------- | :------------------ |
| <a href="https://jfrog.com/help/r/jfrog-and-github-integration-guide/jfrog-and-github-integration-features-matrix">🐸 Enable the linkage to Artifactory</a><br><br><pre>πŸ“¦ generic-local<br>└── πŸ“ path<br> └── πŸ“ to<br> └── πŸ“„ artifact2<br><br></pre> | Not scanned | Not scanned |
| <a href="https://jfrog.com/help/access?xinfo:appid=csh-gen-gitbook">🐸 Enable the linkage to Artifactory</a><br><br><pre>πŸ“¦ generic-local<br>└── πŸ“ path<br> └── πŸ“ to<br> └── πŸ“„ artifact2<br><br></pre> | Not scanned | Not scanned |
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

| Artifacts | Security Violations | Security Issues |
| :------------ | :--------------------- | :------------------ |
| <a href="https://jfrog.com/help/r/jfrog-and-github-integration-guide/jfrog-and-github-integration-features-matrix">🐸 Enable the linkage to Artifactory</a><br><br><pre>πŸ“¦ libs-release<br>└── πŸ“ path<br> └── πŸ“ to<br> └── πŸ“„ artifact1<br><br></pre> | Not scanned | Not scanned |
| <a href="https://jfrog.com/help/access?xinfo:appid=csh-gen-gitbook">🐸 Enable the linkage to Artifactory</a><br><br><pre>πŸ“¦ libs-release<br>└── πŸ“ path<br> └── πŸ“ to<br> └── πŸ“„ artifact1<br><br></pre> | Not scanned | Not scanned |
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

| Artifacts | Security Violations | Security Issues |
| :------------ | :--------------------- | :------------------ |
| <a href="https://jfrog.com/help/r/jfrog-and-github-integration-guide/jfrog-and-github-integration-features-matrix">🐸 Enable the linkage to Artifactory</a><br><br><pre><details><summary>linux/amd64/multiarch-image:1</summary><br>πŸ“¦ docker-local<br>└── πŸ“ multiarch-image<br> β”œβ”€β”€ πŸ“ sha256:552c<br> β”‚ └── πŸ“„ sha256<br> └── πŸ“„ sha256<br><br></details></pre> | Not scanned | Not scanned |
| <a href="https://jfrog.com/help/access?xinfo:appid=csh-gen-gitbook">🐸 Enable the linkage to Artifactory</a><br><br><pre><details><summary>linux/amd64/multiarch-image:1</summary><br>πŸ“¦ docker-local<br>└── πŸ“ multiarch-image<br> β”œβ”€β”€ πŸ“ sha256:552c<br> β”‚ └── πŸ“„ sha256<br> └── πŸ“„ sha256<br><br></details></pre> | Not scanned | Not scanned |

0 comments on commit ebf2092

Please sign in to comment.