validation: validate resources and groups

app/deployment/app.go

@@ -11,6 +11,7 @@ import (
 	appstate "github.com/ovrclk/akash/state"
 	"github.com/ovrclk/akash/types"
 	"github.com/ovrclk/akash/types/code"
+	"github.com/ovrclk/akash/validation"
 	tmtypes "github.com/tendermint/abci/types"
 	"github.com/tendermint/tmlibs/log"
 )
@@ -245,10 +246,10 @@ func (a *app) doCheckCreateTx(state appstate.State, ctx apptypes.Context, tx *ty
 		}
 	}
 
-	if len(tx.Groups) == 0 {
+	if err := validation.ValidateGroupSpecs(tx.Groups); err != nil {
 		return tmtypes.ResponseCheckTx{
 			Code: code.INVALID_TRANSACTION,
-			Log:  "No groups in deployment",
+			Log:  err.Error(),
 		}
 	}
 

cmd/akash/deployment.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ovrclk/akash/txutil"
 	"github.com/ovrclk/akash/types"
 	. "github.com/ovrclk/akash/util"
+	"github.com/ovrclk/akash/validation"
 	"github.com/spf13/cobra"
 )
 
@@ -375,7 +376,7 @@ func manifestValidateResources(session session.Session, mani *types.Manifest, da
 	if err != nil {
 		return err
 	}
-	return manifest.ValidateWithDeployment(mani, dgroups.Items)
+	return validation.ValidateManifestWithDeployment(mani, dgroups.Items)
 }
 
 func doSendManifest(session session.Session, signer txutil.Signer, daddr []byte, mani *types.Manifest) error {

provider/bidengine/config.go

@@ -1,9 +1,9 @@
 package bidengine
 
 type config struct {
-	FulfillmentCPUMax    int64 `env:"AKASH_FULFILLMENT_CPU_MAX" envDefault:"1000"`
+	FulfillmentCPUMax    int64 `env:"AKASH_FULFILLMENT_CPU_MAX"    envDefault:"1000"`
 	FulfillmentMemoryMax int64 `env:"AKASH_FULFILLMENT_MEMORY_MAX" envDefault:"1073741824"` // 1Gi
-	FulfillmentDiskMax   int64 `env:"AKASH_FULFILLMENT_DISK_MAX" envDefault:"5368709120"`   // 5Gi
+	FulfillmentDiskMax   int64 `env:"AKASH_FULFILLMENT_DISK_MAX"   envDefault:"5368709120"` // 5Gi
 
 	FulfillmentMemPriceMin int64 `env:"AKASH_MEM_PRICE_MIN" envDefault:"50"`
 	FulfillmentMemPriceMax int64 `env:"AKASH_MEM_PRICE_MAX" envDefault:"150"`

provider/manifest/handler.go

@@ -12,6 +12,7 @@ import (
 	"github.com/ovrclk/akash/types"
 	"github.com/ovrclk/akash/types/base"
 	"github.com/ovrclk/akash/util/runner"
+	"github.com/ovrclk/akash/validation"
 )
 
 var ErrNotRunning = errors.New("not running")
@@ -171,6 +172,13 @@ loop:
 
 		case req := <-h.mreqch:
 
+			if err := validation.ValidateManifest(req.value.Manifest); err != nil {
+				h.session.Log().Error("manifest validation failed",
+					"err", err, "deployment", req.value.Deployment)
+				req.ch <- err
+				break
+			}
+
 			manager, err := h.ensureManger(req.value.Deployment)
 			if err != nil {
 				h.session.Log().Error("error fetching manager for manifest",

provider/manifest/manager.go

@@ -14,6 +14,7 @@ import (
 	"github.com/ovrclk/akash/types"
 	"github.com/ovrclk/akash/types/base"
 	"github.com/ovrclk/akash/util/runner"
+	"github.com/ovrclk/akash/validation"
 )
 
 func newManager(h *handler, daddr base.Bytes) (*manager, error) {
@@ -309,7 +310,7 @@ func (m *manager) validateRequests() {
 }
 
 func (m *manager) validateRequest(req manifestRequest) error {
-	if err := mutil.ValidateWithDeployment(req.value.Manifest, m.data.dgroups); err != nil {
+	if err := validation.ValidateManifestWithDeployment(req.value.Manifest, m.data.dgroups); err != nil {
 		return err
 	}
 	return mutil.VerifyRequest(req.value, m.data.deployment)

sdl/sdl.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 
 	"github.com/ovrclk/akash/types"
+	"github.com/ovrclk/akash/validation"
 	yaml "gopkg.in/yaml.v2"
 )
 
@@ -27,5 +28,29 @@ func Read(buf []byte) (SDL, error) {
 	if err := yaml.Unmarshal(buf, obj); err != nil {
 		return nil, err
 	}
-	return obj, obj.Validate()
+
+	if err := obj.Validate(); err != nil {
+		return nil, err
+	}
+
+	dgroups, err := obj.DeploymentGroups()
+	if err != nil {
+		return nil, err
+	}
+	if err := validation.ValidateGroupSpecs(dgroups); err != nil {
+		return nil, err
+	}
+
+	m, err := obj.Manifest()
+	if err != nil {
+		return nil, err
+	}
+	if err := validation.ValidateManifest(m); err != nil {
+		return nil, err
+	}
+	if err := validation.ValidateManifestWithGroupSpecs(m, dgroups); err != nil {
+		return nil, err
+	}
+
+	return obj, nil
 }

sdl/v1.go

@@ -97,13 +97,6 @@ func (sdl *v1) Validate() error {
 		return fmt.Errorf("invalid version: '%v' required", allowedVersion)
 	}
 
-	if _, err := sdl.Manifest(); err != nil {
-		return err
-	}
-
-	if _, err := sdl.DeploymentGroups(); err != nil {
-		return err
-	}
 	return nil
 }
 

testutil/deployment.go

@@ -22,6 +22,7 @@ func CreateDeployment(t *testing.T, st state.State, app apptypes.Application, ac
 
 	for _, group := range groups.GetItems() {
 		s := &types.GroupSpec{
+			Name:         group.Name,
 			Resources:    group.Resources,
 			Requirements: group.Requirements,
 		}