Skip to content
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

Fix UI job configuration for multiple credentials not being saved #61

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Fix UI job configuration for multiple credentials not being saved #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ec0fd1
serialize kubectlCredentials in MultiKubectlBuild*
maxlaverse May 31, 2020
55c4d82
add a simple test for configuration serialization
maxlaverse May 31, 2020
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
4 changes: 3 additions & 1 deletion src/main/java/org/jenkinsci/plugins/kubernetes/cli/MultiKubectlBuildStep.java
View file
Original file line number Diff line number Diff line change
@@ -6,14 +6,16 @@
import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
import org.jenkinsci.plugins.workflow.steps.StepExecution;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

import java.util.HashSet;
import java.util.List;
import java.util.Set;


public class MultiKubectlBuildStep extends Step {
final transient public List<KubectlCredential> kubectlCredentials;
@DataBoundSetter
public List<KubectlCredential> kubectlCredentials;

@DataBoundConstructor
public MultiKubectlBuildStep(List<KubectlCredential> kubectlCredentials) {
4 changes: 3 additions & 1 deletion src/main/java/org/jenkinsci/plugins/kubernetes/cli/MultiKubectlBuildWrapper.java
View file
Original file line number Diff line number Diff line change
@@ -12,14 +12,16 @@
import org.jenkinsci.plugins.kubernetes.cli.kubeconfig.KubeConfigWriter;
import org.jenkinsci.plugins.kubernetes.cli.kubeconfig.KubeConfigWriterFactory;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

public class MultiKubectlBuildWrapper extends SimpleBuildWrapper {
final transient public List<KubectlCredential> kubectlCredentials;
@DataBoundSetter
public List<KubectlCredential> kubectlCredentials;

@DataBoundConstructor
public MultiKubectlBuildWrapper(List<KubectlCredential> kubectlCredentials) {
31 changes: 31 additions & 0 deletions src/test/java/org/jenkinsci/plugins/kubernetes/cli/KubectlBuildWrapperTest.java
View file
Original file line number Diff line number Diff line change
@@ -107,4 +107,35 @@ public void testListedCredentials() throws Exception {

assertEquals(6, s.size());
}

@Test
public void testConfigurationPersistedOnSave() throws Exception {
CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), DummyCredentials.secretCredential("test-credentials"));

FreeStyleProject p = r.createFreeStyleProject();

KubectlBuildWrapper bw = new KubectlBuildWrapper();
bw.credentialsId = "test-credentials";
p.getBuildWrappersList().add(bw);

assertEquals("<?xml version='1.1' encoding='UTF-8'?>\n" +
"<project>\n" +
" <keepDependencies>false</keepDependencies>\n" +
" <properties/>\n" +
" <scm class=\"hudson.scm.NullSCM\"/>\n" +
" <canRoam>false</canRoam>\n" +
" <disabled>false</disabled>\n" +
" <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>\n" +
" <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>\n" +
" <triggers/>\n" +
" <concurrentBuild>false</concurrentBuild>\n" +
" <builders/>\n" +
" <publishers/>\n" +
" <buildWrappers>\n" +
" <org.jenkinsci.plugins.kubernetes.cli.KubectlBuildWrapper>\n" +
" <credentialsId>test-credentials</credentialsId>\n" +
" </org.jenkinsci.plugins.kubernetes.cli.KubectlBuildWrapper>\n" +
" </buildWrappers>\n" +
"</project>", p.getConfigFile().asString());
}
}
68 changes: 68 additions & 0 deletions src/test/java/org/jenkinsci/plugins/kubernetes/cli/MultiKubectlBuildWrapperTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package org.jenkinsci.plugins.kubernetes.cli;

import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.CredentialsStore;
import com.cloudbees.plugins.credentials.domains.Domain;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.model.Result;
import hudson.tasks.Shell;
import hudson.util.ListBoxModel;
import org.jenkinsci.plugins.envinject.EnvInjectBuildWrapper;
import org.jenkinsci.plugins.envinject.EnvInjectJobPropertyInfo;
import org.jenkinsci.plugins.kubernetes.cli.helpers.DummyCredentials;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import java.util.ArrayList;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

/**
* @author Max Laverse
*/
public class MultiKubectlBuildWrapperTest {
@Rule
public JenkinsRule r = new JenkinsRule();

@Test
public void testConfigurationPersistedOnSave() throws Exception {
CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), DummyCredentials.secretCredential("test-credentials"));

FreeStyleProject p = r.createFreeStyleProject();

KubectlCredential kc = new KubectlCredential();
kc.credentialsId= "test-credentials";
List<KubectlCredential> l = new ArrayList();
l.add(kc);
MultiKubectlBuildWrapper bw = new MultiKubectlBuildWrapper(l);
p.getBuildWrappersList().add(bw);

assertEquals("<?xml version='1.1' encoding='UTF-8'?>\n" +
"<project>\n" +
" <keepDependencies>false</keepDependencies>\n" +
" <properties/>\n" +
" <scm class=\"hudson.scm.NullSCM\"/>\n" +
" <canRoam>false</canRoam>\n" +
" <disabled>false</disabled>\n" +
" <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>\n" +
" <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>\n" +
" <triggers/>\n" +
" <concurrentBuild>false</concurrentBuild>\n" +
" <builders/>\n" +
" <publishers/>\n" +
" <buildWrappers>\n" +
" <org.jenkinsci.plugins.kubernetes.cli.MultiKubectlBuildWrapper>\n" +
" <kubectlCredentials>\n" +
" <org.jenkinsci.plugins.kubernetes.cli.KubectlCredential>\n" +
" <credentialsId>test-credentials</credentialsId>\n" +
" </org.jenkinsci.plugins.kubernetes.cli.KubectlCredential>\n" +
" </kubectlCredentials>\n" +
" </org.jenkinsci.plugins.kubernetes.cli.MultiKubectlBuildWrapper>\n" +
" </buildWrappers>\n" +
"</project>", p.getConfigFile().asString());
}
}