Merge pull request #112 from linkernetworks/johnlin/pod-entity-valida…

…te-fix johnlin/pod entity validate fix
linkernetworks · Jul 18, 2018 · 9b7508a · 9b7508a
2 parents 3e91926 + 83d9bd8
commit 9b7508a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/entity/pod.go b/src/entity/pod.go
@@ -13,7 +13,7 @@ const (
 type Container struct {
 	Name    string   `bson:"name" json:"name" validate:"required"`
 	Image   string   `bson:"image" json:"image" validate:"required"`
-	Command []string `bson:"command" json:"command" validate:"-"`
+	Command []string `bson:"command" json:"command" validate:"required,dive,required"`
 }
 
 type PodVolume struct {
@@ -25,10 +25,10 @@ type Pod struct {
 	ID         bson.ObjectId     `bson:"_id,omitempty" json:"id" validate:"-"`
 	Name       string            `bson:"name" json:"name" validate:"required"`
 	Namespace  string            `bson:"namespace" json:"namespace" validate:"required"`
-	Labels     map[string]string `bson:"labels,omitempty" json:"labels" validate:"-"`
+	Labels     map[string]string `bson:"labels,omitempty" json:"labels" validate:"required,dive,keys,alphanum,endkeys,required,alphanum"`
 	Containers []Container       `bson:"containers" json:"containers" validate:"required,dive,required"`
+	Volumes    []PodVolume       `bson:"volumes,omitempty" json:"volumes" validate:"required,dive,required"`
 	CreatedAt  *time.Time        `bson:"createdAt,omitempty" json:"createdAt,omitempty" validate:"-"`
-	Volumes    []PodVolume       `bson:"volumes,omitempty" json:"volumes" validate:"-"`
 }
 
 //GetCollection - get model mongo collection name.

diff --git a/src/server/handler_pod_test.go b/src/server/handler_pod_test.go
@@ -44,8 +44,7 @@ func (suite *PodTestSuite) SetupSuite() {
 	suite.wc.Add(service)
 }
 
-func (suite *PodTestSuite) TearDownSuite() {
-}
+func (suite *PodTestSuite) TearDownSuite() {}
 
 func TestPodSuite(t *testing.T) {
 	suite.Run(t, new(PodTestSuite))
@@ -64,7 +63,9 @@ func (suite *PodTestSuite) TestCreatePod() {
 	pod := entity.Pod{
 		Name:       tName,
 		Namespace:  namespace,
+		Labels:     map[string]string{},
 		Containers: containers,
+		Volumes:    []entity.PodVolume{},
 	}
 
 	bodyBytes, err := json.MarshalIndent(pod, "", "  ")