Skip to content

Commit

Permalink
fix: error on no scaffold rc and empty file (#91)
Browse files Browse the repository at this point in the history
* assume empty file on EOF error

* refactor error handling

* fix error compare
  • Loading branch information
hay-kot authored Dec 25, 2023
1 parent acb2331 commit e1c7aef
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
5 changes: 5 additions & 0 deletions app/scaffold/rc.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package scaffold

import (
"errors"
"fmt"
"io"
"net/url"
Expand Down Expand Up @@ -52,6 +53,10 @@ func NewScaffoldRC(r io.Reader) (*ScaffoldRC, error) {

err := yaml.NewDecoder(r).Decode(&out)
if err != nil {
if errors.Is(err, io.EOF) {
// Asssume empty file and return empty struct
return &out, nil
}
return nil, err
}

Expand Down
27 changes: 16 additions & 11 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,25 @@ func main() {
// Parse scaffoldrc file
scaffoldrcFile, err := os.Open(ctrl.Flags.ScaffoldRCPath)
if err != nil {
return fmt.Errorf("failed to open scaffoldrc file: %w", err)
if !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("failed to open scaffoldrc file: %w", err)
}
log.Debug().Msg("scaffoldrc file does not exist, skipping")
}

rc, err := scaffold.NewScaffoldRC(scaffoldrcFile)
if err != nil {
switch {
case errors.As(err, &scaffold.RcValidationErrors{}):
// I _know_ this is a valid cast, but the linter doesn't
e := err.(scaffold.RcValidationErrors) //nolint:errorlint
for _, err := range e {
log.Error().Str("key", err.Key).Msg(err.Cause.Error())
rc := &scaffold.ScaffoldRC{}
if scaffoldrcFile != nil {
rc, err = scaffold.NewScaffoldRC(scaffoldrcFile)
if err != nil {
scaferrs := scaffold.RcValidationErrors{}
switch {
case errors.As(err, &scaferrs):
for _, err := range scaferrs {
log.Error().Str("key", err.Key).Msg(err.Cause.Error())
}
default:
return fmt.Errorf("failed to parse scaffoldrc file: %w", err)
}
default:
return fmt.Errorf("failed to parse scaffoldrc file: %w", err)
}
}

Expand Down

0 comments on commit e1c7aef

Please sign in to comment.