Merge pull request #2064 from DependencyTrack/update-e2e-tests

Update e2e tests for renamed analysisTrigger notification field

Author: nscuro

e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java

@@ -167,30 +167,6 @@ private GenericContainer<?> createApiServerContainer() {
                 .withEnv("INIT_TASKS_ENABLED", "false")
                 .withEnv("ALPINE_BCRYPT_ROUNDS", "4")
                 .withEnv("ALPINE_SECRET_KEY_PATH", "/var/run/secrets/secret.key")
-                // Reduce polling delays for dex workers.
-                // TODO: This should be simpler to configure.
-                .withEnv("DT_DEX_ENGINE_WORKFLOW_WORKER_DEFAULT_MIN_POLL_INTERVAL_MS", "10")
-                .withEnv("DT_DEX_ENGINE_WORKFLOW_WORKER_DEFAULT_POLL_BACKOFF_INITIAL_DELAY_MS", "10")
-                .withEnv("DT_DEX_ENGINE_WORKFLOW_WORKER_DEFAULT_POLL_BACKOFF_MULTIPLIER", "1")
-                .withEnv("DT_DEX_ENGINE_WORKFLOW_WORKER_DEFAULT_POLL_BACKOFF_RANDOMIZATION_FACTOR", "0.1")
-                .withEnv("DT_DEX_ENGINE_WORKFLOW_WORKER_DEFAULT_POLL_BACKOFF_MAX_DELAY_MS", "25")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_DEFAULT_MIN_POLL_INTERVAL_MS", "10")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_DEFAULT_POLL_BACKOFF_INITIAL_DELAY_MS", "10")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_DEFAULT_POLL_BACKOFF_MULTIPLIER", "1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_DEFAULT_POLL_BACKOFF_RANDOMIZATION_FACTOR", "0.1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_DEFAULT_POLL_BACKOFF_MAX_DELAY_MS", "25")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_NOTIFICATION_POLL_BACKOFF_INITIAL_DELAY_MS", "10")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_NOTIFICATION_POLL_BACKOFF_MULTIPLIER", "1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_NOTIFICATION_POLL_BACKOFF_RANDOMIZATION_FACTOR", "0.1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_NOTIFICATION_POLL_BACKOFF_MAX_DELAY_MS", "25")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_POLL_BACKOFF_INITIAL_DELAY_MS", "10")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_POLL_BACKOFF_MULTIPLIER", "1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_POLL_BACKOFF_RANDOMIZATION_FACTOR", "0.1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_POLL_BACKOFF_MAX_DELAY_MS", "25")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_RECONCILIATION_POLL_BACKOFF_INITIAL_DELAY_MS", "10")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_RECONCILIATION_POLL_BACKOFF_MULTIPLIER", "1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_RECONCILIATION_POLL_BACKOFF_RANDOMIZATION_FACTOR", "0.1")
-                .withEnv("DT_DEX_ENGINE_ACTIVITY_WORKER_VULN_ANALYSIS_RECONCILIATION_POLL_BACKOFF_MAX_DELAY_MS", "25")
                 .withCopyFileToContainer(
                         MountableFile.forHostPath(secretKeyPath, 444),
                         "/var/run/secrets/secret.key"

e2e/src/test/java/org/dependencytrack/e2e/BomUploadProcessingE2ET.java

@@ -258,7 +258,7 @@ private void verifyWebhookNotification() {
                                 "apiUri": "/api/v1/vulnerability/source/INTERNAL/vuln/INT-123/projects",
                                 "frontendUri": "/vulnerabilities/INTERNAL/INT-123/affectedProjects"
                               },
-                              "analysisTrigger" : "VULNERABILITY_ANALYSIS_TRIGGER_BOM_UPLOAD",
+                              "analysisTrigger" : "ANALYSIS_TRIGGER_BOM_UPLOAD",
                               "vulnerabilityAnalysisLevel": "BOM_UPLOAD_ANALYSIS",
                               "affectedProjects": [
                                 {

e2e/src/test/java/org/dependencytrack/e2e/VulnerabilityPolicyE2ET.java

@@ -536,7 +536,7 @@ private void verifyNewVulnerabilityNotifications() {
                                 "severity": "HIGH",
                                 "cvssV3Vector" : "CVSS:3.0/AV:N/AC:H/PR:L/UI:R/S:U/C:H/I:H/A:H"
                               },
-                              "analysisTrigger" : "VULNERABILITY_ANALYSIS_TRIGGER_BOM_UPLOAD",
+                              "analysisTrigger" : "ANALYSIS_TRIGGER_BOM_UPLOAD",
                               "vulnerabilityAnalysisLevel": "BOM_UPLOAD_ANALYSIS",
                               "affectedProjects": [
                                 {
@@ -596,7 +596,7 @@ private void verifyNewVulnerabilityNotifications() {
                                 "cvssv2": 2.6,
                                 "severity": "LOW"
                               },
-                              "analysisTrigger" : "VULNERABILITY_ANALYSIS_TRIGGER_BOM_UPLOAD",
+                              "analysisTrigger" : "ANALYSIS_TRIGGER_BOM_UPLOAD",
                               "vulnerabilityAnalysisLevel": "BOM_UPLOAD_ANALYSIS",
                               "affectedProjects": [
                                 {