Fix non named error (#1536)

* Creates services before deployments/stfs Signed-off-by: Javier López Barba <javier@okteto.com> * Fix tests Signed-off-by: Javier López Barba <javier@okteto.com>
okteto · May 17, 2021 · 6cc0e9b · 6cc0e9b
1 parent 14edbee
commit 6cc0e9b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/pkg/model/stack_serializer.go b/pkg/model/stack_serializer.go
@@ -390,7 +390,7 @@ func (serviceRaw *ServiceRaw) ToService(svcName string, stack *Stack) (*Service,
 
 	svc.Volumes, svc.VolumeMounts = splitVolumesByType(serviceRaw.Volumes, stack)
 	for _, volume := range svc.VolumeMounts {
-		if volume.LocalPath != "" && !(!FileExists(volume.LocalPath) || !strings.HasPrefix(volume.LocalPath, "/")) {
+		if !isNamedVolumeDeclared(volume) {
 			return nil, fmt.Errorf("Named volume '%s' is used in service '%s' but no declaration was found in the volumes section.", volume.ToString(), svcName)
 		}
 	}
@@ -402,6 +402,21 @@ func (serviceRaw *ServiceRaw) ToService(svcName string, stack *Stack) (*Service,
 	return svc, nil
 }
 
+func isNamedVolumeDeclared(volume StackVolume) bool {
+	if volume.LocalPath != "" {
+		if strings.HasPrefix(volume.LocalPath, "/") {
+			return true
+		}
+		if strings.HasPrefix(volume.LocalPath, "./") {
+			return true
+		}
+		if FileExists(volume.LocalPath) {
+			return true
+		}
+	}
+	return false
+}
+
 func splitVolumesByType(volumes []StackVolume, s *Stack) ([]StackVolume, []StackVolume) {
 	topLevelVolumes := make([]StackVolume, 0)
 	mountedVolumes := make([]StackVolume, 0)

diff --git a/pkg/model/stack_serializer_test.go b/pkg/model/stack_serializer_test.go
@@ -539,6 +539,12 @@ func Test_validateVolumesUnmarshalling(t *testing.T) {
 			create:        false,
 			expectedError: false,
 		},
+		{
+			name:          "absolute path",
+			manifest:      []byte("services:\n  app:\n    image: okteto/vote:1\n    volumes:\n      - /var/run/docker.sock:/var/run/docker.sock"),
+			create:        false,
+			expectedError: false,
+		},
 		{
 			name:          "volume-relative-path-found",
 			manifest:      []byte("services:\n  app:\n    volumes: \n    - test-volume-relative-path-found:/var/lib/redpanda/data\n    image: okteto/vote:1\n"),
@@ -549,7 +555,7 @@ func Test_validateVolumesUnmarshalling(t *testing.T) {
 			name:          "volume-relative-path-not-found",
 			manifest:      []byte("services:\n  app:\n    volumes: \n    - test:/var/lib/redpanda/data\n    image: okteto/vote:1\n"),
 			create:        false,
-			expectedError: false,
+			expectedError: true,
 		},
 		{
 			name:          "pv",