Merge pull request #158 from apex/fix-loading

fix loading functions (load only existing functions)

project/project.go

@@ -34,9 +34,6 @@ const (
 	DefaultTimeout = 3
 )
 
-// ErrNotFound is returned when a function cannot be found.
-var ErrNotFound = errors.New("project: no function found")
-
 // Config for project.
 type Config struct {
 	Name         string            `json:"name" validate:"nonzero"`
@@ -119,15 +116,21 @@ func (p *Project) LoadFunctions(names ...string) error {
 	dir := filepath.Join(p.Path, functionsDir)
 	p.Log.Debugf("loading functions in %s", dir)
 
-	var err error
+	existing, err := p.FunctionDirNames()
+	if err != nil {
+		return err
+	}
+
 	if len(names) == 0 {
-		names, err = p.FunctionDirNames()
-		if err != nil {
-			return err
-		}
+		names = existing
 	}
 
 	for _, name := range names {
+		if !utils.ContainsString(existing, name) {
+			p.Log.Warnf("function %q does not exist in project", name)
+			continue
+		}
+
 		fn, err := p.loadFunction(name)
 		if err != nil {
 			return err
@@ -136,6 +139,10 @@ func (p *Project) LoadFunctions(names ...string) error {
 		p.Functions = append(p.Functions, fn)
 	}
 
+	if len(p.Functions) == 0 {
+		return errors.New("no function loaded")
+	}
+
 	return nil
 }
 
@@ -213,17 +220,6 @@ func (p *Project) Delete() error {
 	return nil
 }
 
-// FunctionByName returns a function by `name` or returns ErrNotFound.
-func (p *Project) FunctionByName(name string) (*function.Function, error) {
-	for _, fn := range p.Functions {
-		if fn.Name == name {
-			return fn, nil
-		}
-	}
-
-	return nil, ErrNotFound
-}
-
 // FunctionDirNames returns a list of function directory names.
 func (p *Project) FunctionDirNames() (list []string, err error) {
 	dir := filepath.Join(p.Path, functionsDir)

project/project_test.go

@@ -57,3 +57,28 @@ func TestProject_LoadFunctions_loadSpecified(t *testing.T) {
 	assert.Equal(t, 1, len(p.Functions))
 	assert.Equal(t, "foo", p.Functions[0].Name)
 }
+
+func TestProject_LoadFunctions_onlyExisting(t *testing.T) {
+	p := &project.Project{
+		Path: "_fixtures/twoFunctions",
+		Log:  log.Log,
+	}
+
+	p.Open()
+	p.LoadFunctions("foo", "buz")
+
+	assert.Equal(t, 1, len(p.Functions))
+	assert.Equal(t, "foo", p.Functions[0].Name)
+}
+
+func TestProject_LoadFunctions_noFunctionLoaded(t *testing.T) {
+	p := &project.Project{
+		Path: "_fixtures/twoFunctions",
+		Log:  log.Log,
+	}
+
+	p.Open()
+	err := p.LoadFunctions("buz")
+
+	assert.EqualError(t, err, "no function loaded")
+}

utils/utils.go

@@ -69,3 +69,13 @@ func ReadIgnoreFile(dir string) ([]string, error) {
 
 	return strings.Split(string(b), "\n"), nil
 }
+
+// ContainsString checks if array contains string
+func ContainsString(array []string, element string) bool {
+	for _, e := range array {
+		if element == e {
+			return true
+		}
+	}
+	return false
+}

utils/utils_test.go

@@ -29,3 +29,8 @@ func Test_ReadIgnoreFile_missing(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, []string(nil), patterns)
 }
+
+func Test_ContainsString(t *testing.T) {
+	assert.True(t, utils.ContainsString([]string{"a", "b"}, "a"))
+	assert.False(t, utils.ContainsString([]string{"a", "b"}, "c"))
+}