Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions go/porcelain/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ const (

lfsVersionString = "version https://git-lfs.github.com/spec/v1"

edgeFunctionsInternalPath = ".netlify/internal/edge-functions/"
edgeRedirectsInternalPath = ".netlify/deploy-config/"
edgeFunctionsInternalPath = ".netlify/internal/edge-functions/"
edgeRedirectsInternalPath = ".netlify/deploy-config/"
dbMigrationsInternalPath = ".netlify/internal/db/migrations/"
)

var installDirs = []string{"node_modules/", "bower_components/"}
Expand Down Expand Up @@ -89,6 +90,7 @@ type DeployOptions struct {
FunctionsDir string
EdgeFunctionsDir string
EdgeRedirectsDir string
DbMigrationsDir string
BuildDir string
LargeMediaEnabled bool
Environment []*models.DeployEnvironmentVariable
Expand Down Expand Up @@ -255,6 +257,16 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
}
}

if options.DbMigrationsDir != "" {
err = addInternalFilesToDeploy(options.DbMigrationsDir, dbMigrationsInternalPath, files, options.Observer)
if err != nil {
if options.Observer != nil {
options.Observer.OnFailedWalk()
}
return nil, err
}
}

options.files = files

functions, schedules, functionsConfig, err := bundle(ctx, options.FunctionsDir, options.Observer)
Expand Down
48 changes: 48 additions & 0 deletions go/porcelain/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,54 @@ func TestWalk_PublishedFilesAndEdgeRedirects(t *testing.T) {
assert.NotNil(t, files.Files[".netlify/deploy-config/redirects.json"])
}

func TestWalk_DbMigrations(t *testing.T) {
files := newDeployFiles()

netlifyDir, err := ioutil.TempDir("", ".netlify")
require.Nil(t, err)
defer os.RemoveAll(netlifyDir)

dbMigrationsDir, err := ioutil.TempDir(netlifyDir, "db-migrations-dist")
require.Nil(t, err)
defer os.RemoveAll(dbMigrationsDir)

migrationDir := filepath.Join(dbMigrationsDir, "1700000000_create-users")
err = os.Mkdir(migrationDir, os.ModePerm)
require.Nil(t, err)
err = ioutil.WriteFile(filepath.Join(migrationDir, "migration.sql"), []byte("CREATE TABLE users (id INT);"), 0644)
require.Nil(t, err)

err = addInternalFilesToDeploy(dbMigrationsDir, dbMigrationsInternalPath, files, mockObserver{})
require.Nil(t, err)

assert.NotNil(t, files.Files[".netlify/internal/db/migrations/1700000000_create-users/migration.sql"])
}

func TestWalk_PublishedFilesAndDbMigrations(t *testing.T) {
files := setupPublishedAssets(t)

netlifyDir, err := ioutil.TempDir("", ".netlify")
require.Nil(t, err)
defer os.RemoveAll(netlifyDir)

dbMigrationsDir, err := ioutil.TempDir(netlifyDir, "db-migrations-dist")
require.Nil(t, err)
defer os.RemoveAll(dbMigrationsDir)

migrationDir := filepath.Join(dbMigrationsDir, "1700000000_create-users")
err = os.Mkdir(migrationDir, os.ModePerm)
require.Nil(t, err)
err = ioutil.WriteFile(filepath.Join(migrationDir, "migration.sql"), []byte("CREATE TABLE users (id INT);"), 0644)
require.Nil(t, err)

err = addInternalFilesToDeploy(dbMigrationsDir, dbMigrationsInternalPath, files, mockObserver{})
require.Nil(t, err)

assert.NotNil(t, files.Files["assets/styles.css"])
assert.NotNil(t, files.Files["index.html"])
assert.NotNil(t, files.Files[".netlify/internal/db/migrations/1700000000_create-users/migration.sql"])
}

func setupPublishedAssets(t *testing.T) *deployFiles {
publishDir, err := ioutil.TempDir("", "publish")
require.Nil(t, err)
Expand Down
Loading