Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Improve registry validation, error if unknown variables are used #289

Merged
merged 3 commits into from
Jan 5, 2021
Merged

feat: Improve registry validation, error if unknown variables are used #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc07138
feat: Improve registry validation, error if unknown variables are used
cszatmary Dec 19, 2020
0bcb1b1
chore: Add tests for new registry.Validate
cszatmary Dec 29, 2020
dff156c
feat: Add strict flag to validate, only report missing vars under str…
cszatmary Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions cmd/registry/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
package registry

import (
"errors"

"github.com/TouchBistro/goutils/color"
"github.com/TouchBistro/goutils/fatal"
"github.com/TouchBistro/tb/registry"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

type validateOptions struct {
strict bool
}

var validateOpts validateOptions

var validateCmd = &cobra.Command{
Use: "validate <path>",
Args: cobra.ExactArgs(1),
Expand All @@ -21,15 +29,43 @@ Example:
registryPath := args[0]
log.Infof(color.Cyan("Validating registry files at path %s..."), registryPath)

err := registry.Validate(registryPath)
if err != nil {
fatal.ExitErrf(err, "failed to validate registry at path %s", registryPath)
valid := true
result := registry.Validate(registryPath, validateOpts.strict)
if errors.Is(result.AppsErr, registry.ErrFileNotExist) {
log.Infof(color.Yellow("No %s file"), registry.AppsFileName)
} else if result.AppsErr == nil {
log.Infof(color.Green("✅ %s is valid"), registry.AppsFileName)
} else {
log.Infof("❌ %s is invalid\n%v", registry.AppsFileName, result.AppsErr)
valid = false
}

if errors.Is(result.PlaylistsErr, registry.ErrFileNotExist) {
log.Infof(color.Yellow("No %s file"), registry.PlaylistsFileName)
} else if result.PlaylistsErr == nil {
log.Infof(color.Green("✅ %s is valid"), registry.PlaylistsFileName)
} else {
log.Infof("❌ %s is invalid\n%v", registry.PlaylistsFileName, result.PlaylistsErr)
valid = false
}

if errors.Is(result.ServicesErr, registry.ErrFileNotExist) {
log.Infof(color.Yellow("No %s file"), registry.ServicesFileName)
} else if result.ServicesErr == nil {
log.Infof(color.Green("✅ %s is valid"), registry.ServicesFileName)
} else {
log.Infof("❌ %s is invalid\n%v", registry.ServicesFileName, result.ServicesErr)
valid = false
}

if !valid {
fatal.Exit(color.Red("❌ registry is invalid"))
}
log.Info(color.Green("✅ registry is valid"))
},
}

func init() {
validateCmd.Flags().BoolVar(&validateOpts.strict, "strict", false, "Strict mode, treat more cases as errors")
registryCmd.AddCommand(validateCmd)
}
Loading