Merge pull request #1 from Vlatombe/authentication-tokens

Depend on new kubernetes-client-api and some fixes for TokenSource

Author: Alexander

pom.xml

@@ -40,14 +40,12 @@
     <java.level>8</java.level>
 
     <!-- dependency versions -->
-    <jenkins.version>2.60.3</jenkins.version>
+    <jenkins.version>2.176.1</jenkins.version>
 
     <slf4j.version>1.7.26</slf4j.version>
 
     <!-- jenkins plugins versions -->
-    <jenkins-credentials.version>2.1.16</jenkins-credentials.version>
     <jenkins-structs.version>1.19</jenkins-structs.version>
-    <jenkins-plain-credentials.version>1.3</jenkins-plain-credentials.version>
 
     <!-- maven plugins versions -->
     <maven-coveralls.version>4.3.0</maven-coveralls.version>
@@ -58,27 +56,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-client</artifactId>
-      <version>${kubernetes-client.version}</version>
-      <exclusions>
-        <!-- Jackson logic comes from plugins -->
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>openshift-client</artifactId>
-      <version>${kubernetes-client.version}</version>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>kubernetes-client-api</artifactId>
+      <version>1.0.0</version>
     </dependency>
-
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jackson2-api</artifactId>
@@ -102,13 +83,11 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>${jenkins-credentials.version}</version>
     </dependency>
     <!-- to use StringCredentialsImpl for tokens -->
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>plain-credentials</artifactId>
-      <version>${jenkins-plain-credentials.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -132,14 +111,16 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>structs</artifactId>
-        <version>${jenkins-structs.version}</version>
+        <groupId>io.jenkins.tools.bom</groupId>
+        <artifactId>bom</artifactId>
+        <version>2.176.2</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>ssh-credentials</artifactId>
-        <version>1.12</version>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.6</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

src/main/java/org/jenkinsci/plugins/kubernetes/credentials/FileCredentialsTokenSource.java

@@ -1,6 +1,7 @@
 package org.jenkinsci.plugins.kubernetes.credentials;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
 import jenkins.authentication.tokens.api.AuthenticationTokenException;
 import jenkins.authentication.tokens.api.AuthenticationTokenSource;
 import org.apache.commons.io.IOUtils;
@@ -11,6 +12,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
+@Extension
 public class FileCredentialsTokenSource extends AuthenticationTokenSource<KubernetesAuthKubeconfig, FileCredentials> {
     public FileCredentialsTokenSource() {
         super(KubernetesAuthKubeconfig.class, FileCredentials.class);

src/main/java/org/jenkinsci/plugins/kubernetes/credentials/StringCredentialsTokenSource.java

@@ -1,11 +1,13 @@
 package org.jenkinsci.plugins.kubernetes.credentials;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
 import jenkins.authentication.tokens.api.AuthenticationTokenException;
 import jenkins.authentication.tokens.api.AuthenticationTokenSource;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthToken;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
+@Extension
 public class StringCredentialsTokenSource extends AuthenticationTokenSource<KubernetesAuthToken, StringCredentials> {
     public StringCredentialsTokenSource() {
         super(KubernetesAuthToken.class, StringCredentials.class);

src/main/java/org/jenkinsci/plugins/kubernetes/credentials/UsernamePasswordCredentialsTokenSource.java

@@ -1,19 +1,22 @@
 package org.jenkinsci.plugins.kubernetes.credentials;
 
+import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
 import com.cloudbees.plugins.credentials.common.UsernamePasswordCredentials;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
 import jenkins.authentication.tokens.api.AuthenticationTokenException;
 import jenkins.authentication.tokens.api.AuthenticationTokenSource;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthUsernamePassword;
 
-public class UsernamePasswordCredentialsTokenSource extends AuthenticationTokenSource<KubernetesAuthUsernamePassword, UsernamePasswordCredentials> {
+@Extension
+public class UsernamePasswordCredentialsTokenSource extends AuthenticationTokenSource<KubernetesAuthUsernamePassword, StandardUsernamePasswordCredentials> {
     public UsernamePasswordCredentialsTokenSource() {
-        super(KubernetesAuthUsernamePassword.class, UsernamePasswordCredentials.class);
+        super(KubernetesAuthUsernamePassword.class, StandardUsernamePasswordCredentials.class);
     }
 
     @NonNull
     @Override
-    public KubernetesAuthUsernamePassword convert(@NonNull UsernamePasswordCredentials credential) throws AuthenticationTokenException {
+    public KubernetesAuthUsernamePassword convert(@NonNull StandardUsernamePasswordCredentials credential) throws AuthenticationTokenException {
         return new KubernetesAuthUsernamePassword(
                 credential.getUsername(),
                 credential.getPassword().getPlainText()