Merge pull request #170 from FlowCI/feature/162

Feature/162

Author: yunheli

platform-api/src/main/java/com/flow/platform/api/service/node/NodeServiceImpl.java

@@ -288,7 +288,7 @@ private Boolean checkFlowName(String flowName) {
             return false;
         }
 
-        if (!Pattern.compile("^\\w{4,20}$").matcher(flowName).matches()) {
+        if (!Pattern.compile("^(?!_)(?!-)[\\w-]{4,20}$").matcher(flowName).matches()) {
             return false;
         }
 

platform-api/src/test/java/com/flow/platform/api/test/integration/ManualJobTest.java

@@ -58,8 +58,8 @@ public void should_manual_create_job_with_failure_since_unable_to_create_session
         Map<String, String> envs = EnvUtil.build(GitEnvs.FLOW_GIT_BRANCH.name(), "master");
         jobService.createWithYmlLoad(
             flow.getPath(), JobCategory.MANUAL, envs, currentUser.get(), job -> {
-                latch.countDown();
                 wrapper.setInstance(job);
+                latch.countDown();
             }
         );
 

platform-api/src/test/java/com/flow/platform/api/test/service/NodeServiceTest.java

@@ -276,4 +276,28 @@ public void should_delete_flow() throws Throwable {
         // then: should return null if root node is not existed
         Assert.assertNull(ymlService.get(root));
     }
+
+    @Test
+    public void should_create_flow_success() {
+        Assert.assertNotNull(nodeService.createEmptyFlow("flow-test"));
+        Assert.assertNotNull(nodeService.createEmptyFlow("flow_test"));
+        Assert.assertNotNull(nodeService.createEmptyFlow("flow_12est"));
+        Assert.assertNotNull(nodeService.createEmptyFlow("flow12est"));
+        Assert.assertNotNull(nodeService.createEmptyFlow("flow"));
+    }
+
+    @Test(expected = IllegalParameterException.class)
+    public void should_create_flow_error() {
+        // not start with _
+        nodeService.createEmptyFlow("_flow-test");
+
+        // not start with -
+        nodeService.createEmptyFlow("-flow-test");
+
+        // not include .
+        nodeService.createEmptyFlow("flow.test");
+
+        // not include 3 keys
+        nodeService.createEmptyFlow("flw");
+    }
 }

platform-util-zk/src/test/java/com/flow/platform/util/zk/test/ZkClientTest.java

@@ -89,6 +89,7 @@ public void should_create_node_atom() throws Throwable {
 
         zkClient.create(root, null);
         String agentNodePath = ZKPaths.makePath(root, "flow-atom");
+
         zkClient.delete(agentNodePath, false);
 
         for (int i = 0; i < 5; i++) {