Merge pull request #1356 from jglick/SecretsMasker

Minor cleanups from SECURITY-3079 fix

Author: jglick

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java

@@ -61,13 +61,10 @@ public final class SecretsMasker extends TaskListenerDecorator {
 
     private static final long serialVersionUID = 1;
 
-    private final Set<String> values;
-
     private final Pattern pattern;
 
     private SecretsMasker(Set<String> values) {
         assert !values.isEmpty();
-        this.values = values;
         // stored at creation time so SecretPatternFactory extensions are properly loaded
         // when/if this decorator runs at agent side (see DurableTaskStep.USE_WATCHING)
         this.pattern = SecretPatterns.getAggregateSecretPattern(values);

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java

@@ -269,11 +269,14 @@ public void runInPodFromYaml() throws Exception {
 
         // SECURITY-3079
         DurableTaskStep.USE_WATCHING = true;
-        WorkflowRun build = p.scheduleBuild2(0).waitForStart();
-        r.assertBuildStatusSuccess(r.waitForCompletion(build));
-        r.assertLogNotContains(CONTAINER_ENV_VAR_FROM_SECRET_VALUE, build);
-        r.assertLogContains("INSIDE_CONTAINER_ENV_VAR_FROM_SECRET = **** or " + CONTAINER_ENV_VAR_FROM_SECRET_VALUE.toUpperCase(Locale.ROOT) + "\n", build);
-        DurableTaskStep.USE_WATCHING = false;
+        try {
+            WorkflowRun build = p.scheduleBuild2(0).waitForStart();
+            r.assertBuildStatusSuccess(r.waitForCompletion(build));
+            r.assertLogNotContains(CONTAINER_ENV_VAR_FROM_SECRET_VALUE, build);
+            r.assertLogContains("INSIDE_CONTAINER_ENV_VAR_FROM_SECRET = **** or " + CONTAINER_ENV_VAR_FROM_SECRET_VALUE.toUpperCase(Locale.ROOT) + "\n", build);
+        } finally {
+            DurableTaskStep.USE_WATCHING = false;
+        }
     }
 
     @Test