Support X.509 client certificates from docker-commons plugin

jenkinsci · Sep 26, 2022 · bbaeba3 · bbaeba3
1 parent cf629eb
commit bbaeba3
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -259,12 +259,6 @@
       <artifactId>docker-commons</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <!-- Marked as optional in docker-commons plugin, specify explicitly to update required version -->
-      <groupId>org.jenkinsci.plugins</groupId>
-      <artifactId>pipeline-model-extensions</artifactId>
-      <optional>true</optional>
-    </dependency>
     <!-- test deps -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/...r/convertors/X509ClientCertConvertor.java → ...ors/DockerServerCredentialsConvertor.java b/...r/convertors/X509ClientCertConvertor.java → ...ors/DockerServerCredentialsConvertor.java
@@ -31,7 +31,7 @@
 import org.jenkinsci.plugins.variant.OptionalExtension;
 
 @OptionalExtension(requirePlugins = {"docker-commons"})
-public class X509ClientCertConvertor extends SecretToCredentialConverter {
+public class DockerServerCredentialsConvertor extends SecretToCredentialConverter {
 
     @Override
     public boolean canConvert(String type) {

diff --git a/...nvertors/X509ClientCertConvertorTest.java → ...DockerServerCredentialsConvertorTest.java b/...nvertors/X509ClientCertConvertorTest.java → ...DockerServerCredentialsConvertorTest.java
@@ -34,7 +34,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class X509ClientCertConvertorTest extends AbstractConverterTest {
+public class DockerServerCredentialsConvertorTest extends AbstractConverterTest {
 
     private final String clientCertificate = "-----BEGIN CERTIFICATE-----\n" +
             "MIIBYjCCAQygAwIBAgIJAKZlQzqGGWu9MA0GCSqGSIb3DQEBBQUAMEExCzAJBgNV\n" +
@@ -69,7 +69,7 @@ public class X509ClientCertConvertorTest extends AbstractConverterTest {
             "XoR7JjrHmbI+f1BkwSbMVxxadAWpSkk/NNI1+SHR/nYSv/loQ3UjmA==\n" +
             "-----END CERTIFICATE-----";
 
-    private X509ClientCertConvertor convertor = new X509ClientCertConvertor();
+    private DockerServerCredentialsConvertor convertor = new DockerServerCredentialsConvertor();
 
     @Test
     public void canConvert() throws Exception {

diff --git a/...nvertorTest/corruptClientCertificate.yaml → ...nvertorTest/corruptClientCertificate.yaml b/...nvertorTest/corruptClientCertificate.yaml → ...nvertorTest/corruptClientCertificate.yaml
diff --git a/...ConvertorTest/corruptClientKeySecret.yaml → ...ConvertorTest/corruptClientKeySecret.yaml b/...ConvertorTest/corruptClientKeySecret.yaml → ...ConvertorTest/corruptClientKeySecret.yaml
diff --git a/...ertorTest/corruptServerCaCertificate.yaml → ...ertorTest/corruptServerCaCertificate.yaml b/...ertorTest/corruptServerCaCertificate.yaml → ...ertorTest/corruptServerCaCertificate.yaml
diff --git a/...nvertorTest/missingClientCertificate.yaml → ...nvertorTest/missingClientCertificate.yaml b/...nvertorTest/missingClientCertificate.yaml → ...nvertorTest/missingClientCertificate.yaml
diff --git a/...ConvertorTest/missingClientKeySecret.yaml → ...ConvertorTest/missingClientKeySecret.yaml b/...ConvertorTest/missingClientKeySecret.yaml → ...ConvertorTest/missingClientKeySecret.yaml
diff --git a/...ertorTest/missingServerCaCertificate.yaml → ...ertorTest/missingServerCaCertificate.yaml b/...ertorTest/missingServerCaCertificate.yaml → ...ertorTest/missingServerCaCertificate.yaml
diff --git a/...rs/X509ClientCertConvertorTest/valid.yaml → ...ServerCredentialsConvertorTest/valid.yaml b/...rs/X509ClientCertConvertorTest/valid.yaml → ...ServerCredentialsConvertorTest/valid.yaml
diff --git a/...9ClientCertConvertorTest/validMapped.yaml → ...CredentialsConvertorTest/validMapped.yaml b/...9ClientCertConvertorTest/validMapped.yaml → ...CredentialsConvertorTest/validMapped.yaml
diff --git a/...CertConvertorTest/validNoDescription.yaml → ...ialsConvertorTest/validNoDescription.yaml b/...CertConvertorTest/validNoDescription.yaml → ...ialsConvertorTest/validNoDescription.yaml
diff --git a/...9ClientCertConvertorTest/validScoped.yaml → ...CredentialsConvertorTest/validScoped.yaml b/...9ClientCertConvertorTest/validScoped.yaml → ...CredentialsConvertorTest/validScoped.yaml
diff --git a/...ors/X509ClientCertConvertorTest/void.yaml → ...rServerCredentialsConvertorTest/void.yaml b/...ors/X509ClientCertConvertorTest/void.yaml → ...rServerCredentialsConvertorTest/void.yaml