diff --git a/README.md b/README.md index b97989d4..38069eef 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ The table below describes the available configuration options. The plugin pins a default `sysdig-cli-scanner` version and is tested end-to-end against both the default and the oldest still-maintained version: -- Default pinned version: 1.29.0 +- Default pinned version: 1.30.1 - Oldest maintained version tested: 1.23.0 Both values are kept in sync by `just update-cli-scanner` and `just update-oldest-cli-scanner`. diff --git a/flake.lock b/flake.lock index c900437a..1883e456 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1787814960, - "narHash": "sha256-PYZq1qzCJXC2zGI0mH07vrZBsw6DRBAOX0jN1pPtqOQ=", + "lastModified": 1790178388, + "narHash": "sha256-kK3t7gwoz4Nx8RF46cs1Xz/skKNcK7y3KYP+gGqX6W8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c27cdad491a991b11ed731760aa2ef8db0cb0410", + "rev": "00455b0a3690d3f5dc61e9aef4277dc86235b73f", "type": "github" }, "original": { diff --git a/pom.xml b/pom.xml index 86b6150b..c384d88d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 6.2221.va_045130417c9 + 6.2236.v12dd4c483242 @@ -57,7 +57,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 6931.vea_a_b_c6fd017d + 7046.v43536164769c pom import diff --git a/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/jenkins/iac/entrypoint/IaCScanningBuilder.java b/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/jenkins/iac/entrypoint/IaCScanningBuilder.java index f355f1db..80cea76c 100644 --- a/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/jenkins/iac/entrypoint/IaCScanningBuilder.java +++ b/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/jenkins/iac/entrypoint/IaCScanningBuilder.java @@ -16,8 +16,6 @@ package com.sysdig.jenkins.plugins.sysdig.infrastructure.jenkins.iac.entrypoint; import com.cloudbees.plugins.credentials.CredentialsMatchers; -import com.cloudbees.plugins.credentials.CredentialsProvider; -import com.cloudbees.plugins.credentials.common.StandardCredentials; import com.cloudbees.plugins.credentials.common.StandardListBoxModel; import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials; import com.sysdig.jenkins.plugins.sysdig.domain.SysdigLogger; @@ -54,7 +52,7 @@ import org.kohsuke.stapler.QueryParameter; public class IaCScanningBuilder extends Builder implements SimpleBuildStep { - private static final String FIXED_SCANNED_VERSION = "1.29.0"; // newest-version-marker + private static final String FIXED_SCANNED_VERSION = "1.30.1"; // newest-version-marker private String engineCredentialsId; private boolean listUnsupported = false; @@ -389,24 +387,6 @@ public ListBoxModel doFillEngineCredentialsIdItems(@QueryParameter String creden CredentialsMatchers.always()); } - public FormValidation doCheckCredentialsId(@QueryParameter String value) { - if (value == null || value.trim().isEmpty()) { - return FormValidation.error("Credentials ID must be provided."); - } - - // Optionally, verify that the credentials exist - StandardCredentials credentials = CredentialsMatchers.firstOrNull( - CredentialsProvider.lookupCredentialsInItemGroup( - StandardCredentials.class, Jenkins.get(), ACL.SYSTEM2, Collections.emptyList()), - CredentialsMatchers.withId(value)); - - if (credentials == null) { - return FormValidation.error("No credentials found with the given ID."); - } - - return FormValidation.ok(); - } - @Override public boolean isApplicable(Class aClass) { return true; diff --git a/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerVersionResolver.java b/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerVersionResolver.java index 0c7922f7..9718e099 100644 --- a/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerVersionResolver.java +++ b/src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerVersionResolver.java @@ -24,7 +24,7 @@ * custom version configured by the user and falling back to a pinned version. */ public class ScannerVersionResolver { - private static final String FIXED_SCANNED_VERSION = "1.29.0"; // newest-version-marker + private static final String FIXED_SCANNED_VERSION = "1.30.1"; // newest-version-marker private final ImageScanningConfig config; diff --git a/src/test/java/com/sysdig/jenkins/plugins/sysdig/TestMother.java b/src/test/java/com/sysdig/jenkins/plugins/sysdig/TestMother.java index 43a17d55..ef2a458e 100644 --- a/src/test/java/com/sysdig/jenkins/plugins/sysdig/TestMother.java +++ b/src/test/java/com/sysdig/jenkins/plugins/sysdig/TestMother.java @@ -26,7 +26,7 @@ public class TestMother { * (via {@code just update-cli-scanner} / {@code just update-oldest-cli-scanner}), regenerate the * matching fixtures with {@code just generate-scanner-fixtures}. */ - public static final String NEWEST_FIXTURE_VERSION = "1.29.0"; // newest-version-marker + public static final String NEWEST_FIXTURE_VERSION = "1.30.1"; // newest-version-marker public static final String OLDEST_FIXTURE_VERSION = "1.23.0"; // oldest-version-marker diff --git a/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EFreestyleTests.java b/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EFreestyleTests.java index 5dcfb3b9..031931b8 100644 --- a/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EFreestyleTests.java +++ b/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EFreestyleTests.java @@ -62,7 +62,7 @@ void testFreestyleWithCredentialsAndAssertLogOutput() throws Exception { jenkins.assertLogContains("Attempting to download CLI", build); jenkins.assertLogContains( - "Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.29.0", // newest-version-marker + "Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.30.1", // newest-version-marker build); jenkins.assertLogContains("Starting scan", build); jenkins.assertLogContains("--iac --apiurl=https://secure.sysdig.com --loglevel=info", build); diff --git a/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EPipelineTests.java b/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EPipelineTests.java index 767f097f..5cee7b0f 100644 --- a/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EPipelineTests.java +++ b/src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EPipelineTests.java @@ -53,7 +53,7 @@ void testPipelineWithCredentialsAndAssertLogOutput() throws Exception { jenkins.assertLogContains("Attempting to download CLI", build); jenkins.assertLogContains( - "Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.29.0", // newest-version-marker + "Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.30.1", // newest-version-marker build); jenkins.assertLogContains("Starting scan", build); jenkins.assertLogContains("--iac --apiurl=https://secure.sysdig.com --loglevel=info", build); diff --git a/src/test/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerBinaryProviderTest.java b/src/test/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerBinaryProviderTest.java index f88dfca1..7963e5a6 100644 --- a/src/test/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerBinaryProviderTest.java +++ b/src/test/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerBinaryProviderTest.java @@ -20,7 +20,7 @@ class ScannerBinaryProviderTest { /** Pinned default version. Kept in sync by {@code just update-cli-scanner}; do not drop the marker. */ - private static final String PINNED_VERSION = "1.29.0"; // newest-version-marker + private static final String PINNED_VERSION = "1.30.1"; // newest-version-marker /** Arbitrary version for the URL-shape tests below: they assert os/arch mapping, not the pin. */ private static final String ANY_VERSION = "1.27.2"; diff --git a/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_newest_scan_result.json.gz b/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_newest_scan_result.json.gz index c0789901..d1fb0b98 100644 Binary files a/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_newest_scan_result.json.gz and b/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_newest_scan_result.json.gz differ diff --git a/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_oldest_scan_result.json.gz b/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_oldest_scan_result.json.gz index fd100292..3c3958ab 100644 Binary files a/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_oldest_scan_result.json.gz and b/src/test/resources/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_oldest_scan_result.json.gz differ