Remove all config yml file support and references

- Deleted .frogbot/frogbot-config.yml from repo root
- Deleted testdata/config/ directory with all config test files
- Deleted .frogbot directories from scanrepository test subdirectories
- Removed configPath parameters from test functions
- Removed config file validation from schema tests
- Removed unused config file path constants
- Cleaned up unused imports

Config files are no longer used - all configuration now comes from environment variables only

Author: eyalk007

.frogbot/frogbot-config.yml

@@ -36,15 +36,8 @@ import (
 )
 
 const (
-	testMultiDirProjConfigPath       = "testdata/config/frogbot-config-multi-dir-test-proj.yml"
-	testMultiDirProjConfigPathNoFail = "testdata/config/frogbot-config-multi-dir-test-proj-no-fail.yml"
-	testProjSubdirConfigPath         = "testdata/config/frogbot-config-test-proj-subdir.yml"
-	testCleanProjConfigPath          = "testdata/config/frogbot-config-clean-test-proj.yml"
-	testProjConfigPath               = "testdata/config/frogbot-config-test-proj.yml"
-	testProjConfigPathNoFail         = "testdata/config/frogbot-config-test-proj-no-fail.yml"
-	testJasProjConfigPath            = "testdata/config/frogbot-config-jas-diff-proj.yml"
-	testSourceBranchName             = "pr"
-	testTargetBranchName             = "master"
+	testSourceBranchName = "pr"
+	testTargetBranchName = "master"
 )
 
 func TestScanResultsToIssuesCollection(t *testing.T) {
@@ -209,56 +202,49 @@ func TestScanResultsToIssuesCollection(t *testing.T) {
 func TestScanPullRequest(t *testing.T) {
 	tests := []struct {
 		testName             string
-		configPath           string
 		projectName          string
 		failOnSecurityIssues bool
 	}{
 		{
 			testName:             "ScanPullRequest",
-			configPath:           testProjConfigPath,
 			projectName:          "test-proj",
 			failOnSecurityIssues: true,
 		},
 		{
 			testName:             "ScanPullRequestNoFail",
-			configPath:           testProjConfigPathNoFail,
 			projectName:          "test-proj",
 			failOnSecurityIssues: false,
 		},
 		{
 			testName:             "ScanPullRequestSubdir",
-			configPath:           testProjSubdirConfigPath,
 			projectName:          "test-proj-subdir",
 			failOnSecurityIssues: true,
 		},
 		{
 			testName:             "ScanPullRequestNoIssues",
-			configPath:           testCleanProjConfigPath,
 			projectName:          "clean-test-proj",
 			failOnSecurityIssues: false,
 		},
 		{
 			testName:             "ScanPullRequestMultiWorkDir",
-			configPath:           testMultiDirProjConfigPathNoFail,
 			projectName:          "multi-dir-test-proj",
 			failOnSecurityIssues: false,
 		},
 		{
 			testName:             "ScanPullRequestMultiWorkDirNoFail",
-			configPath:           testMultiDirProjConfigPath,
 			projectName:          "multi-dir-test-proj",
 			failOnSecurityIssues: true,
 		},
 	}
 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
-			testScanPullRequest(t, test.configPath, test.projectName, test.failOnSecurityIssues)
+			testScanPullRequest(t, test.projectName, test.failOnSecurityIssues)
 		})
 	}
 }
 
-func testScanPullRequest(t *testing.T, configPath, projectName string, failOnSecurityIssues bool) {
-	configAggregator, client, cleanUp := preparePullRequestTest(t, projectName, configPath)
+func testScanPullRequest(t *testing.T, projectName string, failOnSecurityIssues bool) {
+	configAggregator, client, cleanUp := preparePullRequestTest(t, projectName)
 	defer cleanUp()
 
 	// Run "frogbot scan pull request"
@@ -331,7 +317,7 @@ func TestVerifyGitHubFrogbotEnvironmentOnPrem(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func prepareConfigAndClient(t *testing.T, xrayVersion, xscVersion, configPath string, server *httptest.Server, serverParams coreconfig.ServerDetails, gitServerParams GitServerParams) (utils.RepoAggregator, vcsclient.VcsClient) {
+func prepareConfigAndClient(t *testing.T, xrayVersion, xscVersion string, server *httptest.Server, serverParams coreconfig.ServerDetails, gitServerParams GitServerParams) (utils.RepoAggregator, vcsclient.VcsClient) {
 	gitTestParams := &utils.Git{
 		GitProvider: vcsutils.GitHub,
 		RepoOwner:   gitServerParams.RepoOwner,
@@ -472,13 +458,11 @@ func TestAuditDiffInPullRequest(t *testing.T) {
 	tests := []struct {
 		testName       string
 		projectName    string
-		configPath     string
 		expectedIssues TestResult
 	}{
 		{
 			testName:    "Project with Jas issues (issues added removed and not changed)",
 			projectName: "jas-diff-proj",
-			configPath:  testJasProjConfigPath,
 			expectedIssues: TestResult{
 				Sca:  4,
 				Sast: 1,
@@ -488,7 +472,7 @@ func TestAuditDiffInPullRequest(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
-			repoConfig, client, cleanUpTest := preparePullRequestTest(t, test.projectName, test.configPath)
+			repoConfig, client, cleanUpTest := preparePullRequestTest(t, test.projectName)
 			defer cleanUpTest()
 
 			assert.Len(t, repoConfig, 1)
@@ -1135,7 +1119,7 @@ func TestFilterOutFailedScansIfAllowPartialResultsEnabled(t *testing.T) {
 	}
 }
 
-func preparePullRequestTest(t *testing.T, projectName, configPath string) (utils.RepoAggregator, vcsclient.VcsClient, func()) {
+func preparePullRequestTest(t *testing.T, projectName string) (utils.RepoAggregator, vcsclient.VcsClient, func()) {
 	params, restoreEnv := utils.VerifyEnv(t)
 
 	xrayVersion, xscVersion, err := xsc.GetJfrogServicesVersion(&params)
@@ -1154,7 +1138,7 @@ func preparePullRequestTest(t *testing.T, projectName, configPath string) (utils
 	server := httptest.NewServer(createGitLabHandler(t, gitServerParams))
 
 	testDir, cleanUp := utils.CopyTestdataProjectsToTemp(t, "scanpullrequest")
-	configAggregator, client := prepareConfigAndClient(t, xrayVersion, xscVersion, configPath, server, params, gitServerParams)
+	configAggregator, client := prepareConfigAndClient(t, xrayVersion, xscVersion, server, params, gitServerParams)
 
 	// Renames test git folder to .git
 	currentDir := filepath.Join(testDir, projectName)

scanpullrequest/scanpullrequest_test.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 
@@ -21,7 +20,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-var testScanMultipleRepositoriesConfigPath = filepath.Join("..", "testdata", "config", "frogbot-config-scan-multiple-repositories.yml")
 var testRepositories = []string{"pip-repo", "npm-repo", "mvn-repo"}
 
 func TestScanAndFixRepos(t *testing.T) {

scanrepository/scanmultiplerepositories_test.go

@@ -84,7 +84,6 @@ var testPackagesData = []struct {
 func TestScanRepositoryCmd_Run(t *testing.T) {
 	tests := []struct {
 		testName                       string
-		configPath                     string
 		expectedPackagesInBranch       map[string][]string
 		expectedVersionUpdatesInBranch map[string][]string
 		expectedMissingFilesInBranch   map[string][]string
@@ -106,7 +105,6 @@ func TestScanRepositoryCmd_Run(t *testing.T) {
 			expectedMissingFilesInBranch:   map[string][]string{"frogbot-update-npm-dependencies-master": {"npm1/package-lock.json", "npm2/package-lock.json"}},
 			packageDescriptorPaths:         []string{"npm1/package.json", "npm2/package.json"},
 			aggregateFixes:                 true,
-			configPath:                     "../testdata/scanrepository/cmd/aggregate-multi-dir/.frogbot/frogbot-config.yml",
 		},
 		{
 			testName:                       "aggregate-multi-project",
@@ -115,7 +113,6 @@ func TestScanRepositoryCmd_Run(t *testing.T) {
 			expectedMissingFilesInBranch:   map[string][]string{"frogbot-update-npm-dependencies-master": {"npm/package-lock.json"}},
 			packageDescriptorPaths:         []string{"npm/package.json", "pip/requirements.txt"},
 			aggregateFixes:                 true,
-			configPath:                     "../testdata/scanrepository/cmd/aggregate-multi-project/.frogbot/frogbot-config.yml",
 		},
 		{
 			testName: "aggregate-no-vul",
@@ -148,7 +145,6 @@ func TestScanRepositoryCmd_Run(t *testing.T) {
 			expectedVersionUpdatesInBranch: map[string][]string{"frogbot-update-npm-dependencies-master": {"1.2.6", "0.8.4"}},
 			packageDescriptorPaths:         []string{"package.json", "inner-project/package.json"},
 			aggregateFixes:                 true,
-			configPath:                     "../testdata/scanrepository/cmd/partial-results-enabled/.frogbot/frogbot-config.yml",
 			allowPartialResults:            true,
 		},
 	}

scanrepository/scanrepository_test.go

@@ -22,37 +22,13 @@ const (
 )
 
 func TestFrogbotSchema(t *testing.T) {
-	// Load frogbot schema
-	schema, err := os.ReadFile("frogbot-schema.json")
-	assert.NoError(t, err)
-	schemaLoader := gojsonschema.NewBytesLoader(schema)
-
-	// Config files are no longer used - skip repository config validation
-
-	// Validate all frogbot configs in commands/testdata/config
-	validateYamlsInDirectory(t, filepath.Join("..", "testdata", "config"), schemaLoader)
+	// Config files are no longer used - schema validation tests are skipped
+	t.Skip("Config files are no longer used")
 }
 
 func TestBadFrogbotSchemas(t *testing.T) {
-	// Load frogbot schema
-	schema, err := os.ReadFile("frogbot-schema.json")
-	assert.NoError(t, err)
-	schemaLoader := gojsonschema.NewBytesLoader(schema)
-
-	// Validate all bad frogbot configs in schema/testdata/
-	testCases := []struct {
-		testName    string
-		errorString string
-	}{
-		{"additional-prop", "Additional property additionalProp is not allowed"},
-		{"no-array", "Expected: array, given: object"},
-		{"no-git", "git is required"},
-		{"no-repo", "repoName is required"},
-		{"empty-repo", "Expected: string, given: null"},
-	}
-	for _, testCase := range testCases {
-		validateYamlSchema(t, schemaLoader, filepath.Join("testdata", testCase.testName+".yml"), testCase.errorString)
-	}
+	// Config files are no longer used - schema validation tests are skipped
+	t.Skip("Config files are no longer used")
 }
 
 func TestJFrogPipelinesTemplates(t *testing.T) {