Fix sync

pkg/skaffold/sync/sync.go

@@ -23,6 +23,8 @@ import (
 	"path"
 	"path/filepath"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -92,23 +94,31 @@ func intersect(context string, syncMap map[string]string, files []string) (map[s
 		if err != nil {
 			return nil, errors.Wrapf(err, "changed file %s can't be found relative to context %s", f, context)
 		}
+		var matches bool
 		for p, dst := range syncMap {
 			match, err := filepath.Match(p, relPath)
 			if err != nil {
 				return nil, errors.Wrapf(err, "pattern error for %s", relPath)
 			}
-			if !match {
-				return nil, nil
-			}
-			// If the source has special match characters,
-			// the destination must be a directory
-			// The path package must be used here, since the destination is always
-			// a linux filesystem.
-			if util.HasMeta(p) {
-				dst = path.Join(dst, filepath.Base(relPath))
+			if match {
+				// Every file must match at least one sync pattern, if not we'll have to
+				// skip the entire sync
+				matches = true
+				// If the source has special match characters,
+				// the destination must be a directory
+				// The path package must be used here, since the destination is always
+				// a linux filesystem.
+				if util.HasMeta(p) {
+					dst = path.Join(dst, filepath.Base(relPath))
+				}
+				ret[f] = dst
 			}
-			ret[f] = dst
 		}
+		if !matches {
+			logrus.Infof("Changed file %s does not match any sync pattern. Skipping sync", relPath)
+			return nil, nil
+		}
+
 	}
 	return ret, nil
 }

pkg/skaffold/sync/sync_test.go

@@ -91,6 +91,39 @@ func TestNewSyncItem(t *testing.T) {
 			},
 			shouldErr: true,
 		},
+		{
+			description: "multiple sync patterns",
+			artifact: &latest.Artifact{
+				ImageName: "test",
+				Sync: map[string]string{
+					"*.js":   ".",
+					"*.html": ".",
+					"*.json": ".",
+				},
+				Workspace: "node",
+			},
+			builds: []build.Artifact{
+				{
+					ImageName: "test",
+					Tag:       "test:123",
+				},
+			},
+			evt: watch.Events{
+				Added:    []string{filepath.Join("node", "index.html")},
+				Modified: []string{filepath.Join("node", "server.js")},
+				Deleted:  []string{filepath.Join("node", "package.json")},
+			},
+			expected: &Item{
+				Image: "test:123",
+				Copy: map[string]string{
+					filepath.Join("node", "server.js"):  "server.js",
+					filepath.Join("node", "index.html"): "index.html",
+				},
+				Delete: map[string]string{
+					filepath.Join("node", "package.json"): "package.json",
+				},
+			},
+		},
 		{
 			description: "sync all",
 			artifact: &latest.Artifact{