toolshed/abra
4
2
Fork 18
Code Issues 32 Pull Requests 3 Packages Releases 40 Activity

fix: check published version properly

Browse Source 
Resulted in a refactor to a new lint package.
This commit is contained in:
cellarspoon
2021-12-26 00:00:19 +01:00
parent ba8138079f
commit 9a1cf258a5
5 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/app/rollback.go
View File

@ -6,6 +6,7 @@ import (
"coopcloud.tech/abra/pkg/autocomplete"
"coopcloud.tech/abra/pkg/catalogue"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/lint"
"coopcloud.tech/abra/pkg/recipe"
stack "coopcloud.tech/abra/pkg/upstream/stack"
"coopcloud.tech/tagcmp"
@ -50,7 +51,7 @@ recipes.
logrus.Fatal(err)
}
if err := recipe.LintForErrors(r); err != nil {
if err := lint.LintForErrors(r); err != nil {
logrus.Fatal(err)
}

3
cli/app/upgrade.go
View File

@ -8,6 +8,7 @@ import (
"coopcloud.tech/abra/pkg/catalogue"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/lint"
"coopcloud.tech/abra/pkg/recipe"
stack "coopcloud.tech/abra/pkg/upstream/stack"
"coopcloud.tech/tagcmp"
@ -54,7 +55,7 @@ recipes.
logrus.Fatal(err)
}
if err := recipe.LintForErrors(r); err != nil {
if err := lint.LintForErrors(r); err != nil {
logrus.Fatal(err)
}

3
cli/internal/deploy.go
View File

@ -10,6 +10,7 @@ import (
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/dns"
"coopcloud.tech/abra/pkg/git"
"coopcloud.tech/abra/pkg/lint"
"coopcloud.tech/abra/pkg/recipe"
"coopcloud.tech/abra/pkg/upstream/stack"
"github.com/AlecAivazis/survey/v2"
@ -27,7 +28,7 @@ func DeployAction(c *cli.Context) error {
logrus.Fatal(err)
}
if err := recipe.LintForErrors(r); err != nil {
if err := lint.LintForErrors(r); err != nil {
logrus.Fatal(err)
}

6
cli/recipe/lint.go
View File

@ -6,7 +6,7 @@ import (
"coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/pkg/autocomplete"
recipePkg "coopcloud.tech/abra/pkg/recipe"
"coopcloud.tech/abra/pkg/lint"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
@ -26,8 +26,8 @@ var recipeLintCommand = &cli.Command{
hasError := false
bar := formatter.CreateProgressbar(-1, "running recipe lint rules...")
for level := range recipePkg.LintRules {
for _, rule := range recipePkg.LintRules[level] {
for level := range lint.LintRules {
for _, rule := range lint.LintRules[level] {
ok, err := rule.Function(recipe)
if err != nil {
logrus.Warn(err)