Revert "add option to watch command to whitelist functions which will…

… be deployed on changes"

This reverts commit 8e1496e.

cmd/mantil/cmd/watch.go

@@ -18,15 +18,13 @@ var watchCmd = &cobra.Command{
 		if err != nil {
 			log.Fatal(err)
 		}
-		whitelistedFuncs, err := cmd.Flags().GetStringSlice("functions")
-		if err != nil {
-			log.Fatal(err)
-		}
-		d, err := deploy.New(p, aws, path, token, whitelistedFuncs...)
+		d, err := deploy.New(p, aws, path, token)
 		if err != nil {
 			log.Fatal(err)
 		}
 		watch.Start(path, func() {
+			log.Println("changes detected - starting deploy")
+			defer log.Println("deploy successfully finished")
 			if err := d.Deploy(); err != nil {
 				log.Fatal(err)
 			}
@@ -35,7 +33,5 @@ var watchCmd = &cobra.Command{
 }
 
 func init() {
-	watchCmd.Flags().StringSliceP("functions", "f", nil, "Whitelist functions which will be deployed on changes. If left empty all are whitelisted.")
 	rootCmd.AddCommand(watchCmd)
-
 }

internal/commands/deploy/deploy.go

@@ -25,20 +25,18 @@ const (
 )
 
 type DeployCmd struct {
-	aws              *aws.AWS
-	project          *mantil.Project
-	path             string
-	token            string
-	whitelistedFuncs []string
+	aws     *aws.AWS
+	project *mantil.Project
+	path    string
+	token   string
 }
 
-func New(project *mantil.Project, awsClient *aws.AWS, path, token string, whitelistedFuncs ...string) (*DeployCmd, error) {
+func New(project *mantil.Project, awsClient *aws.AWS, path, token string) (*DeployCmd, error) {
 	d := &DeployCmd{
-		aws:              awsClient,
-		project:          project,
-		path:             path,
-		token:            token,
-		whitelistedFuncs: whitelistedFuncs,
+		aws:     awsClient,
+		project: project,
+		path:    path,
+		token:   token,
 	}
 	return d, nil
 }
@@ -178,9 +176,6 @@ func (d *DeployCmd) removedFunctions(localFuncs []string) []string {
 func (d *DeployCmd) prepareFunctionsForDeploy() []mantil.Function {
 	funcsForDeploy := []mantil.Function{}
 	for i, f := range d.project.Functions {
-		if !d.isWhitelistedFunc(f) {
-			continue
-		}
 		funcDir := path.Join(d.path, FunctionsDir, f.Name)
 		isImage := d.isFunctionImage(funcDir)
 
@@ -249,18 +244,6 @@ func (d *DeployCmd) uploadBinaryToS3(key, binaryPath string) error {
 	return nil
 }
 
-func (d *DeployCmd) isWhitelistedFunc(f mantil.Function) bool {
-	if len(d.whitelistedFuncs) == 0 {
-		return true
-	}
-	for _, wlf := range d.whitelistedFuncs {
-		if wlf == f.Name {
-			return true
-		}
-	}
-	return false
-}
-
 func (d *DeployCmd) deployRequest(updates []mantil.FunctionUpdate) error {
 	type req struct {
 		ProjectName     string

internal/commands/watch/watch.go

@@ -35,7 +35,7 @@ func Start(path string, onChange func()) {
 		log.Fatal(err)
 	}
 
-	log.Printf("starting watch on go files in %s", path)
+	log.Printf("starting watch for all go files in %s", path)
 	if err := w.Start(1 * time.Second); err != nil {
 		log.Fatal(err)
 	}