fix #304 add scm import status and deleted fields to import items

rundeck · Aug 11, 2020 · f036bf4 · f036bf4
1 parent 8535eba
commit f036bf4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/rd-api-client/src/main/java/org/rundeck/client/api/model/ScmImportItem.java b/rd-api-client/src/main/java/org/rundeck/client/api/model/ScmImportItem.java
@@ -31,12 +31,16 @@
 public class ScmImportItem implements DataOutput {
     public String itemId;
     public Boolean tracked;
+    public Boolean deleted;
     public ScmJobItem job;
+    public String status;
 
     public Map asMap() {
         HashMap<String, Object> map = new HashMap<>();
         map.put("itemId", itemId);
         map.put("tracked", tracked);
+        map.put("deleted", deleted != null ? deleted : false);
+        map.put("status", status);
         if(null!=job) {
             map.put("job", job.toMap());
         }

diff --git a/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy
@@ -237,10 +237,12 @@ class SCMSpec extends Specification {
                                         type: 'String'
                                 )],
                                 importItems: [
-                                        new ScmImportItem(itemId: '/a/path', tracked: false, job: null),
+                                        new ScmImportItem(itemId: '/a/path', tracked: false, job: null,deleted: false, status:'CLEAN'),
                                         new ScmImportItem(
                                                 itemId: '/b/path',
                                                 tracked: true,
+                                                deleted: false,
+                                                status:'CLEAN',
                                                 job: new ScmJobItem(
                                                         jobId: 'ajob',
                                                         jobName: 'job name',
@@ -266,8 +268,8 @@ class SCMSpec extends Specification {
         1 * out.output('Items:')
         1 * out.output(
                 [
-                        ['itemId': '/a/path', 'tracked': false],
-                        ['itemId': '/b/path', 'tracked': true,
+                        ['itemId': '/a/path', 'tracked': false, 'deleted': false, status:'CLEAN'],
+                        ['itemId': '/b/path', 'tracked': true, 'deleted': false, status:'CLEAN',
                          'job'   : [
                                  'jobName'  : 'job name',
                                  'jobId'    : 'ajob',