update check pod parameter

linkernetworks · Jul 11, 2018 · 1499f15 · 1499f15
1 parent 4ee5ab0
commit 1499f15
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 41 deletions.
diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -16,9 +16,27 @@ 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})
@@ -61,11 +79,6 @@ func generateVolume(pod *entity.Pod, session *mongo.Session) ([]corev1.Volume, [
 	return volumes, volumeMounts, nil
 }
 
-func checkName(name string) bool {
-	re := regexp.MustCompile(`[a-z0-9]([-a-z0-9]*[a-z0-9])`)
-	return re.MatchString(name)
-}
-
 func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 
 	session := sp.Mongo.NewSession()
@@ -78,9 +91,6 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 
 	var containers []corev1.Container
 	for _, container := range pod.Containers {
-		if !checkName(container.Name) {
-			return fmt.Errorf("Container Name: %s is invalid value", container.Name)
-		}
 		containers = append(containers, corev1.Container{
 			Name:         container.Name,
 			Image:        container.Image,
@@ -89,9 +99,6 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 		})
 	}
 
-	if !checkName(pod.Name) {
-		return fmt.Errorf("Pod Name: %s is invalid value", pod.Name)
-	}
 	p := corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: pod.Name,

diff --git a/src/pod/pod_test.go b/src/pod/pod_test.go
@@ -36,7 +36,8 @@ func TestPodSuite(t *testing.T) {
 func (suite *PodTestSuite) TestCheckPodParameter() {
 	volumeName := namesgenerator.GetRandomName(0)
 	pod := &entity.Pod{
-		ID: bson.NewObjectId(),
+		ID:   bson.NewObjectId(),
+		Name: namesgenerator.GetRandomName(0),
 		Volumes: []entity.PodVolume{
 			{Name: volumeName},
 		},
@@ -62,6 +63,25 @@ 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(),
@@ -147,42 +167,16 @@ func (suite *PodTestSuite) TestCreatePod() {
 }
 
 func (suite *PodTestSuite) TestCreatePodFail() {
-	podName := "~!@#$%^&*()"
-	pod := &entity.Pod{
-		ID:   bson.NewObjectId(),
-		Name: podName,
-	}
-
-	err := CreatePod(suite.sp, pod)
-	suite.Error(err)
-
 	containers := []entity.Container{
-		{
-			Name:    "~!@#$%^&*()",
-			Image:   "busybox",
-			Command: []string{"sleep", "3600"},
-		},
-	}
-	podName = namesgenerator.GetRandomName(0)
-	pod = &entity.Pod{
-		ID:         bson.NewObjectId(),
-		Name:       podName,
-		Containers: containers,
-	}
-
-	err = CreatePod(suite.sp, pod)
-	suite.Error(err)
-
-	containers = []entity.Container{
 		{
 			Name:    namesgenerator.GetRandomName(0),
 			Image:   "busybox",
 			Command: []string{"sleep", "3600"},
 		},
 	}
 
-	podName = namesgenerator.GetRandomName(0)
-	pod = &entity.Pod{
+	podName := namesgenerator.GetRandomName(0)
+	pod := &entity.Pod{
 		ID:         bson.NewObjectId(),
 		Name:       podName,
 		Containers: containers,
@@ -191,6 +185,6 @@ func (suite *PodTestSuite) TestCreatePodFail() {
 		},
 	}
 
-	err = CreatePod(suite.sp, pod)
+	err := CreatePod(suite.sp, pod)
 	suite.Error(err)
 }