fixes #137 add delete branch task and update configuration for service.yml

Author: stevehu

bot-cli/src/main/resources/config/regex-replace.yml

@@ -31,7 +31,7 @@ checkout:
     - [email protected]:networknt/light-bot-config.git
     - [email protected]:networknt/light-config-test.git
     - [email protected]:networknt/light-bot.git
-    - [email protected]:networknt/light-config-server.git
+    - [email protected]:lightapi/light-config-server.git
     - [email protected]:networknt/microservices-framework-benchmark.git
     - [email protected]:networknt/model-config.git
     - [email protected]:networknt/light-portal.git

bot-cli/src/main/resources/config/release-maven.yml

@@ -35,7 +35,7 @@ checkout:
     - [email protected]:networknt/light-bot-config.git
     - [email protected]:networknt/light-config-test.git
     - [email protected]:networknt/light-bot.git
-    - [email protected]:networknt/light-config-server.git
+    - [email protected]:lightapi/light-config-server.git
     - [email protected]:networknt/microservices-framework-benchmark.git
     - [email protected]:networknt/model-config.git
     - [email protected]:networknt/light-portal.git

bot-cli/src/main/resources/config/service.yml

@@ -2,7 +2,7 @@
 singletons:
 # Executor to CommandExecutor binding
 - com.networknt.bot.core.Executor:
-  - com.networknt.bot.core.CommandExecutor
+  - com.networknt.bot.core.FasterRollingCommandExecutor
 - com.networknt.bot.core.Command:
   - com.networknt.bot.develop.DevelopBuildTask
   - com.networknt.bot.version.VersionUpgradeTask
@@ -11,4 +11,5 @@ singletons:
   - com.networknt.bot.regex.replace.RegexReplaceTask
   - com.networknt.bot.branch.CreateBranchTask
   - com.networknt.bot.branch.MergeBranchTask
+  - com.networknt.bot.branch.DeleteBranchTask
   - com.networknt.bot.sync.SyncGitRepoTask

exec-core/src/main/java/com/networknt/bot/core/CommandExecutor.java

@@ -11,9 +11,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @deprecated
- */
 public abstract class CommandExecutor implements Executor {
     static final Logger logger = LoggerFactory.getLogger(CommandExecutor.class);
 

exec-core/src/main/java/com/networknt/bot/core/Constants.java

@@ -120,4 +120,7 @@ public class Constants {
     public static final String EXTERNAL_REPO = "external_repo";
     public static final String INTERNAL_REPO = "internal_repo";
 
+    // delete-branch
+    public static final String SKIP_LOCAL = "skip_local";
+    public static final String SKIP_REMOTE = "skip_remote";
 }

exec-core/src/main/java/com/networknt/bot/core/cmd/DeleteLocalBranchCmd.java

@@ -0,0 +1,50 @@
+package com.networknt.bot.core.cmd;
+
+import com.networknt.bot.core.Command;
+import com.networknt.bot.core.Executor;
+import com.networknt.service.SingletonServiceFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This command is to delete a local branch in the workspace if it exists.
+ */
+public class DeleteLocalBranchCmd implements Command {
+    private static final Logger logger = LoggerFactory.getLogger(DeleteLocalBranchCmd.class);
+    private final Executor executor = SingletonServiceFactory.getBean(Executor.class);
+    private final Path rPath;
+    private final String branch;
+
+    public DeleteLocalBranchCmd(Path rPath, String branch) {
+        this.rPath = rPath;
+        this.branch = branch;
+    }
+
+    @Override
+    public int execute() throws IOException, InterruptedException {
+        int result;
+        // create a branch from the current branch
+        List<String> commands = new ArrayList<>();
+
+        commands.add("bash");
+        commands.add("-c");
+        commands.add("if git show-ref --verify --quiet refs/heads/" + branch + "; then git branch -d " + branch + "; else echo 'Branch " + branch + " does not exist'; fi");
+        logger.info("Checking if branch {} exists and deleting it for {}", branch, rPath);
+        result = executor.execute(commands, rPath.toFile());
+        String stdout = executor.getStdout();
+        if(stdout != null && !stdout.isEmpty()) logger.debug(stdout);
+        String stderr = executor.getStderr();
+        if(stderr != null && !stderr.isEmpty()) logger.info(stderr);
+        return result;
+    }
+
+    @Override
+    public String getName() {
+        return "DeleteLocalBranch";
+    }
+}

exec-core/src/main/java/com/networknt/bot/core/cmd/DeleteRemoteBranchCmd.java

@@ -0,0 +1,52 @@
+package com.networknt.bot.core.cmd;
+
+import com.networknt.bot.core.Command;
+import com.networknt.bot.core.Executor;
+import com.networknt.service.SingletonServiceFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This command is to delete a remote branch in the workspace.
+ *
+ */
+public class DeleteRemoteBranchCmd implements Command {
+    private static final Logger logger = LoggerFactory.getLogger(DeleteRemoteBranchCmd.class);
+    private final Executor executor = SingletonServiceFactory.getBean(Executor.class);
+    private final Path rPath;
+    private final String branch;
+
+    public DeleteRemoteBranchCmd(Path rPath, String branch) {
+        this.rPath = rPath;
+        this.branch = branch;
+    }
+
+    @Override
+    public int execute() throws IOException, InterruptedException {
+        int result;
+        // create a branch from the current branch
+        List<String> commands = new ArrayList<>();
+        commands.add("bash");
+        commands.add("-c");
+
+        commands.add("git push -d origin " + branch);
+        logger.info("git push -d origin {} for {}", branch, rPath);
+
+        result = executor.execute(commands, rPath.toFile());
+        String stdout = executor.getStdout();
+        if(stdout != null && !stdout.isEmpty()) logger.debug(stdout);
+        String stderr = executor.getStderr();
+        if(stderr != null && !stderr.isEmpty()) logger.info(stderr);
+        return result;
+    }
+
+    @Override
+    public String getName() {
+        return "DeleteRemoteBranch";
+    }
+}

exec-create-branch/src/test/java/com/networknt/bot/branch/CreateBranchTaskTest.java

@@ -1,12 +1,14 @@
 package com.networknt.bot.branch;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
 
 public class CreateBranchTaskTest {
-    //@Test
+    @Test
+    @Ignore
     public void testCreateBranch() throws IOException, InterruptedException {
         CreateBranchTask cmd = new CreateBranchTask();
         int result = cmd.execute();

exec-create-branch/src/test/resources/config/create-branch.yml

@@ -1,12 +1,12 @@
 # This task is used to create a new branch from an existing branch or a tag.
 # Workspace that is used for this operation. Most of time, this is done on local.
-workspace: createbranch
+workspace: create-branch-test
 # The new branch name that is going to be created
-branch: 1.6.x
+branch: patch
 # If the new branch is created from a tag
-from_tag: false
+from_tag: true
 # The original tag to create a new branch if from_tag is true.
-tag: 1.5.32
+tag: 2.1.37
 # You can skip checkout if you are sure that the code in workspace are the latest and
 # you just want to repeat the create branch process due to some environmental issue before.
 skip_checkout: false
@@ -16,7 +16,7 @@ skip_branch: false
 skip_push: true
 # clone and switch to the branch specified in checkout step.
 checkout:
-  - branch: develop
+  - branch: master
     repository:
     - [email protected]:networknt/json-overlay.git
     - [email protected]:networknt/openapi-parser.git

exec-create-branch/src/test/resources/config/service.yml

@@ -2,6 +2,6 @@
 singletons:
 # Executor to CommandExecutor binding
 - com.networknt.bot.core.Executor:
-  - com.networknt.bot.core.CommandExecutor
+  - com.networknt.bot.core.FasterRollingCommandExecutor
 - com.networknt.bot.core.Command:
   - com.networknt.bot.branch.CreateBranchTask