Skip to content

Commit a5a0eca

Browse files
authored
Merge pull request #9 from jglick/FileSystemServiceAccountCredential
Better way to hide FileSystemServiceAccountCredential when inapplicable
2 parents a3891cd + 6b0dc00 commit a5a0eca

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.jenkinsci.plugins.plaincredentials.StringCredentials;
88
import org.kohsuke.stapler.DataBoundConstructor;
99

10+
import com.cloudbees.plugins.credentials.CredentialsProvider;
1011
import com.cloudbees.plugins.credentials.CredentialsScope;
1112
import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
1213

@@ -44,7 +45,6 @@ public Secret getSecret() {
4445
}
4546

4647
@Override
47-
@SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
4848
@Deprecated
4949
public String getToken(String serviceAddress, String caCertData, boolean skipTlsVerify) {
5050
return getSecret().getPlainText();
@@ -54,10 +54,9 @@ public String getToken(String serviceAddress, String caCertData, boolean skipTls
5454
public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
5555

5656
@SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
57-
public DescriptorImpl() {
58-
if (!new File(SERVICEACCOUNT_TOKEN_PATH).exists()) {
59-
throw new RuntimeException("Jenkins isn't running inside Kubernetes with Admission Controller.");
60-
}
57+
@Override
58+
public boolean isApplicable(CredentialsProvider provider) {
59+
return new File(SERVICEACCOUNT_TOKEN_PATH).exists();
6160
}
6261

6362
@Override

0 commit comments

Comments
 (0)