diff --git a/audit_test.go b/audit_test.go index 0e270d6d..df2e3421 100644 --- a/audit_test.go +++ b/audit_test.go @@ -323,13 +323,13 @@ func TestXrayAuditMultiProjects(t *testing.T) { defer clientTests.ChangeDirAndAssert(t, prevWd) workingDirsFlag := fmt.Sprintf("--working-dirs=%s, %s ,%s, %s", filepath.Join(tempDirPath, "package-managers", "maven", "maven"), filepath.Join(tempDirPath, "package-managers", "nuget", "single4.0"), - filepath.Join(tempDirPath, "package-managers", "python", "pip", "pip-project"), filepath.Join(tempDirPath, "jas", "jas-test")) + filepath.Join(tempDirPath, "package-managers", "python", "pip", "pip-project"), filepath.Join(tempDirPath, "jas", "jas")) // Configure a new server named "default" securityTestUtils.CreateJfrogHomeConfig(t, true) defer securityTestUtils.CleanTestsHomeEnv() output := securityTests.PlatformCli.WithoutCredentials().RunCliCmdWithOutput(t, "audit", "--format="+string(format.SimpleJson), workingDirsFlag) securityTestUtils.VerifySimpleJsonScanResults(t, output, 35, 0) - securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 0, 0, 0, 25, 1) + securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 7, 3, 0, 25, 2) } func TestXrayAuditPipJson(t *testing.T) { @@ -432,7 +432,7 @@ func addDummyPackageDescriptor(t *testing.T, hasPackageJson bool) { // JAS func TestXrayAuditJasSimpleJson(t *testing.T) { - output := testXrayAuditJas(t, string(format.SimpleJson), filepath.Join("jas", "jas-test")) + output := testXrayAuditJas(t, string(format.SimpleJson), filepath.Join("jas", "jas")) securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 7, 3, 0, 2, 2) } diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc/module.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc/module.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc/module.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc/module.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc/outputs.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc/outputs.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc/outputs.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc/outputs.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc/variables.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc/variables.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc/variables.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc/variables.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc/versions.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc/versions.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc/versions.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc/versions.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/module.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc_pp/module.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/module.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc_pp/module.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/outputs.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc_pp/outputs.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/outputs.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc_pp/outputs.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/variables.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc_pp/variables.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/variables.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc_pp/variables.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/versions.tf b/tests/testdata/projects/jas/jas/iac/azure/vpc_pp/versions.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/azure/vpc_pp/versions.tf rename to tests/testdata/projects/jas/jas/iac/azure/vpc_pp/versions.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/files/chk_k8s_nat b/tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/files/chk_k8s_nat similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/files/chk_k8s_nat rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/files/chk_k8s_nat diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/module.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/module.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/module.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/module.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/outputs.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/outputs.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/outputs.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/outputs.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/variables.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/variables.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/variables.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/variables.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/versions.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/versions.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-oss/versions.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-oss/versions.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/files/chk_k8s_nat b/tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/files/chk_k8s_nat similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/files/chk_k8s_nat rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/files/chk_k8s_nat diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/module.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/module.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/module.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/module.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/outputs.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/outputs.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/outputs.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/outputs.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/rbac.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/rbac.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/rbac.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/rbac.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/variables.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/variables.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/variables.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/variables.tf diff --git a/tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/versions.tf b/tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/versions.tf similarity index 100% rename from tests/testdata/projects/jas/jas-test/iac/gcp/k8s-pipelines-bp/versions.tf rename to tests/testdata/projects/jas/jas/iac/gcp/k8s-pipelines-bp/versions.tf diff --git a/tests/testdata/projects/jas/jas-test/main.py b/tests/testdata/projects/jas/jas/main.py similarity index 100% rename from tests/testdata/projects/jas/jas-test/main.py rename to tests/testdata/projects/jas/jas/main.py diff --git a/tests/testdata/projects/jas/jas-test/requirements.txt b/tests/testdata/projects/jas/jas/requirements.txt similarity index 100% rename from tests/testdata/projects/jas/jas-test/requirements.txt rename to tests/testdata/projects/jas/jas/requirements.txt diff --git a/tests/testdata/projects/jas/jas-test/sast/flask_webgoat/__init__.py b/tests/testdata/projects/jas/jas/sast/flask_webgoat/__init__.py similarity index 100% rename from tests/testdata/projects/jas/jas-test/sast/flask_webgoat/__init__.py rename to tests/testdata/projects/jas/jas/sast/flask_webgoat/__init__.py diff --git a/tests/testdata/projects/jas/jas-test/sast/flask_webgoat/ui.py b/tests/testdata/projects/jas/jas/sast/flask_webgoat/ui.py similarity index 100% rename from tests/testdata/projects/jas/jas-test/sast/flask_webgoat/ui.py rename to tests/testdata/projects/jas/jas/sast/flask_webgoat/ui.py diff --git a/tests/testdata/projects/jas/jas-test/sast/result.sarif b/tests/testdata/projects/jas/jas/sast/result.sarif similarity index 100% rename from tests/testdata/projects/jas/jas-test/sast/result.sarif rename to tests/testdata/projects/jas/jas/sast/result.sarif diff --git a/tests/testdata/projects/jas/jas-test/sast/run.py b/tests/testdata/projects/jas/jas/sast/run.py similarity index 100% rename from tests/testdata/projects/jas/jas-test/sast/run.py rename to tests/testdata/projects/jas/jas/sast/run.py diff --git a/tests/testdata/projects/jas/jas-test/secrets/more_secrets/key b/tests/testdata/projects/jas/jas/secrets/more_secrets/key similarity index 100% rename from tests/testdata/projects/jas/jas-test/secrets/more_secrets/key rename to tests/testdata/projects/jas/jas/secrets/more_secrets/key diff --git a/tests/testdata/projects/jas/jas-test/secrets/more_secrets/sequence b/tests/testdata/projects/jas/jas/secrets/more_secrets/sequence similarity index 100% rename from tests/testdata/projects/jas/jas-test/secrets/more_secrets/sequence rename to tests/testdata/projects/jas/jas/secrets/more_secrets/sequence diff --git a/tests/testdata/projects/jas/jas-test/secrets/secret_generic/blacklist b/tests/testdata/projects/jas/jas/secrets/secret_generic/blacklist similarity index 100% rename from tests/testdata/projects/jas/jas-test/secrets/secret_generic/blacklist rename to tests/testdata/projects/jas/jas/secrets/secret_generic/blacklist diff --git a/tests/testdata/projects/jas/jas-test/secrets/secret_generic/gibberish b/tests/testdata/projects/jas/jas/secrets/secret_generic/gibberish similarity index 100% rename from tests/testdata/projects/jas/jas-test/secrets/secret_generic/gibberish rename to tests/testdata/projects/jas/jas/secrets/secret_generic/gibberish