Commit d1880e31 authored by Daniel Paul Searles's avatar Daniel Paul Searles

Remove SAST_ANALYZER_IMAGE_TAG from SAST config UI

parent 422219ba
...@@ -18,15 +18,6 @@ ...@@ -18,15 +18,6 @@
"value": "", "value": "",
"size": "MEDIUM", "size": "MEDIUM",
"description": "Comma-separated list of paths to be excluded from analyzer output. Patterns can be globs, file paths, or folder paths." "description": "Comma-separated list of paths to be excluded from analyzer output. Patterns can be globs, file paths, or folder paths."
},
{
"field" : "SAST_ANALYZER_IMAGE_TAG",
"label" : "Image tag",
"type": "string",
"default_value": "",
"value": "",
"size": "SMALL",
"description": "Analyzer image's tag"
} }
], ],
"pipeline": [ "pipeline": [
......
...@@ -114,7 +114,6 @@ module Security ...@@ -114,7 +114,6 @@ module Security
def sast_variables def sast_variables
%w( %w(
SAST_ANALYZER_IMAGE_TAG
SAST_EXCLUDED_PATHS SAST_EXCLUDED_PATHS
SEARCH_MAX_DEPTH SEARCH_MAX_DEPTH
SAST_EXCLUDED_ANALYZERS SAST_EXCLUDED_ANALYZERS
......
...@@ -17,7 +17,6 @@ module QA ...@@ -17,7 +17,6 @@ module QA
[ [
%w(SECURE_ANALYZERS_PREFIX registry.example.com), %w(SECURE_ANALYZERS_PREFIX registry.example.com),
%w(SAST_EXCLUDED_PATHS foo,\ bar), %w(SAST_EXCLUDED_PATHS foo,\ bar),
%w(SAST_ANALYZER_IMAGE_TAG latest),
%w(SAST_BANDIT_EXCLUDED_PATHS exclude_path_a,\ exclude_path_b) %w(SAST_BANDIT_EXCLUDED_PATHS exclude_path_a,\ exclude_path_b)
] ]
end end
......
...@@ -12,7 +12,6 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do ...@@ -12,7 +12,6 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do
[ [
{ 'field' => 'stage', 'defaultValue' => 'test', 'value' => 'test' }, { 'field' => 'stage', 'defaultValue' => 'test', 'value' => 'test' },
{ 'field' => 'SEARCH_MAX_DEPTH', 'defaultValue' => 4, 'value' => 4 }, { 'field' => 'SEARCH_MAX_DEPTH', 'defaultValue' => 4, 'value' => 4 },
{ 'field' => 'SAST_ANALYZER_IMAGE_TAG', 'defaultValue' => 2, 'value' => 2 },
{ 'field' => 'SAST_EXCLUDED_PATHS', 'defaultValue' => 'spec, test, tests, tmp', 'value' => 'spec, test, tests, tmp' } { 'field' => 'SAST_EXCLUDED_PATHS', 'defaultValue' => 'spec, test, tests, tmp', 'value' => 'spec, test, tests, tmp' }
] } ] }
end end
...@@ -26,7 +25,6 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do ...@@ -26,7 +25,6 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do
[ [
{ 'field' => 'stage', 'defaultValue' => 'test', 'value' => 'security' }, { 'field' => 'stage', 'defaultValue' => 'test', 'value' => 'security' },
{ 'field' => 'SEARCH_MAX_DEPTH', 'defaultValue' => 4, 'value' => 1 }, { 'field' => 'SEARCH_MAX_DEPTH', 'defaultValue' => 4, 'value' => 1 },
{ 'field' => 'SAST_ANALYZER_IMAGE_TAG', 'defaultValue' => 2, 'value' => 2 },
{ 'field' => 'SAST_EXCLUDED_PATHS', 'defaultValue' => 'spec, test, tests, tmp', 'value' => 'spec,docs' } { 'field' => 'SAST_EXCLUDED_PATHS', 'defaultValue' => 'spec, test, tests, tmp', 'value' => 'spec,docs' }
] } ] }
end end
...@@ -176,7 +174,6 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do ...@@ -176,7 +174,6 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do
[ [
{ 'field' => 'stage', 'defaultValue' => 'test', 'value' => 'brand_new_stage' }, { 'field' => 'stage', 'defaultValue' => 'test', 'value' => 'brand_new_stage' },
{ 'field' => 'SEARCH_MAX_DEPTH', 'defaultValue' => 4, 'value' => 5 }, { 'field' => 'SEARCH_MAX_DEPTH', 'defaultValue' => 4, 'value' => 5 },
{ 'field' => 'SAST_ANALYZER_IMAGE_TAG', 'defaultValue' => 2, 'value' => 2 },
{ 'field' => 'SAST_EXCLUDED_PATHS', 'defaultValue' => 'spec, test, tests, tmp', 'value' => 'spec,docs' } { 'field' => 'SAST_EXCLUDED_PATHS', 'defaultValue' => 'spec, test, tests, tmp', 'value' => 'spec,docs' }
] } ] }
end end
...@@ -227,27 +224,27 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do ...@@ -227,27 +224,27 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do
def existing_gitlab_ci_and_template_array_without_sast def existing_gitlab_ci_and_template_array_without_sast
{ "stages" => %w(test security), { "stages" => %w(test security),
"variables" => { "RANDOM" => "make sure this persists", "SECURE_ANALYZERS_PREFIX" => "localhost:5000/analyzers" }, "variables" => { "RANDOM" => "make sure this persists", "SECURE_ANALYZERS_PREFIX" => "localhost:5000/analyzers" },
"sast" => { "variables" => { "SAST_ANALYZER_IMAGE_TAG" => 2, "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" }, "sast" => { "variables" => { "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" },
"include" => [{ "template" => "existing.yml" }] } "include" => [{ "template" => "existing.yml" }] }
end end
def existing_gitlab_ci_and_single_template_with_sast_and_default_stage def existing_gitlab_ci_and_single_template_with_sast_and_default_stage
{ "stages" => %w(test), { "stages" => %w(test),
"variables" => { "SECURE_ANALYZERS_PREFIX" => "localhost:5000/analyzers" }, "variables" => { "SECURE_ANALYZERS_PREFIX" => "localhost:5000/analyzers" },
"sast" => { "variables" => { "SAST_ANALYZER_IMAGE_TAG" => 2, "SEARCH_MAX_DEPTH" => 1 }, "stage" => "test" }, "sast" => { "variables" => { "SEARCH_MAX_DEPTH" => 1 }, "stage" => "test" },
"include" => { "template" => "Security/SAST.gitlab-ci.yml" } } "include" => { "template" => "Security/SAST.gitlab-ci.yml" } }
end end
def existing_gitlab_ci_and_single_template_without_sast def existing_gitlab_ci_and_single_template_without_sast
{ "stages" => %w(test security), { "stages" => %w(test security),
"variables" => { "RANDOM" => "make sure this persists", "SECURE_ANALYZERS_PREFIX" => "localhost:5000/analyzers" }, "variables" => { "RANDOM" => "make sure this persists", "SECURE_ANALYZERS_PREFIX" => "localhost:5000/analyzers" },
"sast" => { "variables" => { "SAST_ANALYZER_IMAGE_TAG" => 2, "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" }, "sast" => { "variables" => { "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" },
"include" => { "template" => "existing.yml" } } "include" => { "template" => "existing.yml" } }
end end
def existing_gitlab_ci_with_no_variables def existing_gitlab_ci_with_no_variables
{ "stages" => %w(test security), { "stages" => %w(test security),
"sast" => { "variables" => { "SAST_ANALYZER_IMAGE_TAG" => 2, "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" }, "sast" => { "variables" => { "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" },
"include" => [{ "template" => "Security/SAST.gitlab-ci.yml" }] } "include" => [{ "template" => "Security/SAST.gitlab-ci.yml" }] }
end end
...@@ -267,7 +264,7 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do ...@@ -267,7 +264,7 @@ RSpec.describe Security::CiConfiguration::SastBuildAction do
def existing_gitlab_ci def existing_gitlab_ci
{ "stages" => %w(test security), { "stages" => %w(test security),
"variables" => { "RANDOM" => "make sure this persists", "SECURE_ANALYZERS_PREFIX" => "bad_prefix" }, "variables" => { "RANDOM" => "make sure this persists", "SECURE_ANALYZERS_PREFIX" => "bad_prefix" },
"sast" => { "variables" => { "SAST_ANALYZER_IMAGE_TAG" => 2, "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" }, "sast" => { "variables" => { "SEARCH_MAX_DEPTH" => 1 }, "stage" => "security" },
"include" => [{ "template" => "Security/SAST.gitlab-ci.yml" }] } "include" => [{ "template" => "Security/SAST.gitlab-ci.yml" }] }
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment