diff --git a/artifactory/utils/commandsummary/buildinfosummary.go b/artifactory/utils/commandsummary/buildinfosummary.go index 00fb71e36..b835b831d 100644 --- a/artifactory/utils/commandsummary/buildinfosummary.go +++ b/artifactory/utils/commandsummary/buildinfosummary.go @@ -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" ) @@ -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] } diff --git a/artifactory/utils/commandsummary/commandsummary.go b/artifactory/utils/commandsummary/commandsummary.go index 2dc17fd11..fe993ac9c 100644 --- a/artifactory/utils/commandsummary/commandsummary.go +++ b/artifactory/utils/commandsummary/commandsummary.go @@ -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) } diff --git a/artifactory/utils/commandsummary/markdownConfig.go b/artifactory/utils/commandsummary/markdownConfig.go index 931c9be42..300a93d69 100644 --- a/artifactory/utils/commandsummary/markdownConfig.go +++ b/artifactory/utils/commandsummary/markdownConfig.go @@ -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{} diff --git a/artifactory/utils/testdata/command_summaries/basic/build-info-table.md b/artifactory/utils/testdata/command_summaries/basic/build-info-table.md index ebcd93e69..96c5e8f14 100644 --- a/artifactory/utils/testdata/command_summaries/basic/build-info-table.md +++ b/artifactory/utils/testdata/command_summaries/basic/build-info-table.md @@ -2,6 +2,6 @@ | Build Info | Security Violations | Security Issues | | :--------- | :------------ | :------------ | -| 🐸 Enable the linkage to Artifactory

buildName 123 | Not scanned | Not scanned | +| 🐸 Enable the linkage to Artifactory

buildName 123 | Not scanned | Not scanned | diff --git a/artifactory/utils/testdata/command_summaries/basic/docker-image-module.md b/artifactory/utils/testdata/command_summaries/basic/docker-image-module.md index e390980f5..237a69a68 100644 --- a/artifactory/utils/testdata/command_summaries/basic/docker-image-module.md +++ b/artifactory/utils/testdata/command_summaries/basic/docker-image-module.md @@ -10,4 +10,4 @@ | Artifacts | Security Violations | Security Issues | | :------------ | :--------------------- | :------------------ | -| 🐸 Enable the linkage to Artifactory

📦 docker-local
└── 📁 image2
└── 📁 sha256:552c
└── 📄 sha256__aae9

| Not scanned | Not scanned | +| 🐸 Enable the linkage to Artifactory

📦 docker-local
└── 📁 image2
└── 📁 sha256:552c
└── 📄 sha256__aae9

| Not scanned | Not scanned | diff --git a/artifactory/utils/testdata/command_summaries/basic/generic-module.md b/artifactory/utils/testdata/command_summaries/basic/generic-module.md index ff9608223..2605bdb56 100644 --- a/artifactory/utils/testdata/command_summaries/basic/generic-module.md +++ b/artifactory/utils/testdata/command_summaries/basic/generic-module.md @@ -10,4 +10,4 @@ | Artifacts | Security Violations | Security Issues | | :------------ | :--------------------- | :------------------ | -| 🐸 Enable the linkage to Artifactory

📦 generic-local
└── 📁 path
└── 📁 to
└── 📄 artifact2

| Not scanned | Not scanned | +| 🐸 Enable the linkage to Artifactory

📦 generic-local
└── 📁 path
└── 📁 to
└── 📄 artifact2

| Not scanned | Not scanned | diff --git a/artifactory/utils/testdata/command_summaries/basic/maven-module.md b/artifactory/utils/testdata/command_summaries/basic/maven-module.md index 0a560a380..9aee43395 100644 --- a/artifactory/utils/testdata/command_summaries/basic/maven-module.md +++ b/artifactory/utils/testdata/command_summaries/basic/maven-module.md @@ -10,4 +10,4 @@ | Artifacts | Security Violations | Security Issues | | :------------ | :--------------------- | :------------------ | -| 🐸 Enable the linkage to Artifactory

📦 libs-release
└── 📁 path
└── 📁 to
└── 📄 artifact1

| Not scanned | Not scanned | +| 🐸 Enable the linkage to Artifactory

📦 libs-release
└── 📁 path
└── 📁 to
└── 📄 artifact1

| Not scanned | Not scanned | diff --git a/artifactory/utils/testdata/command_summaries/basic/multiarch-docker-image.md b/artifactory/utils/testdata/command_summaries/basic/multiarch-docker-image.md index ccff385b5..b0ccd5841 100644 --- a/artifactory/utils/testdata/command_summaries/basic/multiarch-docker-image.md +++ b/artifactory/utils/testdata/command_summaries/basic/multiarch-docker-image.md @@ -10,4 +10,4 @@ | Artifacts | Security Violations | Security Issues | | :------------ | :--------------------- | :------------------ | -| 🐸 Enable the linkage to Artifactory

linux/amd64/multiarch-image:1
📦 docker-local
└── 📁 multiarch-image
├── 📁 sha256:552c
│ └── 📄 sha256
└── 📄 sha256

| Not scanned | Not scanned | +| 🐸 Enable the linkage to Artifactory

linux/amd64/multiarch-image:1
📦 docker-local
└── 📁 multiarch-image
├── 📁 sha256:552c
│ └── 📄 sha256
└── 📄 sha256

| Not scanned | Not scanned |