Merge branch 'master' of github.com:replicatedcom/ship into kustomize-merged-overlays

Author: GraysonNull

Gopkg.lock

@@ -75,3 +75,7 @@
 [[constraint]]
   name = "k8s.io/client-go"
   version = "7.0.0"
+
+[[constraint]]
+  name = "k8s.io/helm"
+  version = "2.9.1"

Gopkg.toml

@@ -38,8 +38,8 @@ func RootCmd() *cobra.Command {
 	cmd.PersistentFlags().IntP("api-port", "p", 8800, "port to start the API server on.")
 	cmd.PersistentFlags().BoolP("headless", "", false, "run ship in headless mode")
 	cmd.PersistentFlags().Bool("no-open", false, "skip opening the ship console in the default browser--does not disable the UI, has no effect if `headless` is set to true.")
-
 	cmd.PersistentFlags().String("state-file", "", "path to the state file to read from, defaults to .ship/state.json")
+	cmd.PersistentFlags().String("resource-type", "", "upstream application resource type")
 
 	cmd.AddCommand(Init())
 	cmd.AddCommand(Watch())

pkg/cli/root.go

@@ -1,6 +1,8 @@
 package daemon
 
-import "github.com/replicatedhq/ship/pkg/lifecycle/daemon/daemontypes"
+import (
+	"github.com/replicatedhq/ship/pkg/lifecycle/daemon/daemontypes"
+)
 
 func MessageActions() []daemontypes.Action {
 	return []daemontypes.Action{

pkg/lifecycle/daemon/actions.go

@@ -1,9 +1,15 @@
 package daemon
 
 import (
+	"fmt"
 	"net/http"
 	"sync"
 
+	"k8s.io/helm/pkg/lint/rules"
+	"k8s.io/helm/pkg/lint/support"
+
+	"github.com/replicatedhq/ship/pkg/constants"
+
 	"github.com/gin-gonic/gin"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -234,13 +240,33 @@ func (d *V1Routes) saveHelmValues(c *gin.Context) {
 		level.Error(d.Logger).Log("event", "unmarshal request body failed", "err", err)
 	}
 
-	debug.Log("event", "serialize.helmValues")
+	debug.Log("event", "validate")
+	linter := support.Linter{ChartDir: constants.KustomizeHelmPath}
+	rules.Templates(&linter, []byte(request.Values), "", false)
+
+	if len(linter.Messages) > 0 {
+		var formattedErrors []string
+		for _, message := range linter.Messages {
+			formattedErrors = append(formattedErrors, message.Error())
+		}
+
+		debug.Log(
+			"event", "validate.fail",
+			"errors", fmt.Sprintf("%+v", formattedErrors),
+		)
+		c.JSON(http.StatusBadRequest, map[string]interface{}{
+			"errors": formattedErrors,
+		})
+		return
+	}
+
+	debug.Log("event", "serialize")
 	err := d.StateManager.SerializeHelmValues(request.Values)
 	if err != nil {
-		level.Error(d.Logger).Log("event", "seralize.helmValues.fail", "err", err)
-		c.AbortWithError(500, errors.New("internal_server_error"))
+		debug.Log("event", "seralize.fail", "err", err)
+		c.AbortWithError(http.StatusInternalServerError, errors.New("internal_server_error"))
 	}
-	c.String(200, "")
+	c.String(http.StatusOK, "")
 }
 
 func (d *V1Routes) getChannel(release *api.Release) gin.HandlerFunc {

pkg/lifecycle/daemon/routes_v1.go

@@ -1,6 +1,8 @@
 package daemon
 
 import (
+	"fmt"
+
 	"github.com/gin-gonic/gin"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -31,6 +33,7 @@ func (d *V2Routes) getStep(c *gin.Context) {
 }
 
 func (d *V2Routes) hydrateStep(step daemontypes.Step, isCurrent bool) (*daemontypes.StepResponse, error) {
+
 	if step.Kustomize != nil {
 		// TODO(Robert): move this into TreeLoader, duplicated in V1 routes
 		currentState, err := d.StateManager.TryLoad()
@@ -78,12 +81,40 @@ func (d *V2Routes) hydrateStep(step daemontypes.Step, isCurrent bool) (*daemonty
 	result := &daemontypes.StepResponse{
 		CurrentStep: step,
 		Phase:       step.Source.ShortName(),
-		Actions:     []daemontypes.Action{}, //todo actions
 	}
 
 	if progress, ok := d.StepProgress.Load(step.Source.Shared().ID); ok {
 		result.Progress = &progress
 	}
 
+	actions := d.getActions(result.CurrentStep)
+	result.Actions = actions
+
 	return result, nil
 }
+
+func (d *V2Routes) getActions(step daemontypes.Step) []daemontypes.Action {
+	if step.Message != nil {
+		progress, ok := d.StepProgress.Load(step.Source.Shared().ID)
+
+		shouldAddActions := ok && progress.Detail != "success"
+
+		if shouldAddActions {
+			return nil
+		}
+
+		return []daemontypes.Action{
+			{
+				ButtonType:  "primary",
+				Text:        "Confirm",
+				LoadingText: "Confirming",
+				OnClick: daemontypes.ActionRequest{
+					URI:    fmt.Sprintf("/api/v2/lifecycle/step/%s", step.Source.Shared().ID),
+					Method: "POST",
+					Body:   "",
+				},
+			},
+		}
+	}
+	return nil
+}