Merge pull request #106 from netlify/add-use-asset-mgmt

Add feature to create file.Sum with original sha included for asset mgmt (again)

go/porcelain/deploy.go

@@ -12,6 +12,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -161,7 +162,7 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
 		}
 	}
 
-	files, err := walk(options.Dir, options.Observer)
+	files, err := walk(options.Dir, options.Observer, deploy.SiteCapabilities.AssetManagement)
 	if err != nil {
 		if options.Observer != nil {
 			options.Observer.OnFailedWalk()
@@ -451,7 +452,7 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
 	}
 }
 
-func walk(dir string, observer DeployObserver) (*deployFiles, error) {
+func walk(dir string, observer DeployObserver, useAssetManagement bool) (*deployFiles, error) {
 	files := newDeployFiles()
 
 	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
@@ -487,6 +488,13 @@ func walk(dir string, observer DeployObserver) (*deployFiles, error) {
 			}
 			file.Sum = hex.EncodeToString(s.Sum(nil))
 
+			if useAssetManagement {
+				originalSha := getAssetManagementSha(o)
+				if originalSha != "" {
+					file.Sum += ":" + string(originalSha)
+				}
+			}
+
 			files.Add(rel, file)
 
 			if observer != nil {
@@ -634,3 +642,19 @@ func createHeader(archive *zip.Writer, i os.FileInfo, runtime string) (io.Writer
 	}
 	return archive.Create(i.Name())
 }
+
+func getAssetManagementSha(file io.Reader) string {
+	// currently this only supports certain type of git lfs pointer files
+	// version [version]\noid sha256:[oid]\nsize [size]
+	data := make([]byte, 150)
+	if count, err := file.Read(data); err == nil {
+		r, _ := regexp.Compile(`^version \S+\noid sha256:(\S+)\n`)
+		res := r.FindSubmatch(data[:count])
+		if len(res) == 2 {
+			if originalSha := res[1]; len(originalSha) == 64 {
+				return string(originalSha)
+			}
+		}
+	}
+	return ""
+}

go/porcelain/deploy_test.go

@@ -0,0 +1,26 @@
+package porcelain
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestGetAssetManagementSha(t *testing.T) {
+	tests := []struct {
+		contents string
+		length   int
+	}{
+		{"Not a pointer file", 0},
+		{"version https://git-lfs.github.com/spec/v1\n" +
+			"oid sha256:7e56e498ccb4cbb9c672e1aed6710fb91b2fd314394a666c11c33b2059ea3d71\n" +
+			"size 1743570", 64},
+	}
+
+	for _, test := range tests {
+		file := strings.NewReader(test.contents)
+		out := getAssetManagementSha(file)
+		if len(out) != test.length {
+			t.Fatalf("expected `%d`, got `%d`", test.length, len(out))
+		}
+	}
+}

swagger.yml

@@ -1566,6 +1566,11 @@ definitions:
           type: boolean
         review_url:
           type: string
+        site_capabilities:
+          type: object
+          properties:
+            asset_management:
+              type: boolean
     deployFiles:
       type: object
       properties: