Skip to content

Better way to hide FileSystemServiceAccountCredential when inapplicable #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2019
Merged

Better way to hide FileSystemServiceAccountCredential when inapplicable #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...java/org/jenkinsci/plugins/kubernetes/credentials/FileSystemServiceAccountCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.jenkinsci.plugins.plaincredentials.StringCredentials;
import org.kohsuke.stapler.DataBoundConstructor;

import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.CredentialsScope;
import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;

Expand Down Expand Up @@ -44,7 +45,6 @@ public Secret getSecret() {
}

@Override
@SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
@Deprecated
public String getToken(String serviceAddress, String caCertData, boolean skipTlsVerify) {
return getSecret().getPlainText();
Expand All @@ -54,10 +54,9 @@ public String getToken(String serviceAddress, String caCertData, boolean skipTls
public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {

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

@Override
Expand Down