Merge pull request #328 from FlowCI/develop

Develop

Author: gy2006

.gitignore

@@ -6,4 +6,5 @@ target/
 .project
 .settings/
 .classpath
-.factorypath
+.factorypath
+*Proto.java

Makefile

@@ -0,0 +1,29 @@
+
+
+MVN_CLEAN    	:= mvn clean
+MVN_BUILD    	:= mvn compile -T 4C
+MVN_PKG	    	:= mvn package -T 4C -Dmaven.test.skip=true
+MVN_TEST		:= mvn test -T 4C
+
+
+CURRENT_DIR 	:= $(shell pwd)
+
+DOCKER_VOLUME	:= -v $(HOME)/.m2:/root/.m2
+DOCKER_IMG		:= flowci/javasdk:1.0
+DOCKER_RUN 		:= docker run -it --rm -v $(CURRENT_DIR):/ws -w /ws $(DOCKER_VOLUME) --network host $(DOCKER_IMG)
+
+DOCKER_BUILD 	:= ./build.sh
+
+.PHONY: build test clean package
+
+build:
+	$(DOCKER_RUN) $(MVN_BUILD)
+
+package:
+	$(DOCKER_RUN) $(MVN_PKG)
+
+test:
+	$(DOCKER_RUN) $(MVN_TEST)
+
+clean:
+	$(DOCKER_RUN) $(MVN_CLEAN)

core/pom.xml

@@ -105,6 +105,11 @@
       <artifactId>org.eclipse.jgit</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
@@ -168,6 +173,29 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <phase>
+              generate-sources
+            </phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <workingDirectory>${project.build.sourceDirectory}</workingDirectory>
+          <executable>protoc</executable>
+          <commandlineArgs>
+            -I=./ --java_out=./ job.proto
+          </commandlineArgs>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

core/src/main/java/com/flowci/core/api/service/OpenRestServiceImpl.java

@@ -111,7 +111,7 @@ public List<User> users(String flowName) {
 
     private Job getJob(String name, long number) {
         Flow flow = flowService.get(name);
-        String key = JobKeyBuilder.build(flow, number);
+        String key = JobKeyBuilder.build(flow.getId(), number);
         Optional<Job> optional = jobDao.findByKey(key);
 
         if (optional.isPresent()) {

core/src/main/java/com/flowci/core/common/config/WebSocketConfig.java

@@ -65,7 +65,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/ws").setAllowedOrigins("*").withSockJS();
+        registry.addEndpoint("/ws").setAllowedOrigins("*");
     }
 
     @Override

core/src/main/java/com/flowci/core/common/domain/Variables.java

@@ -63,4 +63,10 @@ public abstract static class Job {
         // {step name}={status};{step name}={status}
         public static final String Steps = "FLOWCI_JOB_STEPS";
     }
+
+    public abstract static class Step {
+
+        // to control run step from docker defined in step or plugin, default is true
+        public static final String DockerEnabled = "FLOWCI_STEP_DOCKER_ENABLED";
+    }
 }

core/src/main/java/com/flowci/core/common/manager/SocketPushManager.java

@@ -19,12 +19,13 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.domain.PushBody;
 import com.flowci.core.common.domain.PushEvent;
-import java.io.IOException;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
+
 /**
  * @author yang
  */
@@ -47,4 +48,8 @@ public void push(String topic, PushEvent event, Object obj) {
             log.warn(e.getMessage());
         }
     }
+
+    public void push(String topic, byte[] bytes) {
+        simpMessagingTemplate.convertAndSend(topic, bytes);
+    }
 }

core/src/main/java/com/flowci/core/flow/controller/YmlController.java

@@ -22,18 +22,13 @@
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.flow.service.YmlService;
 import com.flowci.domain.http.RequestMessage;
-import java.util.Base64;
-import java.util.List;
-
-import com.flowci.tree.Node;
+import com.flowci.tree.StepNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Base64;
+import java.util.List;
 
 /**
  * @author yang
@@ -49,7 +44,7 @@ public class YmlController {
     private YmlService ymlService;
 
     @GetMapping("/{name}/yml/steps")
-    public List<Node> listSteps(@PathVariable String name) {
+    public List<StepNode> listSteps(@PathVariable String name) {
         Flow flow = flowService.get(name);
         return ymlService.ListChildren(flow);
     }

core/src/main/java/com/flowci/core/flow/service/CronService.java

@@ -18,12 +18,12 @@
 
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.Yml;
-import com.flowci.tree.Node;
+import com.flowci.tree.FlowNode;
 
 /**
  * @author yang
  */
 public interface CronService {
 
-    void update(Flow flow, Node root, Yml yml);
+    void update(Flow flow, FlowNode root, Yml yml);
 }

core/src/main/java/com/flowci/core/flow/service/CronServiceImpl.java

@@ -29,7 +29,7 @@
 import com.flowci.core.flow.domain.Yml;
 import com.flowci.core.job.domain.Job.Trigger;
 import com.flowci.core.job.event.CreateNewJobEvent;
-import com.flowci.tree.Node;
+import com.flowci.tree.FlowNode;
 import com.flowci.tree.YmlParser;
 import com.flowci.zookeeper.ZookeeperClient;
 import com.flowci.zookeeper.ZookeeperException;
@@ -81,7 +81,7 @@ private void initZkRoot() {
     }
 
     @Override
-    public void update(Flow flow, Node root, Yml yml) {
+    public void update(Flow flow, FlowNode root, Yml yml) {
         if (!root.hasCron()) {
             return;
         }
@@ -127,7 +127,7 @@ private void scheduleNext() {
                 return;
             }
 
-            Node node = YmlParser.load(flow.getName(), yml.getRaw());
+            FlowNode node = YmlParser.load(flow.getName(), yml.getRaw());
             update(flow, node, optional.get());
         }