Merge pull request #37 from b4b4r07/fix/36

Fix bug when state.json does not exist

cmd/meta.go

@@ -130,7 +130,7 @@ func (m *metaCmd) init() error {
 
 	s, err := state.Open(filepath.Join(root, "state.json"), resourcers)
 	if err != nil {
-		return errors.Wrap(err, "faield to open state file")
+		return errors.Wrap(err, "failed to open state file")
 	}
 	m.state = s
 

pkg/state/state.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
-	"syscall"
 
 	"github.com/google/go-cmp/cmp"
 )
@@ -87,7 +86,8 @@ var exists = func(path string) bool {
 var ReadStateFile = func(filename string) ([]byte, error) {
 	f, err := os.Open(filename)
 	if err != nil {
-		return nil, pathError(err)
+		// return empty json contents if state.json does not exist
+		return []byte(`{}`), nil
 	}
 	defer f.Close()
 
@@ -103,17 +103,6 @@ var SaveStateFile = func(filename string) (io.Writer, error) {
 	return os.Create(filename)
 }
 
-func pathError(err error) error {
-	var pathError *os.PathError
-	if errors.As(err, &pathError) && errors.Is(pathError.Err, syscall.ENOTDIR) {
-		if p := findRegularFile(pathError.Path); p != "" {
-			return fmt.Errorf("remove or rename regular file `%s` (must be a directory)", p)
-		}
-
-	}
-	return err
-}
-
 func findRegularFile(p string) string {
 	for {
 		if s, err := os.Stat(p); err == nil && s.Mode().IsRegular() {