More meaningful credential names

They apply to kubernetes, not just openshift

OpenShiftTokenCredentialImpl is not needed as there is StringCredentialsImpl

Author: carlossg

pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>org.jenkinsci.plugins</groupId>
   <artifactId>kubernetes-credentials</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <name>Kubernetes Credentials Plugin</name>
   <description>Common classes for Kubernetes credentials</description>
   <packaging>hpi</packaging>
@@ -47,6 +47,7 @@
 
     <!-- jenkins plugins versions -->
     <jenkins-credentials.version>2.1.7</jenkins-credentials.version>
+    <jenkins-plain-credentials.version>1.3</jenkins-plain-credentials.version>
 
   </properties>
 
@@ -70,6 +71,11 @@
       <artifactId>credentials</artifactId>
       <version>${jenkins-credentials.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>plain-credentials</artifactId>
+      <version>${jenkins-plain-credentials.version}</version>
+    </dependency>
   </dependencies>
 
   <!-- just to fix enforcer RequireUpperBoundDeps -->

src/main/java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialImpl.java renamed to src/main/java/org/jenkinsci/plugins/kubernetes/credentials/BearerTokenCredentialImpl.java

@@ -43,14 +43,14 @@
 /**
  * @author <a href="mailto:[email protected]">Nicolas De Loof</a>
  */
-public class OpenShiftBearerTokenCredentialImpl extends UsernamePasswordCredentialsImpl implements TokenProducer {
+public class BearerTokenCredentialImpl extends UsernamePasswordCredentialsImpl implements TokenProducer {
 
     private static final long serialVersionUID = 6031616605797622926L;
 
     private transient AtomicReference<Token> token = new AtomicReference<Token>();
 
     @DataBoundConstructor
-    public OpenShiftBearerTokenCredentialImpl(CredentialsScope scope, String id, String description, String username, String password) {
+    public BearerTokenCredentialImpl(CredentialsScope scope, String id, String description, String username, String password) {
         super(scope, id, description, username, password);
     }
 
@@ -143,7 +143,7 @@ public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
 
         @Override
         public String getDisplayName() {
-            return "OpenShift Username and Password";
+            return "Kubernetes Username and Password";
         }
     }
 

src/main/java/org/jenkinsci/plugins/kubernetes/credentials/ServiceAccountCredential.java renamed to src/main/java/org/jenkinsci/plugins/kubernetes/credentials/FileSystemServiceAccountCredential.java

@@ -1,15 +1,18 @@
 package org.jenkinsci.plugins.kubernetes.credentials;
 
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.io.FileUtils;
+import org.jenkinsci.plugins.plaincredentials.StringCredentials;
+import org.kohsuke.stapler.DataBoundConstructor;
+
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
-import org.apache.commons.io.FileUtils;
-import org.kohsuke.stapler.DataBoundConstructor;
-
-import java.io.File;
-import java.io.IOException;
+import hudson.util.Secret;
 
 /**
  * Read the OAuth bearer token from service account file provisioned by kubernetes
@@ -18,25 +21,35 @@
  *
  * @author <a href="mailto:[email protected]">Nicolas De Loof</a>
  */
-public class ServiceAccountCredential extends BaseStandardCredentials implements TokenProducer {
+public class FileSystemServiceAccountCredential extends BaseStandardCredentials
+        implements TokenProducer, StringCredentials {
+
+    private static final long serialVersionUID = -2222994164073756041L;
 
     private static final String SERVICEACCOUNT_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
 
     @DataBoundConstructor
-    public ServiceAccountCredential(CredentialsScope scope, String id, String description) {
+    public FileSystemServiceAccountCredential(CredentialsScope scope, String id, String description) {
         super(scope, id, description);
     }
 
     @Override
     @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
-    public String getToken(String serviceAddress, String caCertData, boolean skipTlsVerify) {
+    public Secret getSecret() {
         try {
-            return FileUtils.readFileToString(new File(SERVICEACCOUNT_TOKEN_PATH));
+            return Secret.fromString(FileUtils.readFileToString(new File(SERVICEACCOUNT_TOKEN_PATH)));
         } catch (IOException e) {
-            return null;
+            return Secret.fromString(null);
         }
     }
 
+    @Override
+    @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
+    @Deprecated
+    public String getToken(String serviceAddress, String caCertData, boolean skipTlsVerify) {
+        return getSecret().getPlainText();
+    }
+
     @Extension(optional = true)
     public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
 
@@ -52,4 +65,5 @@ public String getDisplayName() {
             return "Kubernetes Service Account";
         }
     }
+
 }