chore: stop creating directory when creating workspace (#16)

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

pkg/client/client.go

@@ -20,7 +20,7 @@ const (
 
 type workspaceFactory interface {
 	New(string) (workspaceClient, error)
-	Create() (string, error)
+	Create() string
 	Rm(context.Context, string) error
 }
 
@@ -102,11 +102,7 @@ func (c *Client) Create(ctx context.Context, provider string, fromWorkspaces ...
 		return "", err
 	}
 
-	id, err := factory.Create()
-	if err != nil {
-		return "", err
-	}
-
+	id := factory.Create()
 	destClient, err := factory.New(id)
 	if err != nil {
 		return "", err

pkg/client/client_test.go

@@ -41,12 +41,12 @@ func TestCreateAndRmDirectoryProvider(t *testing.T) {
 		t.Errorf("unexpected id: %s", id)
 	}
 
-	// The directory should exist
-	if _, err = os.Stat(strings.TrimPrefix(id, DirectoryProvider+"://")); err != nil {
+	// The directory should not exist yet
+	if _, err := os.Stat(strings.TrimPrefix(id, DirectoryProvider+"://")); !errors.Is(err, os.ErrNotExist) {
 		t.Errorf("unexpected error when checking if directory exists: %v", err)
 	}
 
-	if err = c.Rm(context.Background(), id); err != nil {
+	if err := c.Rm(context.Background(), id); err != nil {
 		t.Errorf("unexpected error when removing workspace: %v", err)
 	}
 

pkg/client/directory.go

@@ -77,9 +77,9 @@ func (d *directoryProvider) New(id string) (workspaceClient, error) {
 	}, nil
 }
 
-func (d *directoryProvider) Create() (string, error) {
+func (d *directoryProvider) Create() string {
 	dir := uuid.NewString()
-	return DirectoryProvider + "://" + filepath.Join(d.dataHome, dir), os.MkdirAll(filepath.Join(d.dataHome, dir), 0o755)
+	return DirectoryProvider + "://" + filepath.Join(d.dataHome, dir)
 }
 
 func (d *directoryProvider) Rm(ctx context.Context, id string) error {

pkg/client/directory_test.go

@@ -24,19 +24,14 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	var err error
 	directoryFactory = newDirectory("")
-	directoryTestingID, err = directoryFactory.Create()
-	if err != nil {
-		panic(err)
-	}
-
+	directoryTestingID = directoryFactory.Create()
 	dirPrv, _ = directoryFactory.New(directoryTestingID)
 
 	if !skipS3Tests {
 		s3Factory, _ = newS3(context.Background(), os.Getenv("WORKSPACE_PROVIDER_S3_BUCKET"), os.Getenv("WORKSPACE_PROVIDER_S3_BASE_ENDPOINT"))
 		// This won't ever error because it doesn't create anything.
-		s3TestingID, _ = s3Factory.Create()
+		s3TestingID = s3Factory.Create()
 
 		s3Client, _ := s3Factory.New(s3TestingID)
 		s3Prv = s3Client.(*s3Provider)
@@ -63,18 +58,14 @@ func TestMain(m *testing.M) {
 }
 
 func TestCreateAndRm(t *testing.T) {
-	id, err := directoryFactory.Create()
-	if err != nil {
-		t.Errorf("error creating workspace: %v", err)
-	}
-
+	id := directoryFactory.Create()
 	if !strings.HasPrefix(id, DirectoryProvider+"://") {
 		t.Errorf("unexpected id: %s", id)
 	}
 
-	// The directory should exist
-	if _, err := os.Stat(strings.TrimPrefix(id, DirectoryProvider+"://")); err != nil {
-		t.Errorf("unexpcted error when checking if directory exists: %v", err)
+	// The directory should not exist yet
+	if _, err := os.Stat(strings.TrimPrefix(id, DirectoryProvider+"://")); !errors.Is(err, os.ErrNotExist) {
+		t.Errorf("unexpected error when checking if directory exists: %v", err)
 	}
 
 	if err := directoryFactory.Rm(context.Background(), id); err != nil {
@@ -88,13 +79,10 @@ func TestCreateAndRm(t *testing.T) {
 }
 
 func TestWriteFileWorkspaceDNE(t *testing.T) {
-	id, err := directoryFactory.Create()
-	if err != nil {
-		t.Fatalf("error creating workspace: %v", err)
-	}
+	id := directoryFactory.Create()
 
 	// Delete the directory
-	if err = os.RemoveAll(strings.TrimPrefix(id, DirectoryProvider+"://")); err != nil {
+	if err := os.RemoveAll(strings.TrimPrefix(id, DirectoryProvider+"://")); err != nil {
 		t.Errorf("unexpected error when removing workspace: %v", err)
 	}
 
@@ -113,12 +101,9 @@ func TestWriteFileWorkspaceDNE(t *testing.T) {
 }
 
 func TestEnsureCannotCreateUnsafeWorkspace(t *testing.T) {
-	id, err := directoryFactory.Create()
-	if err != nil {
-		t.Fatalf("error creating workspace: %v", err)
-	}
+	id := directoryFactory.Create()
 
-	_, err = directoryFactory.New(id + "/..")
+	_, err := directoryFactory.New(id + "/..")
 	if err == nil {
 		t.Fatalf("expected error when creating directory outside of workspace")
 	}

pkg/client/s3.go

@@ -62,8 +62,8 @@ func (s *s3Provider) New(id string) (workspaceClient, error) {
 	}, nil
 }
 
-func (s *s3Provider) Create() (string, error) {
-	return S3Provider + "://" + filepath.Join(s.bucket, uuid.NewString()), nil
+func (s *s3Provider) Create() string {
+	return S3Provider + "://" + filepath.Join(s.bucket, uuid.NewString())
 }
 
 func (s *s3Provider) Rm(ctx context.Context, id string) error {

pkg/client/s3_test.go

@@ -22,11 +22,7 @@ func TestCreateAndRmS3(t *testing.T) {
 		t.Skip("Skipping S3 tests")
 	}
 
-	id, err := s3Factory.Create()
-	if err != nil {
-		t.Errorf("error creating workspace: %v", err)
-	}
-
+	id := s3Factory.Create()
 	if !strings.HasPrefix(id, S3Provider+"://") {
 		t.Errorf("unexpected id: %s", id)
 	}