Skip to content

chore(deps): bump org.jenkins-ci.plugins:stackrox-container-image-scanner from 1.4.1 to 1.4.2 in /functionaltest-jenkins-plugin #408

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

Merged
dependabot merged 4 commits into from
Feb 10, 2025
Merged

chore(deps): bump org.jenkins-ci.plugins:stackrox-container-image-scanner from 1.4.1 to 1.4.2 in /functionaltest-jenkins-plugin #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39368ac
chore(deps): bump org.jenkins-ci.plugins:stackrox-container-image-sca…
dependabot[bot] Feb 6, 2025
3e2ca43
do not use client factory
janisz Feb 10, 2025
6ff2f9e
timeout
janisz Feb 10, 2025
4c52d3c
fix
janisz Feb 10, 2025
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
3 changes: 1 addition & 2 deletions functionaltest-jenkins-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id 'groovy'
id 'java'
id "codenarc"
id "org.openapi.generator" version "7.11.0"
}

group 'functional-automation'
Expand Down Expand Up @@ -30,7 +29,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'
Expand Down
14 changes: 11 additions & 3 deletions functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import static com.stackrox.jenkins.plugins.services.ApiClientFactory.StackRoxTlsValidationMode.INSECURE_ACCEPT_ANY
import java.time.Duration

import groovy.transform.CompileStatic
import okhttp3.OkHttpClient

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
Expand All @@ -16,16 +16,24 @@ import util.Config

@CompileStatic
class RestApiClient {
private static final Duration TIMEOUT = Duration.ofSeconds(30)

PolicyServiceApi policyServiceApi
MetadataServiceApi metadataApi
ApiTokenServiceApi tokenApi

RestApiClient() {
ApiClient apiClient = ApiClientFactory.newApiClient(Config.roxEndpoint, "", "", INSECURE_ACCEPT_ANY)
Copy link
Copy Markdown
Contributor

@janisz janisz Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use the factory as in 1.4.2 it adds user agent with jenkins and plugin version and that means we'll need to include jenkins in this project causing a lot of unneeded dependency as without running instance we will get ? as a version string

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)
apiClient.setBasePath(Config.roxEndpoint)

policyServiceApi = new PolicyServiceApi(apiClient)
metadataApi = new MetadataServiceApi(apiClient)
Expand Down