JENKINS-40920

no longer assuming just one liquibase builder per project. Also better way of testing migration
jenkinsci · Jan 9, 2017 · 4073144 · 4073144
1 parent a764793
commit 4073144
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 198 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/liquibase/evaluator/CredentialsMigrator.java b/src/main/java/org/jenkinsci/plugins/liquibase/evaluator/CredentialsMigrator.java
@@ -1,7 +1,6 @@
 package org.jenkinsci.plugins.liquibase.evaluator;
 
 import hudson.Extension;
-import hudson.model.Describable;
 import hudson.model.Item;
 import hudson.model.ModelObject;
 import hudson.model.Project;
@@ -46,9 +45,9 @@ static void migrateLegacyCredentials() {
             List<Project> projects = instance.getItems(Project.class);
             for (Project project : projects) {
                 DescribableList buildersList = project.getBuildersList();
-                Describable describable = buildersList.get(AbstractLiquibaseBuilder.class);
-                if (describable != null) {
-                    AbstractLiquibaseBuilder liquibaseBuilder = (AbstractLiquibaseBuilder) describable;
+                List builders = buildersList.getAll(AbstractLiquibaseBuilder.class);
+                for (Object builder : builders) {
+                    AbstractLiquibaseBuilder liquibaseBuilder = (AbstractLiquibaseBuilder) builder;
                     migrateCredentials(project, liquibaseBuilder);
                 }
             }

diff --git a/src/test/java/org/jenkinsci/plugins/liquibase/evaluator/CredentialsMigratorTest.java b/src/test/java/org/jenkinsci/plugins/liquibase/evaluator/CredentialsMigratorTest.java
@@ -0,0 +1,63 @@
+package org.jenkinsci.plugins.liquibase.evaluator;
+
+import hudson.model.Project;
+import jenkins.model.Jenkins;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class CredentialsMigratorTest {
+
+
+    private static final Logger LOG = LoggerFactory.getLogger(CredentialsMigratorTest.class);
+
+    @ClassRule
+    public static JenkinsRule jenkinsRule = new JenkinsRule().withPresetData("update-test-data");
+
+    /**
+     * Covers JENKINS-40920.  The preset data contains a job containing < 1.2.0 plugin format, and
+     * whose credentials should therefore be migrated.
+     * The test does verify that the old job does indeed exist in the preset data.
+     * @throws IOException
+     */
+    @Test
+    public void should_migrate_both_builder() throws IOException {
+        Jenkins jenkins = jenkinsRule.getInstance();
+        List<Project> projects = jenkins.getItems(Project.class);
+
+        boolean presetDataIncludedLiquibaseBuilder = false;
+        boolean projectContainedMoreThanOneBuilder = false;
+
+        int builderCounter = 0;
+
+        for (Project project : projects) {
+            List all = project.getBuildersList().getAll(AbstractLiquibaseBuilder.class);
+            for (Object o : all) {
+                AbstractLiquibaseBuilder liquibaseBuilder = (AbstractLiquibaseBuilder) o;
+                builderCounter++;
+                if (liquibaseBuilder!=null) {
+                    assertThat(liquibaseBuilder.getCredentialsId(), is(notNullValue()));
+                    assertThat(liquibaseBuilder.hasLegacyCredentials(), is(false));
+                    if (!presetDataIncludedLiquibaseBuilder) {
+                        presetDataIncludedLiquibaseBuilder = true;
+                    }
+                }
+            }
+            projectContainedMoreThanOneBuilder = builderCounter>1;
+        }
+
+        assertThat(presetDataIncludedLiquibaseBuilder, is(true));
+        assertThat(projectContainedMoreThanOneBuilder, is(true));
+    }
+
+}
diff --git a/src/test/resources/scripted-upgrade-test/oldauth_job_config.xml b/src/test/resources/scripted-upgrade-test/oldauth_job_config.xml
diff --git a/src/test/resources/scripted-upgrade-test/unsecured-jenkins.xml b/src/test/resources/scripted-upgrade-test/unsecured-jenkins.xml
diff --git a/src/test/resources/scripted-upgrade-test/upgrade-credentials-test.sh b/src/test/resources/scripted-upgrade-test/upgrade-credentials-test.sh
diff --git a/src/test/resources/update-test-data.zip b/src/test/resources/update-test-data.zip