Check if dir exist before creation in uploadFile (#1297)

makhov · web-flow · commit 2069e1fe8629 · 2025-11-19T10:33:33.000+02:00
Signed-off-by: Alexey Makhov &lt;amakhov@mirantis.com&gt;
Signed-off-by: makhov &lt;amakhov@mirantis.com&gt;

# Conflicts:
#	internal/controller/k0smotron.io/k0smotroncluster_controller.go
diff --git a/internal/controller/infrastructure/ssh_provisioner.go b/internal/controller/infrastructure/ssh_provisioner.go
@@ -237,8 +237,10 @@ func (p *SSHProvisioner) uploadFile(client *rig.Client, file provisioner.File) e
 		return fmt.Errorf("failed to parse permissions: %w", err)
 	}
 
-	if err := fsys.MkdirAll(dir, fs.FileMode(perms)); err != nil {
-		return fmt.Errorf("failed to create directory: %w", err)
+	if _, err := fsys.Stat(dir); errors.Is(err, fs.ErrNotExist) {
+		if err := fsys.MkdirAll(dir, fs.FileMode(perms)); err != nil {
+			return fmt.Errorf("failed to create directory: %w", err)
+		}
 	}
 
 	destFile, err := fsys.OpenFile(file.Path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, fs.FileMode(perms))

Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,10 @@ func (p SSHProvisioner) uploadFile(client rig.Client, file provisioner.File) e`
`237`	`237`	`return fmt.Errorf("failed to parse permissions: %w", err)`
`238`	`238`	`}`
`239`	`239`
`240`		`- if err := fsys.MkdirAll(dir, fs.FileMode(perms)); err != nil {`
`241`		`- return fmt.Errorf("failed to create directory: %w", err)`
	`240`	`+ if _, err := fsys.Stat(dir); errors.Is(err, fs.ErrNotExist) {`
	`241`	`+ if err := fsys.MkdirAll(dir, fs.FileMode(perms)); err != nil {`
	`242`	`+ return fmt.Errorf("failed to create directory: %w", err)`
	`243`	`+ }`
`242`	`244`	`}`
`243`	`245`
`244`	`246`	`destFile, err := fsys.OpenFile(file.Path, os.O_CREATE\|os.O_TRUNC\|os.O_WRONLY, fs.FileMode(perms))`