New XSC analytics metrics capabilities #1165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Improve UI for scan command (jfrog#706) * Upgrade go version in go.mod to 1.20 (jfrog#732) * Fix lint issues found (jfrog#733) * Config transfer - ensure target not older than source (jfrog#721) * Update tests environment - nuget and dotnet to version 6 (jfrog#734) * Flatten audit graph (jfrog#736) * Use gradle-dep-tree with Audit (jfrog#719) --------- Co-authored-by: Sara Omari <[email protected]> Co-authored-by: Eyal Ben Moshe <[email protected]> Co-authored-by: Michael Sverdlov <[email protected]> Co-authored-by: Yahav Itzhak <[email protected]>
# Conflicts: # .github/workflows/analysis.yml # go.mod # go.sum # xray/audit/java/gradle.go # xray/commands/audit/generic/auditmanager.go
attiasas
suggested changes
Mar 31, 2024
attiasas
suggested changes
Mar 31, 2024
# Conflicts: # go.mod # go.sum
gailazar300
changed the title
attiasas
suggested changes
Apr 2, 2024
common/tests/utils.go
Outdated
Comment on lines
78
to
86
|
|
||
| func CreateXscRestsMockServer(t *testing.T, testHandler restsTestHandler) (*httptest.Server, *config.ServerDetails, artifactory.ArtifactoryServicesManager) { | ||
| testServer := CreateRestsMockServer(testHandler) | ||
| serverDetails := &config.ServerDetails{Url: testServer.URL + "/", XrayUrl: testServer.URL + "/xray/"} | ||
|
|
||
| serviceManager, err := utils.CreateServiceManager(serverDetails, -1, 0, false) | ||
| assert.NoError(t, err) | ||
| return testServer, serverDetails, serviceManager | ||
| } |
There was a problem hiding this comment.
This can be created at: jfrog/jfrog-cli-security#47
where it is used. We probably will only use mocks for Xray in our repository
added to tests/utils/test_utils.go / tests/utils/test_config.go
There was a problem hiding this comment.
all other mocks are there, so it makes sense that they will all be together in the same place.
| @@ -572,6 +573,7 @@ type ServerDetails struct { | |||
| ArtifactoryUrl string `json:"artifactoryUrl,omitempty"` | |||
| DistributionUrl string `json:"distributionUrl,omitempty"` | |||
| XrayUrl string `json:"xrayUrl,omitempty"` | |||
| XscUrl string `json:"xscUrl,omitempty"` | |||
There was a problem hiding this comment.
Why did you add that if it is never used?
at client-go you are using GetUrl() and you are setings using the value at XrayUrl
There was a problem hiding this comment.
we use this field for logic in security-cli
utils/coreutils/techutils.go
Outdated
Comment on lines
40
to
55
| func TechnologyToLanguage(technology Technology) CodeLanguage { | ||
| languageMap := map[Technology]CodeLanguage{ | ||
| Npm: JavaScript, | ||
| Pip: Python, | ||
| Poetry: Python, | ||
| Pipenv: Python, | ||
| Go: GoLang, | ||
| Maven: Java, | ||
| Gradle: Java, | ||
| Nuget: CSharp, | ||
| Dotnet: CSharp, | ||
| Yarn: JavaScript, | ||
| Pnpm: JavaScript, | ||
| } | ||
| return languageMap[technology] | ||
| } |
There was a problem hiding this comment.
Instead of this func, you can attach the value directly to the TechData as new attribute Language CodeLanguage
There was a problem hiding this comment.
I don't understand your comment, but what is wrong with this implementation?
6 tasks
attiasas
added
improvement
eyalbe4
changed the title
eyalbe4
added
improvement
eyalbe4
requested changes
Apr 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
depends on: jfrog/jfrog-client-go#928