Merge pull request #111 from jglick/ConfidentialStoreRule

Removing `ConfidentialStoreRule` and `SecretRule`
jenkinsci · May 9, 2023 · 8c94294 · 8c94294
2 parents ee05500 + a887c59
commit 8c94294
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 59 deletions.
diff --git a/src/test/java/hudson/util/SecretRule.java b/src/test/java/hudson/util/SecretRule.java
diff --git a/src/test/java/jenkins/security/ConfidentialStoreRule.java b/src/test/java/jenkins/security/ConfidentialStoreRule.java
diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterAuthTest.java b/src/test/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterAuthTest.java
@@ -7,10 +7,8 @@
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
 import hudson.remoting.VirtualChannel;
-import hudson.util.SecretRule;
 import io.fabric8.kubernetes.api.model.ConfigBuilder;
 import io.fabric8.kubernetes.client.utils.Serialization;
-import jenkins.security.ConfidentialStoreRule;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuth;
 import org.jenkinsci.plugins.kubernetes.auth.impl.*;
 import org.jenkinsci.plugins.kubernetes.cli.helpers.DummyTokenCredentialImpl;
@@ -33,17 +31,6 @@
 
 public class KubeConfigWriterAuthTest {
 
-    /*
-    The SecretRule and ConfidentialStoreRule are hacks to avoid
-    having to use a JenkinsRule in order to read secure credentials,
-    as it is way slower to load
-     */
-    @Rule
-    public SecretRule secretRule = new SecretRule();
-
-    @Rule
-    public ConfidentialStoreRule confidentialStoreRule = new ConfidentialStoreRule();
-
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();