Added defaultpath for volume mounts (#207)

nds-org · Jul 26, 2017 · efabd4f · efabd4f
1 parent 1d31619
commit efabd4f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/apiserver/cmd/server/server.go b/apiserver/cmd/server/server.go
@@ -1558,8 +1558,8 @@ func (s *Server) PostStack(w rest.ResponseWriter, r *rest.Request) {
 					if stackService.VolumeMounts == nil {
 						stackService.VolumeMounts = map[string]string{}
 					}
-					volPath := fmt.Sprintf("AppData/%s", s.getAppDataDir(stackService.Id))
 
+					volPath := s.getVolPath(&mount, stackService.Id)
 					stackService.VolumeMounts[volPath] = mount.MountPath
 				}
 			}
@@ -1710,7 +1710,7 @@ func (s *Server) PutStack(w rest.ResponseWriter, r *rest.Request) {
 					}
 
 					if len(fromPath) == 0 {
-						volPath := fmt.Sprintf("AppData/%s", s.getAppDataDir(stackService.Id))
+						volPath := s.getVolPath(&mount, stackService.Id)
 						stackService.VolumeMounts[volPath] = mount.MountPath
 					}
 				}
@@ -1723,7 +1723,7 @@ func (s *Server) PutStack(w rest.ResponseWriter, r *rest.Request) {
 
 				if found == 0 {
 					// Create a new temporary folder
-					volPath := fmt.Sprintf("AppData/%s", s.getAppDataDir(stackService.Id))
+					volPath := s.getVolPath(&mount, stackService.Id)
 					stackService.VolumeMounts[volPath] = mount.MountPath
 				}
 			}
@@ -3184,3 +3184,12 @@ func (s *Server) getAccountByEmail(email string) *api.Account {
 	}
 	return nil
 }
+
+// NDS-970
+func (s *Server) getVolPath(mount *api.VolumeMount, ssid string) string {
+	if len(mount.DefaultPath) == 0 {
+		return fmt.Sprintf("AppData/%s", s.getAppDataDir(ssid))
+	} else {
+		return mount.DefaultPath
+	}
+}
diff --git a/apiserver/pkg/types/types.go b/apiserver/pkg/types/types.go
@@ -79,9 +79,10 @@ type Port struct {
 }
 
 type VolumeMount struct {
-	Type      MountType `json:"type"`
-	MountPath string    `json:"mountPath"`
-	Default   bool      `json:"default"`
+	Type        MountType `json:"type"`
+	MountPath   string    `json:"mountPath"`
+	Default     bool      `json:"default"`
+	DefaultPath string    `json:"defaultPath"`
 }
 
 type MountType string