Skip to content

Fix TestAuditDiffInPullRequest #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eyalk007 wants to merge 1 commit into
base: v3_er
Choose a base branch
from
+28 −14
Open

Fix TestAuditDiffInPullRequest #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions scanpullrequest/scanpullrequest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"github.com/CycloneDX/cyclonedx-go"
"github.com/jfrog/jfrog-cli-security/utils/formats/violationutils"
services2 "github.com/jfrog/jfrog-client-go/xsc/services"
xscservices "github.com/jfrog/jfrog-client-go/xsc/services"
"net/http"
"net/http/httptest"
"os"
Expand Down Expand Up @@ -46,19 +46,26 @@ const (
testTargetBranchName = "master"
)

var emptyConfigProfile = services2.ConfigProfile{
var defaultConfigProfile = xscservices.ConfigProfile{
ProfileName: "test-profile",
GeneralConfig: services2.GeneralConfig{},
FrogbotConfig: services2.FrogbotConfig{
GeneralConfig: xscservices.GeneralConfig{},
FrogbotConfig: xscservices.FrogbotConfig{
BranchNameTemplate: "",
PrTitleTemplate: "",
CommitMessageTemplate: "",
},
Modules: []services2.Module{
Modules: []xscservices.Module{
{
ModuleId: 0,
ModuleName: "test-module",
PathFromRoot: ".",
ScanConfig: xscservices.ScanConfig{
ScaScannerConfig: xscservices.ScaScannerConfig{EnableScaScan: true},
ContextualAnalysisScannerConfig: xscservices.CaScannerConfig{EnableCaScan: true},
SastScannerConfig: xscservices.SastScannerConfig{EnableSastScan: true},
SecretsScannerConfig: xscservices.SecretsScannerConfig{EnableSecretsScan: true},
IacScannerConfig: xscservices.IacScannerConfig{EnableIacScan: true},
},
},
},
}
Expand Down Expand Up @@ -291,7 +298,7 @@ func prepareConfigAndClient(t *testing.T, xrayVersion, xscVersion string, server
assert.NoError(t, err)

// We must set a non-nil config profile to avoid panic
repository.ConfigProfile = &emptyConfigProfile
repository.ConfigProfile = &defaultConfigProfile

return repository, client
}
Expand Down
23 changes: 15 additions & 8 deletions scanrepository/scanrepository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
services2 "github.com/jfrog/jfrog-client-go/xsc/services"
xscservices "github.com/jfrog/jfrog-client-go/xsc/services"
"net/http"
"net/http/httptest"
"os"
Expand Down Expand Up @@ -40,19 +40,26 @@ import (

const rootTestDir = "scanrepository"

var emptyConfigProfile = services2.ConfigProfile{
var defaultConfigProfile = xscservices.ConfigProfile{
ProfileName: "test-profile",
GeneralConfig: services2.GeneralConfig{},
FrogbotConfig: services2.FrogbotConfig{
GeneralConfig: xscservices.GeneralConfig{},
FrogbotConfig: xscservices.FrogbotConfig{
BranchNameTemplate: "",
PrTitleTemplate: "",
CommitMessageTemplate: "",
},
Modules: []services2.Module{
Modules: []xscservices.Module{
{
ModuleId: 0,
ModuleName: "test-module",
PathFromRoot: ".",
ScanConfig: xscservices.ScanConfig{
ScaScannerConfig: xscservices.ScaScannerConfig{EnableScaScan: true},
ContextualAnalysisScannerConfig: xscservices.CaScannerConfig{EnableCaScan: true},
SastScannerConfig: xscservices.SastScannerConfig{EnableSastScan: true},
SecretsScannerConfig: xscservices.SecretsScannerConfig{EnableSecretsScan: true},
IacScannerConfig: xscservices.IacScannerConfig{EnableIacScan: true},
},
},
},
}
Expand Down Expand Up @@ -201,7 +208,7 @@ func TestScanRepositoryCmd_Run(t *testing.T) {
assert.NoError(t, err)

// We must set a non-nil config profile to avoid panic
repository.ConfigProfile = &emptyConfigProfile
repository.ConfigProfile = &defaultConfigProfile

// Run
var cmd = ScanRepositoryCmd{XrayVersion: xrayVersion, XscVersion: xscVersion, dryRun: true, dryRunRepoPath: testDir}
Expand Down Expand Up @@ -330,7 +337,7 @@ pr body
repository, err := utils.BuildRepositoryFromEnv(xrayVersion, xscVersion, client, gitTestParams, &serverParams, utils.ScanRepository)
assert.NoError(t, err)
// We must set a non-nil config profile to avoid panic
repository.ConfigProfile = &emptyConfigProfile
repository.ConfigProfile = &defaultConfigProfile

// Run
var cmd = ScanRepositoryCmd{dryRun: true, dryRunRepoPath: testDir}
Expand Down Expand Up @@ -428,7 +435,7 @@ func TestPackageTypeFromScan(t *testing.T) {
XrayVersion: xrayVersion,
XscVersion: xscVersion,
ServerDetails: &frogbotParams.Server,
ConfigProfile: &emptyConfigProfile,
ConfigProfile: &defaultConfigProfile,
}
testScan.scanDetails = &scanSetup
scanResponse, err := testScan.scan()
Expand Down
Loading