actions/kubeconform
9
0
Fork 0
mirror of https://github.com/yannh/kubeconform.git synced 2026-02-11 14:09:21 +00:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

refactor

Browse source
This commit is contained in:
Yann Hamon 2020-11-01 16:35:38 +01:00
parent 1bc9283240
commit 0c22457919
2 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cmd/kubeconform/main.go
View file

@ -107,11 +107,7 @@ func getFiles(files []string, filesChan chan<- string, validationResults chan va
for _, filename := range files {
file, err := os.Open(filename)
if err != nil {
validationResults <- validator.Result{
Resource: resource.Resource{Path: filename},
Err: err,
Status: validator.Error,
}
validationResults <- validator.NewError(filename, err)
continue
}
defer file.Close()
@ -119,19 +115,11 @@ func getFiles(files []string, filesChan chan<- string, validationResults chan va
fi, err := file.Stat()
switch {
case err != nil:
validationResults <- validator.Result{
Resource: resource.Resource{Path: filename},
Err: err,
Status: validator.Error,
}
validationResults <- validator.NewError(filename, err)
case fi.IsDir():
if err := fsutils.FindYamlInDir(filename, filesChan); err != nil {
validationResults <- validator.Result{
Resource: resource.Resource{Path: filename},
Err: err,
Status: validator.Error,
}
validationResults <- validator.NewError(filename, err)
}
default:
@ -195,11 +183,7 @@ func realMain() int {
if isStdin {
resources, err := resource.FromStream("stdin", os.Stdin)
if err != nil {
validationResults <- validator.Result{
Resource: resource.Resource{Path: "stdin"},
Err: err,
Status: validator.Error,
}
validationResults <- validator.NewError("stdin", err)
} else {
resourcesChan <- resources
}
@ -207,21 +191,13 @@ func realMain() int {
for filename := range files {
f, err := os.Open(filename)
if err != nil {
validationResults <- validator.Result{
Resource: resource.Resource{Path: filename},
Err: err,
Status: validator.Error,
}
validationResults <- validator.NewError(filename, err)
continue
}
resources, err := resource.FromStream(filename, f)
if err != nil {
validationResults <- validator.Result{
Resource: resource.Resource{Path: filename},
Err: err,
Status: validator.Error,
}
validationResults <- validator.NewError(filename, err)
continue
}

8
pkg/validator/validator.go
View file

@ -43,6 +43,14 @@ type Result struct {
Status Status
}
func NewError(filename string, err error) Result {
return Result{
Resource: resource.Resource{Path: filename},
Err: err,
Status: Error,
}
}
// Validate validates a single Kubernetes resource against a Json Schema
func Validate(res resource.Resource, schema *gojsonschema.Schema) Result {
if schema == nil {