Determine existence before retrieving the permissions

Author: steve-hb

internal/provider/resource/directory_resource.go

@@ -3,9 +3,10 @@ package resource
 import (
 	"context"
 	"fmt"
-	"github.com/askrella/askrella-ssh-provider/internal/provider/ssh"
 	"os"
 
+	"github.com/askrella/askrella-ssh-provider/internal/provider/ssh"
+
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
@@ -150,7 +151,7 @@ func (r *DirectoryResource) Create(ctx context.Context, req resource.CreateReque
 
 	permissions := parsePermissions(plan.Permissions.ValueString())
 
-	if exists, _ := client.DirectoryExists(ctx, plan.Path.ValueString()); !exists {
+	if exists, _ := client.Exists(ctx, plan.Path.ValueString()); !exists {
 		err = client.CreateDirectory(ctx, plan.Path.ValueString(), os.FileMode(permissions))
 		if err != nil {
 			resp.Diagnostics.AddError(
@@ -227,6 +228,19 @@ func (r *DirectoryResource) Read(ctx context.Context, req resource.ReadRequest,
 	}
 	defer client.Close()
 
+	exists, err := client.Exists(ctx, state.Path.ValueString())
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Error determining directory existence",
+			fmt.Sprintf("Could not determine directory existence: %s", err),
+		)
+		return
+	}
+	if !exists {
+		resp.State.RemoveResource(ctx)
+		return
+	}
+
 	// Get directory mode
 	mode, err := client.GetFileMode(ctx, state.Path.ValueString())
 	if err != nil {
@@ -322,7 +336,7 @@ func (r *DirectoryResource) Update(ctx context.Context, req resource.UpdateReque
 
 	permissions := parsePermissions(plan.Permissions.ValueString())
 
-	if exists, _ := client.DirectoryExists(ctx, plan.Path.ValueString()); !exists {
+	if exists, _ := client.Exists(ctx, plan.Path.ValueString()); !exists {
 		err = client.CreateDirectory(ctx, plan.Path.ValueString(), os.FileMode(permissions))
 		if err != nil {
 			resp.Diagnostics.AddError(

internal/provider/resource/file_resource.go

@@ -154,6 +154,19 @@ func (r *FileResource) Create(ctx context.Context, req resource.CreateRequest, r
 	}
 	defer client.Close()
 
+	exists, err := client.Exists(ctx, plan.Path.ValueString())
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Error checking file existence",
+			fmt.Sprintf("Could not determine file existence: %s", err),
+		)
+		return
+	}
+	if exists {
+		resp.State.RemoveResource(ctx)
+		return
+	}
+
 	permissions := parsePermissions(plan.Permissions.ValueString())
 
 	err = client.CreateFile(ctx, plan.Path.ValueString(), plan.Content.ValueString(), os.FileMode(permissions))

internal/provider/resource/test/directory_resource_test.go

@@ -48,7 +48,7 @@ func TestAccDirectoryResource(t *testing.T) {
 					resource.TestCheckResourceAttr("ssh_directory.test", "ssh.username", "testuser"),
 					func(s *terraform.State) error {
 						// Verify directory exists
-						exists, err := client.DirectoryExists(context.Background(), testDirPath)
+						exists, err := client.Exists(context.Background(), testDirPath)
 						if err != nil {
 							return fmt.Errorf("failed to check directory: %v", err)
 						}
@@ -94,7 +94,7 @@ func TestAccDirectoryResource(t *testing.T) {
 					resource.TestCheckResourceAttr("ssh_directory.test", "ssh.username", "testuser"),
 					func(s *terraform.State) error {
 						// Verify directory exists
-						exists, err := client.DirectoryExists(context.Background(), testDirPath)
+						exists, err := client.Exists(context.Background(), testDirPath)
 						if err != nil {
 							return fmt.Errorf("failed to check directory: %v", err)
 						}

internal/provider/ssh/ssh_client.go

@@ -132,7 +132,7 @@ func (c *SSHClient) CreateFile(ctx context.Context, path string, content string,
 
 	// Ensure parent directory exists
 	parentDir := filepath.Dir(path)
-	if exists, _ := c.DirectoryExists(ctx, parentDir); !exists {
+	if exists, _ := c.Exists(ctx, parentDir); !exists {
 		if err := c.CreateDirectory(ctx, parentDir, 0755); err != nil {
 			return fmt.Errorf("failed to create parent directory: %w", err)
 		}
@@ -197,7 +197,7 @@ func (c *SSHClient) CreateDirectory(ctx context.Context, path string, permission
 	ctx, span := otel.Tracer("ssh-provider").Start(ctx, "CreateDirectory")
 	defer span.End()
 
-	if exists, _ := c.DirectoryExists(ctx, path); exists {
+	if exists, _ := c.Exists(ctx, path); exists {
 		return fmt.Errorf("directory %s already exists", path)
 	}
 
@@ -227,21 +227,21 @@ func (c *SSHClient) DeleteDirectory(ctx context.Context, path string) error {
 	return nil
 }
 
-// DirectoryExists checks if a directory exists and is a directory
-func (c *SSHClient) DirectoryExists(ctx context.Context, path string) (bool, error) {
-	ctx, span := otel.Tracer("ssh-provider").Start(ctx, "DirectoryExists")
+// Exists checks if a directory or file exists
+func (c *SSHClient) Exists(ctx context.Context, path string) (bool, error) {
+	ctx, span := otel.Tracer("ssh-provider").Start(ctx, "Exists")
 	defer span.End()
 
-	info, err := c.SftpClient.Stat(path)
+	_, err := c.SftpClient.Stat(path)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return false, nil
 		}
-		c.logger.WithContext(ctx).WithError(err).Error("Failed to check directory existence")
-		return false, fmt.Errorf("failed to check directory existence: %w", err)
+		c.logger.WithContext(ctx).WithError(err).Error("Failed to check existence")
+		return false, fmt.Errorf("failed to check existence: %w", err)
 	}
 
-	return info.IsDir(), nil
+	return true, nil
 }
 
 // GetFileMode gets the permissions of a file or directory

internal/provider/ssh/ssh_client_test.go

@@ -25,7 +25,7 @@ func TestDirectoryOperations(t *testing.T) {
 	directoryPath := path.Join(basePath, "dir/simple")
 
 	t.Log("Check directory does not exist before we've done anything")
-	exists, err := client.DirectoryExists(context.Background(), directoryPath)
+	exists, err := client.Exists(context.Background(), directoryPath)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(exists).To(BeFalse())
 
@@ -34,7 +34,7 @@ func TestDirectoryOperations(t *testing.T) {
 	Expect(err).ToNot(HaveOccurred())
 
 	t.Log("Check directory exists after creation")
-	exists, err = client.DirectoryExists(context.Background(), directoryPath)
+	exists, err = client.Exists(context.Background(), directoryPath)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(exists).To(BeTrue())
 
@@ -47,7 +47,7 @@ func TestDirectoryOperations(t *testing.T) {
 	Expect(err).ToNot(HaveOccurred())
 
 	t.Log("Check directory exists after deletion")
-	exists, err = client.DirectoryExists(context.Background(), directoryPath)
+	exists, err = client.Exists(context.Background(), directoryPath)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(exists).To(BeFalse())
 }