Add test for round trip configuration with both old and new project.

Author: Jmcfar

src/main/java/com/amazonaws/codedeploy/AWSClients.java

@@ -25,6 +25,7 @@
 
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.ClientConfiguration;
+import com.amazonaws.SdkClientException;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.auth.BasicSessionCredentials;
@@ -115,6 +116,8 @@ public static String getAccountId(String proxyHost, int proxyPort) {
                     arn = msg.substring(arnIdx, arnSpace);
                 }
             }
+        } catch (RuntimeException e) {
+            return "";
         }
 
         String accountId = arn.split(":")[ARN_ACCOUNT_ID_INDEX];

src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java

@@ -134,7 +134,6 @@ public AWSCodeDeployPublisher(
             int proxyPort,
             String excludes,
             String subdirectory) {
-
         this.externalId = externalId;
         this.applicationName = applicationName;
         this.deploymentGroupName = deploymentGroupName;
@@ -671,8 +670,8 @@ public String getAwsAccessKey() {
         return awsAccessKey;
     }
 
-    public String getAwsSecretKey() {
-        return Secret.toString(awsSecretKey);
+    public Secret getAwsSecretKey() {
+        return awsSecretKey;
     }
 
     public Long getPollingFreqSec() {

src/test/java/com/amazonaws/codedeploy/AWSCodeDeployPublisherTest.java

@@ -0,0 +1,54 @@
+package com.amazonaws.codedeploy;
+
+import hudson.model.FreeStyleProject;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.LocalData;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
+
+public class AWSCodeDeployPublisherTest {
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Test
+    public void testRoundTripConfiguration() throws Exception {
+        final AWSCodeDeployPublisher publisher = new AWSCodeDeployPublisher(
+                "testBucket",
+                "testPrefix",
+                "testApplicationName",
+                "testDeploymentGroupName",
+                "testDeploymentConfig",
+                "us-west-2",
+                false,
+                true,
+                60L,
+                10L,
+                "awsAccessKey",
+                "",
+                "deploy",
+                "testAccessKey",
+                "testSecretKey",
+                "",
+                null,
+                "",
+                "",
+                0,
+                "",
+                "");
+
+        final AWSCodeDeployPublisher afterPublisher = j.configRoundtrip(publisher);
+        j.assertEqualDataBoundBeans(publisher, afterPublisher);
+    }
+
+    @Test
+    @LocalData
+    public void testSaveUsesSecret() throws Exception {
+        FreeStyleProject project = (FreeStyleProject) j.jenkins.getItem("testSecrets");
+        FreeStyleProject after = j.configRoundtrip(project);
+        assertThat(after.getConfigFile().asString(), not(containsString("TEST_SECRET")));
+    }
+}

src/test/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisherTest/testSaveUsesSecret/jobs/testSecrets/config.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+    <actions/>
+    <description></description>
+    <keepDependencies>false</keepDependencies>
+    <properties/>
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.8.0">
+        <configVersion>2</configVersion>
+        <userRemoteConfigs>
+            <hudson.plugins.git.UserRemoteConfig>
+                <url>https://github.com/awslabs/aws-codedeploy-plugin.git</url>
+            </hudson.plugins.git.UserRemoteConfig>
+        </userRemoteConfigs>
+        <branches>
+            <hudson.plugins.git.BranchSpec>
+                <name>*/master</name>
+            </hudson.plugins.git.BranchSpec>
+        </branches>
+        <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+        <submoduleCfg class="list"/>
+        <extensions/>
+    </scm>
+    <canRoam>true</canRoam>
+    <disabled>false</disabled>
+    <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+    <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+    <triggers/>
+    <concurrentBuild>false</concurrentBuild>
+    <builders>
+        <hudson.tasks.Maven>
+            <targets>package</targets>
+            <mavenName>(Default)</mavenName>
+            <usePrivateRepository>false</usePrivateRepository>
+            <settings class="jenkins.mvn.DefaultSettingsProvider"/>
+            <globalSettings class="jenkins.mvn.DefaultGlobalSettingsProvider"/>
+            <injectBuildVariables>false</injectBuildVariables>
+        </hudson.tasks.Maven>
+    </builders>
+    <publishers>
+        <com.amazonaws.codedeploy.AWSCodeDeployPublisher plugin="codedeploy@1.20-SNAPSHOT">
+            <s3bucket>test_bucket</s3bucket>
+            <s3prefix></s3prefix>
+            <applicationName>TestApplication</applicationName>
+            <deploymentGroupName>TestDeploymentGorup</deploymentGroupName>
+            <deploymentGroupAppspec>false</deploymentGroupAppspec>
+            <waitForCompletion>false</waitForCompletion>
+            <iamRoleArn></iamRoleArn>
+            <region>us-west-2</region>
+            <includes>**</includes>
+            <excludes></excludes>
+            <subdirectory></subdirectory>
+            <proxyHost></proxyHost>
+            <proxyPort>0</proxyPort>
+            <awsAccessKey>TEST_ACCESS</awsAccessKey>
+            <awsSecretKey>TEST_SECRET</awsSecretKey>
+            <credentials>awsAccessKey</credentials>
+            <deploymentMethod>deploy</deploymentMethod>
+            <versionFileName></versionFileName>
+        </com.amazonaws.codedeploy.AWSCodeDeployPublisher>
+    </publishers>
+    <buildWrappers/>
+</project>