Reuse generated code in E2E

.github/workflows/tests.yaml

@@ -39,6 +39,10 @@ jobs:
       with:
         name: stackrox-container-image-scanner.hpi
         path: stackrox-container-image-scanner/target/stackrox-container-image-scanner.hpi
+    - uses: actions/upload-artifact@v3
+      with:
+        name: stackrox-container-image-scanner.jar
+        path: stackrox-container-image-scanner/target/stackrox-container-image-scanner.jar
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
@@ -71,6 +75,10 @@ jobs:
       with:
         name: stackrox-container-image-scanner.hpi
         path: jenkins
+    - uses: actions/download-artifact@v3
+      with:
+        name: stackrox-container-image-scanner.hpi
+        path: stackrox-container-image-scanner/target/
     - name: Build jenkins image
       uses: docker/build-push-action@v4
       with:

functionaltest-jenkins-plugin/build.gradle

@@ -23,54 +23,23 @@ repositories {
     mavenCentral()
     maven {
         url 'https://repo.jenkins-ci.org/releases'
+        metadataSources {
+            artifact()
+        }
     }
-    maven {
-        url 'https://repo.jenkins-ci.org/public'
-    }
-}
-
-// Assign all Java source dirs to Groovy, as the groovy compiler should take care of them.
-sourceSets.each { ss ->
-    ss.groovy.srcDirs += ss.java.srcDirs
-    ss.java.srcDirs = []
 }
 
-openApiGenerate {
-    generatorName = "java"
-    generateApiTests = false
-    inputSpec = "../stackrox-container-image-scanner/api.yaml"
-    outputDir = "$buildDir/generated".toString()
-    apiPackage = "com.stackrox.api"
-    invokerPackage = "com.stackrox.invoker"
-    modelPackage = "com.stackrox.model"
-    configOptions = [
-            dateLibrary                             : "java8",
-            library                                 : "okhttp-gson",
-            java8                                   : "true",
-            disallowAdditionalPropertiesIfNotPresent: "false",
-    ]
-}
-
-sourceSets.main.java.srcDirs += "$buildDir/generated/src/main".toString()
-compileJava.dependsOn tasks.openApiGenerate
-
 dependencies {
+    implementation 'org.jenkins-ci.plugins:stackrox-container-image-scanner:1.3.5'
     implementation 'org.codehaus.groovy:groovy-all:3.0.8'
-    implementation group: 'org.spockframework', name: 'spock-core', version: '2.0-groovy-3.0'
-    implementation group: 'com.offbytwo.jenkins', name: 'jenkins-client', version: '0.3.8'
+    implementation 'org.spockframework:spock-core:2.0-groovy-3.0'
+    implementation 'com.offbytwo.jenkins:jenkins-client:0.3.8'
     // JAX-B dependencies for JDK 9+
     implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
     implementation "org.glassfish.jaxb:jaxb-runtime:4.0.0"
 
-    implementation 'io.swagger:swagger-annotations:1.6.6'
-    implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'io.gsonfire:gson-fire:1.8.5'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
-    implementation "jakarta.annotation:jakarta.annotation-api:2.1.1"
-    implementation 'javax:javaee-api:8.0.1'
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
 }

functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy

@@ -1,10 +1,12 @@
+import static com.stackrox.jenkins.plugins.services.ApiClientFactory.StackRoxTlsValidationMode.INSECURE_ACCEPT_ANY
+
 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
@@ -20,9 +22,8 @@ class RestApiClient {
     ApiTokenServiceApi tokenApi
 
     RestApiClient() {
-        OkHttpClient client = UnsafeOkHttpClient.getUnsafeOkHttpClient()
-        ApiClient apiClient = new ApiClient(client)
-        apiClient.setBasePath(Config.roxEndpoint)
+        ApiClient apiClient = ApiClientFactory.newApiClient(Config.roxEndpoint, "", "", INSECURE_ACCEPT_ANY)
+        apiClient.setBearerToken(null)
         apiClient.setUsername("admin")
         apiClient.setPassword(Config.roxPassword)