Merge branch 'philipcunningham-upgrade-dast-version-for-on-demand-scans-333646' into 'master'

Increment DAST_VERSION in on-demand DAST template

See merge request gitlab-org/gitlab!65218

ee/spec/lib/ee/gitlab/ci/config_spec.rb

@@ -130,7 +130,7 @@ RSpec.describe Gitlab::Ci::Config do
                   image: { name: '$SECURE_ANALYZERS_PREFIX/dast:$DAST_VERSION' },
                   variables: {
                     DAST_AUTH_URL: dast_site_profile.auth_url,
-                    DAST_VERSION: 1,
+                    DAST_VERSION: 2,
                     SECURE_ANALYZERS_PREFIX: secure_analyzers_prefix,
                     DAST_WEBSITE: dast_site_profile.dast_site.url,
                     DAST_FULL_SCAN_ENABLED: 'false',

ee/spec/lib/gitlab/ci/config/security_orchestration_policies/processor_spec.rb

@@ -132,7 +132,7 @@ RSpec.describe Gitlab::Ci::Config::SecurityOrchestrationPolicies::Processor do
                 },
                 variables: {
                   DAST_AUTH_URL: dast_site_profile.auth_url,
-                  DAST_VERSION: 1,
+                  DAST_VERSION: 2,
                   SECURE_ANALYZERS_PREFIX: secure_analyzers_prefix,
                   DAST_WEBSITE: dast_site_profile.dast_site.url,
                   DAST_FULL_SCAN_ENABLED: 'false',

ee/spec/services/ci/run_dast_scan_service_spec.rb

@@ -146,7 +146,7 @@ RSpec.describe Ci::RunDastScanService do
             public: true
           }, {
             key: 'DAST_VERSION',
-            value: '1',
+            value: '2',
             public: true
           }, {
             key: 'DAST_WEBSITE',

ee/spec/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe Security::SecurityOrchestrationPolicies::OnDemandScanPipelineConf
             DAST_USERNAME: site_profile.auth_username,
             DAST_USERNAME_FIELD: site_profile.auth_username_field,
             DAST_USE_AJAX_SPIDER: 'false',
-            DAST_VERSION: 1,
+            DAST_VERSION: 2,
             DAST_WEBSITE: site_profile.dast_site.url,
             SECURE_ANALYZERS_PREFIX: secure_analyzers_prefix
           },

lib/gitlab/ci/templates/Security/DAST-On-Demand-Scan.gitlab-ci.yml

@@ -10,7 +10,7 @@ stages:
   - dast
 
 variables:
-  DAST_VERSION: 1
+  DAST_VERSION: 2
   # Setting this variable will affect all Security templates
   # (SAST, Dependency Scanning, ...)
   SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"