fix: cleanup routine order

supabase · Aug 12, 2022 · 68155b4 · 68155b4
1 parent 8cba961
commit 68155b4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 deletions.
diff --git a/internal/db/push/push.go b/internal/db/push/push.go
@@ -18,9 +18,6 @@ func Run(ctx context.Context, dryRun bool, username, password, database string,
 	if err := utils.LoadConfigFS(fsys); err != nil {
 		return err
 	}
-	if err := utils.AssertIsLinkedFS(fsys); err != nil {
-		return err
-	}
 
 	projectRef, err := utils.LoadProjectRef(fsys)
 	if err != nil {

diff --git a/internal/db/remote/changes/changes.go b/internal/db/remote/changes/changes.go
@@ -72,7 +72,15 @@ var (
 )
 
 func run(p utils.Program, ctx context.Context, username, password, database string, fsys afero.Fs) error {
-	defer cleanup()
+	projectRef, err := utils.LoadProjectRef(fsys)
+	if err != nil {
+		return err
+	}
+	conn, err := commit.ConnectRemotePostgres(ctx, username, password, database, projectRef)
+	if err != nil {
+		return err
+	}
+	defer conn.Close(context.Background())
 
 	_, _ = utils.Docker.NetworkCreate(
 		ctx,
@@ -85,16 +93,7 @@ func run(p utils.Program, ctx context.Context, username, password, database stri
 			},
 		},
 	)
-
-	projectRef, err := utils.LoadProjectRef(fsys)
-	if err != nil {
-		return err
-	}
-	conn, err := commit.ConnectRemotePostgres(ctx, username, password, database, projectRef)
-	if err != nil {
-		return err
-	}
-	defer conn.Close(context.Background())
+	defer cleanup()
 
 	p.Send(utils.StatusMsg("Pulling images..."))
 

diff --git a/internal/db/remote/commit/commit.go b/internal/db/remote/commit/commit.go
@@ -45,9 +45,6 @@ func Run(ctx context.Context, username, password, database string, fsys afero.Fs
 		if err := utils.LoadConfigFS(fsys); err != nil {
 			return err
 		}
-		if err := utils.AssertIsLinkedFS(fsys); err != nil {
-			return err
-		}
 	}
 
 	ctx, cancel := context.WithCancel(ctx)
@@ -85,7 +82,15 @@ const (
 )
 
 func run(p utils.Program, ctx context.Context, username, password, database string, fsys afero.Fs) error {
-	defer cleanup()
+	projectRef, err := utils.LoadProjectRef(fsys)
+	if err != nil {
+		return err
+	}
+	conn, err := ConnectRemotePostgres(ctx, username, password, database, projectRef)
+	if err != nil {
+		return err
+	}
+	defer conn.Close(context.Background())
 
 	_, _ = utils.Docker.NetworkCreate(
 		ctx,
@@ -98,16 +103,7 @@ func run(p utils.Program, ctx context.Context, username, password, database stri
 			},
 		},
 	)
-
-	projectRef, err := utils.LoadProjectRef(fsys)
-	if err != nil {
-		return err
-	}
-	conn, err := ConnectRemotePostgres(ctx, username, password, database, projectRef)
-	if err != nil {
-		return err
-	}
-	defer conn.Close(context.Background())
+	defer cleanup()
 
 	p.Send(utils.StatusMsg("Pulling images..."))