fix: clean manifest path in remote deploy to fix regression (#4195)

---------

Signed-off-by: Andrea Falzetti <andrea@okteto.com>

cmd/build/v1/build.go

@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/afero"
 )
 
-// OktetoBuilder It is a wrapper of basic.Builder to build an image specificied by a Dockerfile. a.k.a. Builder v1
+// OktetoBuilder It is a wrapper of basic.Builder to build an image specified by a Dockerfile. a.k.a. Builder v1
 // It mainly extends the basic.Builder with the ability to expand the image tag with the environment variables and
 // printing the corresponding output when the build finishes.
 type OktetoBuilder struct {

cmd/deploy/remote.go

@@ -317,7 +317,7 @@ func (rd *remoteDeployCommand) createDockerfile(tmpDir string, opts *Options) (s
 	// build the services) so we would create a remote executor without certain files
 	// necessary for the later deployment which would cause an error when deploying
 	// remotely due to the lack of these files.
-	if err := remote.CreateDockerignoreFileWithFilesystem(cwd, tmpDir, opts.ManifestPathFlag, rd.fs); err != nil {
+	if err := remote.CreateDockerignoreFileWithFilesystem(cwd, tmpDir, filesystem.CleanManifestPath(opts.ManifestPathFlag), rd.fs); err != nil {
 		return "", err
 	}
 
@@ -339,15 +339,7 @@ func getDeployFlags(opts *Options) ([]string, error) {
 	}
 
 	if opts.ManifestPathFlag != "" {
-		lastFolder := filepath.Base(filepath.Dir(opts.ManifestPathFlag))
-		if lastFolder == ".okteto" {
-			path := filepath.Clean(opts.ManifestPathFlag)
-			parts := strings.Split(path, string(filepath.Separator))
-
-			deployFlags = append(deployFlags, fmt.Sprintf("--file %s", filepath.Join(parts[len(parts)-2:]...)))
-		} else {
-			deployFlags = append(deployFlags, fmt.Sprintf("--file %s", filepath.Base(opts.ManifestPathFlag)))
-		}
+		deployFlags = append(deployFlags, fmt.Sprintf("--file %s", filesystem.CleanManifestPath(opts.ManifestPathFlag)))
 	}
 
 	if len(opts.Variables) > 0 {

cmd/deploy/remote_test.go

@@ -724,5 +724,4 @@ func TestGetOriginalCWD(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, expected, result)
 	})
-
 }

cmd/destroy/remote.go

@@ -305,7 +305,7 @@ func (rd *remoteDestroyCommand) createDockerfile(tempDir string, opts *Options)
 		return "", err
 	}
 
-	if err = remote.CreateDockerignoreFileWithFilesystem(cwd, tempDir, opts.ManifestPathFlag, rd.fs); err != nil {
+	if err = remote.CreateDockerignoreFileWithFilesystem(cwd, tempDir, filesystem.CleanManifestPath(opts.ManifestPathFlag), rd.fs); err != nil {
 		return "", err
 	}
 
@@ -345,15 +345,7 @@ func getDestroyFlags(opts *Options) []string {
 	}
 
 	if opts.ManifestPathFlag != "" {
-		lastFolder := filepath.Base(filepath.Dir(opts.ManifestPathFlag))
-		if lastFolder == ".okteto" {
-			path := filepath.Clean(opts.ManifestPathFlag)
-			parts := strings.Split(path, string(filepath.Separator))
-
-			deployFlags = append(deployFlags, fmt.Sprintf("--file %s", filepath.Join(parts[len(parts)-2:]...)))
-		} else {
-			deployFlags = append(deployFlags, fmt.Sprintf("--file %s", filepath.Base(opts.ManifestPathFlag)))
-		}
+		deployFlags = append(deployFlags, fmt.Sprintf("--file %s", filesystem.CleanManifestPath(opts.ManifestPathFlag)))
 	}
 
 	if opts.DestroyVolumes {

pkg/filesystem/manifest.go

@@ -0,0 +1,32 @@
+// Copyright 2024 The Okteto Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package filesystem
+
+import (
+	"path/filepath"
+	"strings"
+)
+
+// CleanManifestPath removes the path to the manifest file, in case the command was executed from a parent or child folder
+func CleanManifestPath(manifestPath string) string {
+	lastFolder := filepath.Base(filepath.Dir(manifestPath))
+	if lastFolder == ".okteto" {
+		path := filepath.Clean(manifestPath)
+		parts := strings.Split(path, string(filepath.Separator))
+
+		return filepath.Join(parts[len(parts)-2:]...)
+	} else {
+		return filepath.Base(manifestPath)
+	}
+}

pkg/filesystem/manifest_test.go

@@ -0,0 +1,57 @@
+// Copyright 2024 The Okteto Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package filesystem
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_cleanManifestPath(t *testing.T) {
+	var tests = []struct {
+		name     string
+		manifest string
+		expected string
+	}{
+		{
+			name:     "empty manifest",
+			manifest: "",
+			expected: ".",
+		},
+		{
+			name:     "absolute path to manifest file",
+			manifest: "/path/to/service/okteto.yml",
+			expected: "okteto.yml",
+		},
+		{
+			name:     "relative path to manifest file",
+			manifest: "./service/okteto.yml",
+			expected: "okteto.yml",
+		},
+		{
+			name:     "manifest within .okteto",
+			manifest: "/path/to/service/.okteto/okteto.yml",
+			expected: filepath.Clean(".okteto/okteto.yml"),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := CleanManifestPath(tt.manifest)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}