Merge pull request AcalephStorage#66 from AcalephStorage/release/0.1.5

Release/0.1.5

Author: darkcrux

api/stage.go

@@ -49,8 +49,9 @@ func (s *StageResource) extend(ws *restful.WebService) {
 		Param(ws.PathParameter("repo", "repository name").DataType("string")).
 		Param(ws.PathParameter("buildNumber", "build number").DataType("int")).
 		Param(ws.PathParameter("stageIndex", "stage index").DataType("int")).
+		Param(ws.QueryParameter("continue", "continue to next stage").DataType("string")).
 		Reads(ps.StatusUpdate{}).
-		Writes(ps.Stage{}))
+		Writes(ps.StatusUpdate{}))
 
 	ws.Route(ws.POST("/{owner}/{repo}/builds/{buildNumber}/stages/{stageIndex}/run").To(s.run).
 		Doc("Run build at given stage").
@@ -184,6 +185,7 @@ func (s *StageResource) update(req *restful.Request, res *restful.Response) {
 	repo := req.PathParameter("repo")
 	buildNumber := req.PathParameter("buildNumber")
 	stageIndex := req.PathParameter("stageIndex")
+	cont := req.QueryParameter("continue")
 
 	pipeline, build, stage, err := s.fetchResources(owner, repo, buildNumber, stageIndex)
 	if err != nil {
@@ -204,19 +206,48 @@ func (s *StageResource) update(req *restful.Request, res *restful.Response) {
 		return
 	}
 
+	if stage.Type == "wait" {
+		switch cont {
+		case "yes":
+			status.Status = ps.BuildSuccess
+			status.Timestamp = time.Now().UnixNano()
+		default:
+			return
+		}
+	}
+
 	nextStage, err := stage.UpdateStatus(status, pipeline, build, s.KVClient, client)
+
 	if err != nil {
-		jsonError(res, http.StatusBadRequest, err, "Unable to update stage status")
+		jsonError(res, http.StatusInternalServerError, err, "Unable to update stage status")
+		return
+	}
+
+	if nextStage != nil && nextStage.Type == "wait" {
+		status = new(ps.StatusUpdate)
+		status.Timestamp = time.Now().UnixNano()
+		status.Status = ps.BuildWaiting
+		status.Message = "Do you want to continue? "
+		if len(nextStage.Params) > 0 && nextStage.Params["message"].(string) != " " {
+			status.Message = nextStage.Params["message"].(string)
+		}
+
+		_, err := nextStage.UpdateStatus(status, pipeline, build, s.KVClient, client)
+		if err != nil {
+			jsonError(res, http.StatusInternalServerError, err, "Unable to update stage status")
+		}
+		res.WriteHeaderAndEntity(http.StatusOK, status)
 		return
 	}
 
 	if nextStage != nil {
 		if err, msg := s.runStage(pipeline, build, nextStage, client); err != nil {
 			jsonError(res, http.StatusInternalServerError, err, msg)
 		}
+
 	}
 
-	res.WriteHeader(http.StatusOK)
+	res.WriteHeaderAndEntity(http.StatusOK, nil)
 }
 
 func (s *StageResource) fetchResources(owner, repo, buildNumber, stageIndex string) (*ps.Pipeline, *ps.Build, *ps.Stage, error) {

cli/cli.go

@@ -172,6 +172,43 @@ func main() {
 
 			Action: initialize,
 		},
+		{
+			Name: "describe",
+			Subcommands: []cli.Command{
+				{
+					Name:      "pipeline",
+					Usage:     "display pipeline latest build information",
+					ArgsUsage: "[pipeline-name]",
+					Before: func(c *cli.Context) error {
+						p := strings.TrimSpace(c.Args().First())
+						if len(p) > 0 {
+							return requireNameArg(c)
+						}
+						return nil
+					},
+					Action: getLatestBuild,
+				},
+			},
+		},
+		{
+			Name:      "resume",
+			Usage:     "resume pipeline builds",
+			ArgsUsage: "[pipeline-name]",
+			Flags: []cli.Flag{
+				cli.IntFlag{
+					Name:  "build, b",
+					Usage: "Required, Pipeline build number you want to resume",
+				},
+			},
+			Before: func(c *cli.Context) error {
+				p := strings.TrimSpace(c.Args().First())
+				if len(p) > 0 {
+					return requireNameArg(c)
+				}
+				return nil
+			},
+			Action: resumeBuild,
+		},
 	}
 	app.Run(os.Args)
 }
@@ -275,6 +312,48 @@ func getBuilds(c *cli.Context) {
 	fmt.Println(table)
 }
 
+func getLatestBuild(c *cli.Context) {
+	config, err := apiReq.GetConfigFromFile(c.GlobalString("conf"))
+	if err != nil {
+		os.Exit(1)
+	}
+
+	owner, repo, _ := parseNameArg(c.Args().First())
+	pipelineName := fmt.Sprintf("%s/%s", owner, repo)
+
+	pipeline, err := config.GetPipeline(http.DefaultClient, pipelineName)
+	if err != nil {
+		fmt.Printf("Pipeline %s doesn't exist \n", pipelineName)
+		os.Exit(1)
+	}
+
+	stages, _ := config.GetStages(http.DefaultClient, owner, repo, pipeline.LatestBuild.Number)
+
+	table := uitable.New()
+	table.Wrap = true
+
+	if pipeline.LatestBuild == nil {
+		table.AddRow("No available builds for pipeline", pipelineName)
+		fmt.Println(table)
+		os.Exit(1)
+	}
+
+	started := time.Unix(0, pipeline.LatestBuild.Created).Format(time.RFC3339)
+	finished := time.Unix(0, pipeline.LatestBuild.Finished).Format(time.RFC3339)
+
+	table.AddRow("")
+	table.AddRow("Name:", pipelineName)
+	table.AddRow("Build No:", pipeline.LatestBuild.Number)
+	table.AddRow("Status:", pipeline.LatestBuild.Status)
+	table.AddRow("Author:", pipeline.LatestBuild.Author)
+	table.AddRow("Started:", started)
+	table.AddRow("Finished:", finished)
+	table.AddRow("No of Stages:", len(stages))
+	table.AddRow("")
+	fmt.Println(table)
+
+}
+
 func getStages(c *cli.Context) {
 	config, err := apiReq.GetConfigFromFile(c.GlobalString("conf"))
 	if err != nil {
@@ -338,8 +417,6 @@ func createBuild(c *cli.Context) {
 
 	if err != nil {
 		fmt.Println(err)
-	} else {
-		fmt.Printf("building pipeline %s/%s ", owner, repo)
 	}
 }
 
@@ -434,3 +511,24 @@ func removeDeployedApp(c *cli.Context) {
 
 	fmt.Println("Success! Kontinuous resources has been removed from the cluster. ")
 }
+
+func resumeBuild(c *cli.Context) {
+	config, err := apiReq.GetConfigFromFile(c.GlobalString("conf"))
+	if err != nil {
+		os.Exit(1)
+	}
+	owner, repo, _ := parseNameArg(c.Args().First())
+	buildNo := c.Int("build")
+
+	if owner == "" || repo == "" || buildNo == 0 {
+		fmt.Println("Missing fields.")
+		os.Exit(1)
+	}
+
+	err = config.ResumeBuild(http.DefaultClient, owner, repo, buildNo)
+
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}