From 39368ac7efd22641fbb32f03830802d2c1e0e7a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:42:57 +0000 Subject: [PATCH 1/4] chore(deps): bump org.jenkins-ci.plugins:stackrox-container-image-scanner Bumps [org.jenkins-ci.plugins:stackrox-container-image-scanner](https://github.com/stackrox/jenkins-plugin) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/stackrox/jenkins-plugin/releases) - [Commits](https://github.com/stackrox/jenkins-plugin/compare/1.4.1...1.4.2) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:stackrox-container-image-scanner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- functionaltest-jenkins-plugin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functionaltest-jenkins-plugin/build.gradle b/functionaltest-jenkins-plugin/build.gradle index 39758b02..8884724f 100644 --- a/functionaltest-jenkins-plugin/build.gradle +++ b/functionaltest-jenkins-plugin/build.gradle @@ -30,7 +30,7 @@ repositories { } dependencies { - implementation 'org.jenkins-ci.plugins:stackrox-container-image-scanner:1.4.1' + implementation 'org.jenkins-ci.plugins:stackrox-container-image-scanner:1.4.2' implementation 'org.codehaus.groovy:groovy-all:3.0.8' implementation 'org.spockframework:spock-core:2.0-groovy-3.0' implementation 'com.offbytwo.jenkins:jenkins-client:0.3.8' From 3e2ca4365e0a8eeff9066ec4e81ba817452d50de Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Mon, 10 Feb 2025 12:26:13 +0100 Subject: [PATCH 2/4] do not use client factory Signed-off-by: Tomasz Janiszewski --- functionaltest-jenkins-plugin/build.gradle | 1 - .../src/main/groovy/RestApiClient.groovy | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/functionaltest-jenkins-plugin/build.gradle b/functionaltest-jenkins-plugin/build.gradle index 8884724f..b908cc0a 100644 --- a/functionaltest-jenkins-plugin/build.gradle +++ b/functionaltest-jenkins-plugin/build.gradle @@ -2,7 +2,6 @@ plugins { id 'groovy' id 'java' id "codenarc" - id "org.openapi.generator" version "7.11.0" } group 'functional-automation' diff --git a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy index f6daf6a0..0d25d4d3 100644 --- a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy +++ b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy @@ -1,12 +1,9 @@ -import static com.stackrox.jenkins.plugins.services.ApiClientFactory.StackRoxTlsValidationMode.INSECURE_ACCEPT_ANY - import groovy.transform.CompileStatic import com.stackrox.api.ApiTokenServiceApi import com.stackrox.api.MetadataServiceApi import com.stackrox.api.PolicyServiceApi import com.stackrox.invoker.ApiClient -import com.stackrox.jenkins.plugins.services.ApiClientFactory import com.stackrox.model.StorageListPolicy import com.stackrox.model.StoragePolicy import com.stackrox.model.V1GenerateTokenRequest @@ -22,10 +19,11 @@ class RestApiClient { ApiTokenServiceApi tokenApi RestApiClient() { - ApiClient apiClient = ApiClientFactory.newApiClient(Config.roxEndpoint, "", "", INSECURE_ACCEPT_ANY) + ApiClient apiClient = new ApiClient() apiClient.setBearerToken(null as String) apiClient.setUsername("admin") apiClient.setPassword(Config.roxPassword) + apiClient.setBasePath(Config.roxEndpoint) policyServiceApi = new PolicyServiceApi(apiClient) metadataApi = new MetadataServiceApi(apiClient) From 6ff2f9ee1d739f39a9bb7d2426d20a0b6f96b689 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Mon, 10 Feb 2025 13:04:04 +0100 Subject: [PATCH 3/4] timeout Signed-off-by: Tomasz Janiszewski --- .../src/main/groovy/RestApiClient.groovy | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy index 0d25d4d3..d0582c5c 100644 --- a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy +++ b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy @@ -1,4 +1,7 @@ +import java.time.Duration + import groovy.transform.CompileStatic +import okhttp3.OkHttpClient import com.stackrox.api.ApiTokenServiceApi import com.stackrox.api.MetadataServiceApi @@ -13,13 +16,20 @@ import util.Config @CompileStatic class RestApiClient { + private static final Duration TIMEOUT = Duration.ofSeconds(30); PolicyServiceApi policyServiceApi MetadataServiceApi metadataApi ApiTokenServiceApi tokenApi RestApiClient() { - ApiClient apiClient = new ApiClient() + OkHttpClient client = OkHttpClient.Builder.newInstance() + .retryOnConnectionFailure(true) + .connectTimeout(TIMEOUT) + .readTimeout(TIMEOUT) + .writeTimeout(TIMEOUT) + .build() + ApiClient apiClient = new ApiClient(client) apiClient.setBearerToken(null as String) apiClient.setUsername("admin") apiClient.setPassword(Config.roxPassword) From 4c52d3cf8711ca8efb3d29cc3aa862ad6aa87dde Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Mon, 10 Feb 2025 13:48:22 +0100 Subject: [PATCH 4/4] fix Signed-off-by: Tomasz Janiszewski --- .../src/main/groovy/RestApiClient.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy index d0582c5c..c7e8b1df 100644 --- a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy +++ b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy @@ -16,7 +16,7 @@ import util.Config @CompileStatic class RestApiClient { - private static final Duration TIMEOUT = Duration.ofSeconds(30); + private static final Duration TIMEOUT = Duration.ofSeconds(30) PolicyServiceApi policyServiceApi MetadataServiceApi metadataApi