Add omitempty to launch checks.

Don't autogenerate watch dirs.
Skip the current directory when searching for edward.json files to import.

Author: theothertomelliott

generators/edward.go

@@ -22,6 +22,9 @@ func (v *EdwardGenerator) Name() string {
 // VisitDir searches a directory for edward.json files, and will store an import
 // for any found. Returns true in the first return value if an import was found.
 func (v *EdwardGenerator) VisitDir(path string) (bool, error) {
+	if path == v.basePath {
+		return false, nil
+	}
 	files, _ := ioutil.ReadDir(path)
 	for _, f := range files {
 		if f.Name() == "edward.json" {

generators/generators_test.go

@@ -68,10 +68,9 @@ func TestEdwardGenerator(t *testing.T) {
 			},
 			outServices: []*services.ServiceConfig{
 				{
-					Name:      "goproject",
-					Path:      common.StringToStringPointer("goproject"),
-					Env:       []string{},
-					WatchJSON: []byte("{\"include\":[\"goproject\"]}"),
+					Name: "goproject",
+					Path: common.StringToStringPointer("goproject"),
+					Env:  []string{},
 					Commands: services.ServiceConfigCommands{
 						Build:  "go install",
 						Launch: "goproject",
@@ -118,10 +117,9 @@ func TestGoGenerator(t *testing.T) {
 			path: "testdata/go/simple/",
 			outServices: []*services.ServiceConfig{
 				{
-					Name:      "simple",
-					Path:      common.StringToStringPointer("gocode/src/yext/simple"),
-					Env:       []string{},
-					WatchJSON: []byte("{\"include\":[\"gocode/src/yext/simple\"]}"),
+					Name: "simple",
+					Path: common.StringToStringPointer("gocode/src/yext/simple"),
+					Env:  []string{},
 					Commands: services.ServiceConfigCommands{
 						Build:  "go install",
 						Launch: "simple",
@@ -135,20 +133,18 @@ func TestGoGenerator(t *testing.T) {
 			path: "testdata/go/multiple/",
 			outServices: []*services.ServiceConfig{
 				{
-					Name:      "service1",
-					Path:      common.StringToStringPointer("service1"),
-					Env:       []string{},
-					WatchJSON: []byte("{\"include\":[\"service1\"]}"),
+					Name: "service1",
+					Path: common.StringToStringPointer("service1"),
+					Env:  []string{},
 					Commands: services.ServiceConfigCommands{
 						Build:  "go install",
 						Launch: "service1",
 					},
 				},
 				{
-					Name:      "service2",
-					Path:      common.StringToStringPointer("service2"),
-					Env:       []string{},
-					WatchJSON: []byte("{\"include\":[\"service2\"]}"),
+					Name: "service2",
+					Path: common.StringToStringPointer("service2"),
+					Env:  []string{},
 					Commands: services.ServiceConfigCommands{
 						Build:  "go install",
 						Launch: "service2",
@@ -163,10 +159,9 @@ func TestGoGenerator(t *testing.T) {
 			targets: []string{"service1"},
 			outServices: []*services.ServiceConfig{
 				{
-					Name:      "service1",
-					Path:      common.StringToStringPointer("service1"),
-					Env:       []string{},
-					WatchJSON: []byte("{\"include\":[\"service1\"]}"),
+					Name: "service1",
+					Path: common.StringToStringPointer("service1"),
+					Env:  []string{},
 					Commands: services.ServiceConfigCommands{
 						Build:  "go install",
 						Launch: "service1",

generators/go.go

@@ -90,12 +90,6 @@ func (v *GoGenerator) goService(name, packagePath string) (*services.ServiceConf
 		},
 	}
 
-	watch, err := v.createWatch(service)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-	service.SetWatch(watch)
-
 	return service, nil
 }
 

services/serviceconfig.go

@@ -39,7 +39,7 @@ type ServiceConfig struct {
 	Commands ServiceConfigCommands `json:"commands"`
 
 	// Checks to perform to ensure that a service has started correctly
-	LaunchChecks *LaunchChecks `json:"launch_checks"`
+	LaunchChecks *LaunchChecks `json:"launch_checks,omitempty"`
 
 	// Env holds environment variables for a service, for example: GOPATH=~/gocode/
 	// These will be added to the vars in the environment under which the Edward command was run