fix test containers cleanup

Signed-off-by: bcmmbaga <[email protected]>

Author: bcmmbaga

management/server/store/store.go

@@ -415,10 +415,12 @@ func getSqlStoreEngine(ctx context.Context, store *SqlStore, kind types.Engine)
 }
 
 func newReusedPostgresStore(ctx context.Context, store *SqlStore, kind types.Engine) (*SqlStore, func(), error) {
+	var containerCleanup, dbCleanup func()
+
 	dsn, ok := os.LookupEnv(postgresDsnEnv)
 	if !ok || dsn == "" {
 		var err error
-		_, dsn, err = testutil.CreatePostgresTestContainer()
+		containerCleanup, dsn, err = testutil.CreatePostgresTestContainer()
 		if err != nil {
 			return nil, nil, err
 		}
@@ -433,24 +435,33 @@ func newReusedPostgresStore(ctx context.Context, store *SqlStore, kind types.Eng
 		return nil, nil, fmt.Errorf("failed to open postgres connection: %v", err)
 	}
 
-	dsn, cleanup, err := createRandomDB(dsn, db, kind)
+	dsn, dbCleanup, err = createRandomDB(dsn, db, kind)
 	if err != nil {
-		return nil, cleanup, err
+		return nil, nil, err
 	}
 
 	store, err = NewPostgresqlStoreFromSqlStore(ctx, store, dsn, nil)
 	if err != nil {
-		return nil, cleanup, err
+		return nil, nil, err
+	}
+
+	cleanup := func() {
+		if containerCleanup != nil {
+			containerCleanup()
+		}
+		dbCleanup()
 	}
 
 	return store, cleanup, nil
 }
 
 func newReusedMysqlStore(ctx context.Context, store *SqlStore, kind types.Engine) (*SqlStore, func(), error) {
+	var containerCleanup, dbCleanup func()
+
 	dsn, ok := os.LookupEnv(mysqlDsnEnv)
 	if !ok || dsn == "" {
 		var err error
-		_, dsn, err = testutil.CreateMysqlTestContainer()
+		containerCleanup, dsn, err = testutil.CreateMysqlTestContainer()
 		if err != nil {
 			return nil, nil, err
 		}
@@ -465,16 +476,23 @@ func newReusedMysqlStore(ctx context.Context, store *SqlStore, kind types.Engine
 		return nil, nil, fmt.Errorf("failed to open mysql connection: %v", err)
 	}
 
-	dsn, cleanup, err := createRandomDB(dsn, db, kind)
+	dsn, dbCleanup, err = createRandomDB(dsn, db, kind)
 	if err != nil {
-		return nil, cleanup, err
+		return nil, nil, err
 	}
 
 	store, err = NewMysqlStoreFromSqlStore(ctx, store, dsn, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
+	cleanup := func() {
+		if containerCleanup != nil {
+			containerCleanup()
+		}
+		dbCleanup()
+	}
+
 	return store, cleanup, nil
 }