diff --git a/src/main/java/nl/codecentric/jenkins/appd/AppDynamicsResultsPublisher.java b/src/main/java/nl/codecentric/jenkins/appd/AppDynamicsResultsPublisher.java index ec3ae5a..9f2a299 100644 --- a/src/main/java/nl/codecentric/jenkins/appd/AppDynamicsResultsPublisher.java +++ b/src/main/java/nl/codecentric/jenkins/appd/AppDynamicsResultsPublisher.java @@ -10,6 +10,7 @@ import hudson.tasks.Recorder; import hudson.util.FormValidation; import hudson.util.ListBoxModel; +import hudson.util.Secret; import nl.codecentric.jenkins.appd.rest.RestConnection; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; @@ -163,7 +164,7 @@ public FormValidation doTestAppDynamicsConnection(@QueryParameter("appdynamicsRe */ private String appdynamicsRestUri = ""; private String username = ""; - private String password = ""; + private Secret password; private String applicationName = ""; private String thresholdMetric = DEFAULT_THRESHOLD_METRIC; private String customMetricPath = DEFAULT_CUSTOM_METRIC_PATH; @@ -183,7 +184,7 @@ public AppDynamicsResultsPublisher(final String appdynamicsRestUri, final String final Integer performanceUnstableThreshold) { setAppdynamicsRestUri(appdynamicsRestUri); setUsername(username); - setPassword(password); + setPassword(Secret.fromString(password)); setApplicationName(applicationName); setThresholdMetric(thresholdMetric); setCustomMetricPath(customMetricPath); @@ -218,7 +219,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListen throws InterruptedException, IOException { PrintStream logger = listener.getLogger(); - RestConnection connection = new RestConnection(appdynamicsRestUri, username, password, applicationName); + RestConnection connection = new RestConnection(appdynamicsRestUri, username, Secret.toString(password), applicationName); logger.println("Verify connection to AppDynamics REST interface ..."); if (!connection.validateConnection()) { logger.println("Connection to AppDynamics REST interface unsuccessful, cannot proceed with this build step"); @@ -359,14 +360,18 @@ public void setUsername(final String username) { this.username = username; } - public String getPassword() { + public Secret getPassword() { return password; } - public void setPassword(final String password) { + public void setPassword(final Secret password) { this.password = password; } + public void setPassword(final String password) { + this.password = Secret.fromString(password); + } + public String getApplicationName() { return applicationName; }