Merge pull request #141 from linkernetworks/johnlin/podname-valitation

VX-199 pod k8s name validatation Former-commit-id: 75c2d718766d6a7c0c70dfa5a3bf8ba58ffbc0be [formerly 75c2d718766d6a7c0c70dfa5a3bf8ba58ffbc0be [formerly 2a60bc0]] Former-commit-id: 3e32c9202a7065f349ca00ea1b68e78c462a5a57 Former-commit-id: 91c52e3
linkernetworks · Jul 20, 2018 · e954f31 · e954f31
2 parents 938fa05 + 280790e
commit e954f31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 42 deletions.
diff --git a/src/entity/pod.go b/src/entity/pod.go
@@ -11,7 +11,7 @@ const (
 )
 
 type Container struct {
-	Name    string   `bson:"name" json:"name" validate:"required"`
+	Name    string   `bson:"name" json:"name" validate:"required,k8sname"`
 	Image   string   `bson:"image" json:"image" validate:"required"`
 	Command []string `bson:"command" json:"command" validate:"required,dive,required"`
 }
@@ -32,7 +32,7 @@ type PodVolume struct {
 
 type Pod struct {
 	ID         bson.ObjectId     `bson:"_id,omitempty" json:"id" validate:"-"`
-	Name       string            `bson:"name" json:"name" validate:"required"`
+	Name       string            `bson:"name" json:"name" validate:"required,k8sname"`
 	Namespace  string            `bson:"namespace" json:"namespace" validate:"required"`
 	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"`

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -2,7 +2,6 @@ package pod
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 
 	"github.com/linkernetworks/mongo"
@@ -18,27 +17,10 @@ import (
 
 const VolumeNamePrefix = "volume-"
 
-func checkNameValidation(name string) bool {
-	re := regexp.MustCompile(`[a-z0-9]([-a-z0-9]*[a-z0-9])`)
-	return re.MatchString(name)
-}
-
 func CheckPodParameter(sp *serviceprovider.Container, pod *entity.Pod) error {
 	session := sp.Mongo.NewSession()
 	defer session.Close()
 
-	//Check pod name validation
-	if !checkNameValidation(pod.Name) {
-		return fmt.Errorf("Pod Name: %s is invalid value", pod.Name)
-	}
-
-	//Check container name validation
-	for _, container := range pod.Containers {
-		if !checkNameValidation(container.Name) {
-			return fmt.Errorf("Container Name: %s is invalid value", container.Name)
-		}
-	}
-
 	//Check the volume
 	for _, v := range pod.Volumes {
 		count, err := session.Count(entity.VolumeCollectionName, bson.M{"name": v.Name})

diff --git a/src/pod/pod_test.go b/src/pod/pod_test.go
@@ -1,15 +1,16 @@
 package pod
 
 import (
+	"math/rand"
+	"testing"
+	"time"
+
 	"github.com/linkernetworks/vortex/src/config"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
 	"github.com/moby/moby/pkg/namesgenerator"
 	"github.com/stretchr/testify/suite"
 	"gopkg.in/mgo.v2/bson"
-	"math/rand"
-	"testing"
-	"time"
 )
 
 func init() {
@@ -70,25 +71,6 @@ func (suite *PodTestSuite) TestCheckPodParameterFail() {
 		caseName string
 		pod      *entity.Pod
 	}{
-		{
-			"InvalidPodName", &entity.Pod{
-				ID:   bson.NewObjectId(),
-				Name: "~!@#$%^&*()",
-			},
-		},
-		{
-			"InvalidContainerName", &entity.Pod{
-				ID:   bson.NewObjectId(),
-				Name: namesgenerator.GetRandomName(0),
-				Containers: []entity.Container{
-					{
-						Name:    "~!@#$%^&*()",
-						Image:   "busybox",
-						Command: []string{"sleep", "3600"},
-					},
-				},
-			},
-		},
 		{
 			"InvalidVolume", &entity.Pod{
 				ID:   bson.NewObjectId(),