Skip to content

chore(deps): update parent POM, BOM, nixpkgs and CLI scanner versions #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tembleking wants to merge 1 commit into from
Closed

chore(deps): update parent POM, BOM, nixpkgs and CLI scanner versions #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ 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: <!-- newest-version-marker -->1.28.0<!-- /newest-version-marker -->
- Oldest maintained version tested: <!-- oldest-version-marker -->1.22.6<!-- /oldest-version-marker -->
- Default pinned version: <!-- newest-version-marker -->1.29.0<!-- /newest-version-marker -->
- Oldest maintained version tested: <!-- oldest-version-marker -->1.23.0<!-- /oldest-version-marker -->

Both values are kept in sync by `just update-cli-scanner` and `just update-oldest-cli-scanner`.

Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>6.2211.v27f680c93c53</version>
<version>6.2221.va_045130417c9</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -57,7 +57,7 @@
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<!-- You can find your version for the selected baseline in: https://repo.jenkins-ci.org/public/io/jenkins/tools/bom/ -->
<version>6815.v1fb_2a_fee3765</version>
<version>6931.vea_a_b_c6fd017d</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...sdig/jenkins/plugins/sysdig/infrastructure/jenkins/iac/entrypoint/IaCScanningBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import org.kohsuke.stapler.QueryParameter;

public class IaCScanningBuilder extends Builder implements SimpleBuildStep {
private static final String FIXED_SCANNED_VERSION = "1.28.0"; // newest-version-marker
private static final String FIXED_SCANNED_VERSION = "1.29.0"; // newest-version-marker

private String engineCredentialsId;
private boolean listUnsupported = false;
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerVersionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.0"; // newest-version-marker
private static final String FIXED_SCANNED_VERSION = "1.29.0"; // newest-version-marker

private final ImageScanningConfig config;

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/sysdig/jenkins/plugins/sysdig/TestMother.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ 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.28.0"; // newest-version-marker
public static final String NEWEST_FIXTURE_VERSION = "1.29.0"; // newest-version-marker

public static final String OLDEST_FIXTURE_VERSION = "1.22.6"; // oldest-version-marker
public static final String OLDEST_FIXTURE_VERSION = "1.23.0"; // oldest-version-marker

private static final String NEWEST_FIXTURE = FIXTURE_DIR + "scanner_newest_scan_result.json.gz";
private static final String OLDEST_FIXTURE = FIXTURE_DIR + "scanner_oldest_scan_result.json.gz";
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EFreestyleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.0", // newest-version-marker
"Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.29.0", // newest-version-marker
build);
jenkins.assertLogContains("Starting scan", build);
jenkins.assertLogContains("--iac --apiurl=https://secure.sysdig.com --loglevel=info", build);
Expand Down Expand Up @@ -144,15 +144,15 @@ void testFreestyleWithAllConfigs() throws Exception {
b.setIsRecursive(false);
b.setSeverityThreshold("m");
b.setSysdigEnv("https://us2.app.sysdig.com");
b.setVersion("1.22.6"); // oldest-version-marker
b.setVersion("1.23.0"); // oldest-version-marker
})
.build();

var build = jenkins.buildAndAssertStatus(Result.FAILURE, project);

jenkins.assertLogContains("Attempting to download CLI", build);
jenkins.assertLogContains(
"Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6", // oldest-version-marker
"Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0", // oldest-version-marker
build);
jenkins.assertLogContains("Starting scan", build);
jenkins.assertLogContains("--iac --apiurl=https://us2.app.sysdig.com --loglevel=info", build);
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/IaCScanE2EPipelineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.0", // newest-version-marker
"Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.29.0", // newest-version-marker
build);
jenkins.assertLogContains("Starting scan", build);
jenkins.assertLogContains("--iac --apiurl=https://secure.sysdig.com --loglevel=info", build);
Expand All @@ -72,14 +72,14 @@ void testPipelineWithAllConfigs() throws Exception {
isRecursive: false,
severityThreshold: 'm',
sysdigEnv: 'https://us2.app.sysdig.com',
version: '1.22.6'""") // oldest-version-marker
version: '1.23.0'""") // oldest-version-marker
.buildWithRemoteExecution();

var build = jenkins.buildAndAssertStatus(Result.FAILURE, job);

jenkins.assertLogContains("Attempting to download CLI", build);
jenkins.assertLogContains(
"Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6", // oldest-version-marker
"Downloading https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0", // oldest-version-marker
build);
jenkins.assertLogContains("Starting scan", build);
jenkins.assertLogContains("--iac --apiurl=https://us2.app.sysdig.com --loglevel=info", build);
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/ScannerBinaryProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.0"; // newest-version-marker
private static final String PINNED_VERSION = "1.29.0"; // 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";
Expand Down
Binary file modified ...enkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_newest_scan_result.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified ...enkins/plugins/sysdig/infrastructure/scanner/report/v1/scanner_oldest_scan_result.json.gz
View file
Open in desktop
Binary file not shown.
Loading