feat: support for edge-redirects manifests

Author: paulo

go/porcelain/deploy.go

@@ -43,6 +43,7 @@ const (
 	lfsVersionString = "version https://git-lfs.github.com/spec/v1"
 
 	edgeFunctionsInternalPath = ".netlify/internal/edge-functions/"
+	edgeRedirectsInternalPath = ".netlify/internal/edge-redirects/"
 )
 
 var installDirs = []string{"node_modules/", "bower_components/"}
@@ -78,6 +79,7 @@ type DeployOptions struct {
 	Dir               string
 	FunctionsDir      string
 	EdgeFunctionsDir  string
+	EdgeRedirectsDir  string
 	BuildDir          string
 	LargeMediaEnabled bool
 
@@ -215,7 +217,17 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
 	}
 
 	if options.EdgeFunctionsDir != "" {
-		err = addEdgeFunctionsToDeployFiles(options.EdgeFunctionsDir, files, options.Observer)
+		err = addInternalFilesToDeploy(options.EdgeFunctionsDir, edgeFunctionsInternalPath, files, options.Observer)
+		if err != nil {
+			if options.Observer != nil {
+				options.Observer.OnFailedWalk()
+			}
+			return nil, err
+		}
+	}
+
+	if options.EdgeRedirectsDir != "" {
+		err = addInternalFilesToDeploy(options.EdgeRedirectsDir, edgeRedirectsInternalPath, files, options.Observer)
 		if err != nil {
 			if options.Observer != nil {
 				options.Observer.OnFailedWalk()
@@ -631,7 +643,7 @@ func walk(dir string, observer DeployObserver, useLargeMedia, ignoreInstallDirs
 	return files, err
 }
 
-func addEdgeFunctionsToDeployFiles(dir string, files *deployFiles, observer DeployObserver) error {
+func addInternalFilesToDeploy(dir, internalPath string, files *deployFiles, observer DeployObserver) error {
 	return filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -642,7 +654,7 @@ func addEdgeFunctionsToDeployFiles(dir string, files *deployFiles, observer Depl
 			if err != nil {
 				return err
 			}
-			rel := edgeFunctionsInternalPath + forceSlashSeparators(osRel)
+			rel := internalPath + forceSlashSeparators(osRel)
 
 			file, err := createFileBundle(rel, path)
 			if err != nil {

go/porcelain/deploy_test.go

@@ -186,17 +186,15 @@ func TestWalk_EdgeFunctions(t *testing.T) {
 	err = ioutil.WriteFile(filepath.Join(edgeFunctionsDir, "123456789.js"), []byte{}, 0644)
 	require.Nil(t, err)
 
-	err = addEdgeFunctionsToDeployFiles(edgeFunctionsDir, files, mockObserver{})
+	err = addInternalFilesToDeploy(edgeFunctionsDir, edgeFunctionsInternalPath, files, mockObserver{})
 	require.Nil(t, err)
 
 	assert.NotNil(t, files.Files[".netlify/internal/edge-functions/manifest.json"])
 	assert.NotNil(t, files.Files[".netlify/internal/edge-functions/123456789.js"])
 }
 
 func TestWalk_PublishedFilesAndEdgeFunctions(t *testing.T) {
-	publishDir, err := ioutil.TempDir("", "publish")
-	require.Nil(t, err)
-	defer os.RemoveAll(publishDir)
+	files := setupPublishedAssets(t)
 
 	netlifyDir, err := ioutil.TempDir("", ".netlify")
 	require.Nil(t, err)
@@ -206,28 +204,59 @@ func TestWalk_PublishedFilesAndEdgeFunctions(t *testing.T) {
 	require.Nil(t, err)
 	defer os.RemoveAll(edgeFunctionsDir)
 
-	err = os.Mkdir(filepath.Join(publishDir, "assets"), os.ModePerm)
+	err = ioutil.WriteFile(filepath.Join(edgeFunctionsDir, "manifest.json"), []byte{}, 0644)
 	require.Nil(t, err)
-	err = ioutil.WriteFile(filepath.Join(publishDir, "assets", "styles.css"), []byte{}, 0644)
+	err = ioutil.WriteFile(filepath.Join(edgeFunctionsDir, "123456789.js"), []byte{}, 0644)
 	require.Nil(t, err)
-	err = ioutil.WriteFile(filepath.Join(publishDir, "index.html"), []byte{}, 0644)
+
+	err = addInternalFilesToDeploy(edgeFunctionsDir, edgeFunctionsInternalPath, files, mockObserver{})
 	require.Nil(t, err)
 
-	err = ioutil.WriteFile(filepath.Join(edgeFunctionsDir, "manifest.json"), []byte{}, 0644)
+	assert.NotNil(t, files.Files["assets/styles.css"])
+	assert.NotNil(t, files.Files["index.html"])
+	assert.NotNil(t, files.Files[".netlify/internal/edge-functions/manifest.json"])
+	assert.NotNil(t, files.Files[".netlify/internal/edge-functions/123456789.js"])
+}
+
+func TestWalk_PublishedFilesAndEdgeRedirects(t *testing.T) {
+	files := setupPublishedAssets(t)
+
+	netlifyDir, err := ioutil.TempDir("", ".netlify")
 	require.Nil(t, err)
-	err = ioutil.WriteFile(filepath.Join(edgeFunctionsDir, "123456789.js"), []byte{}, 0644)
+	defer os.RemoveAll(netlifyDir)
+
+	edgeRedirectsDir, err := ioutil.TempDir(netlifyDir, "edge-redirects-dist")
 	require.Nil(t, err)
+	defer os.RemoveAll(edgeRedirectsDir)
 
-	files, err := walk(publishDir, mockObserver{}, false, false)
+	err = ioutil.WriteFile(filepath.Join(edgeRedirectsDir, "manifest.json"), []byte{}, 0644)
 	require.Nil(t, err)
 
-	err = addEdgeFunctionsToDeployFiles(edgeFunctionsDir, files, mockObserver{})
+	err = addInternalFilesToDeploy(edgeRedirectsDir, edgeRedirectsInternalPath, 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/edge-functions/manifest.json"])
-	assert.NotNil(t, files.Files[".netlify/internal/edge-functions/123456789.js"])
+	assert.NotNil(t, files.Files[".netlify/internal/edge-redirects/manifest.json"])
+}
+
+func setupPublishedAssets(t *testing.T) *deployFiles {
+	publishDir, err := ioutil.TempDir("", "publish")
+	require.Nil(t, err)
+
+	t.Cleanup(func() { os.RemoveAll(publishDir) })
+
+	err = os.Mkdir(filepath.Join(publishDir, "assets"), os.ModePerm)
+	require.Nil(t, err)
+	err = ioutil.WriteFile(filepath.Join(publishDir, "assets", "styles.css"), []byte{}, 0644)
+	require.Nil(t, err)
+	err = ioutil.WriteFile(filepath.Join(publishDir, "index.html"), []byte{}, 0644)
+	require.Nil(t, err)
+
+	files, err := walk(publishDir, mockObserver{}, false, false)
+	require.Nil(t, err)
+
+	return files
 }
 
 func TestUploadFiles_Cancelation(t *testing.T) {