Skip to content

Commit

Permalink
style: use consistent wording for linters
Browse files Browse the repository at this point in the history
  • Loading branch information
alexppg committed Jul 4, 2021
1 parent 48b529c commit 1c2749a
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions cmd/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ func chart(cmd *cobra.Command, args []string) {

configuration.Driver.Name = driver
configuration.Provisioner.Name = helm
configuration.Lint = lint
configuration.Linter = lint
configuration.Verifier = verifier
configuration.Dependency.Name = helm

logger.WithFields(log.Fields{
"driver": driver,
"provisioner": helm,
"verifier": helm,
"lint": strings.Replace(lint, "\n", " && ", -1),
"linter": strings.Replace(lint, "\n", " && ", -1),
}).Debug("Configuration to create")

err = config.CreateConfiguration(chartName, scenario, configuration)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func cleanup(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Cleanup(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/converge.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func converge(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Converge(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func create(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Create(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func dependency(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Dependency(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func destroy(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Destroy(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/lint.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func lint(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Lint(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/prepare.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func prepare(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Prepare(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/syntax.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func syntax(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Syntax(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion cmd/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func test(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

logger.Info("Syntax")
Expand Down
2 changes: 1 addition & 1 deletion cmd/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func verify(cmd *cobra.Command, args []string) {
"driver": configuration.Driver.Name,
"provisioner": configuration.Provisioner.Name,
"verifier": strings.Replace(configuration.Verifier, "\n", " && ", -1),
"lint": strings.Replace(configuration.Lint, "\n", " && ", -1),
"linter": strings.Replace(configuration.Linter, "\n", " && ", -1),
}).Debug("Configuration to use")

err = cli.Verify(scenario, configuration, logger)
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/lint.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ func Lint(scenario string, configuration config.ParticleConfiguration, logger *l
var err error
var cli cmd.CLI = cmd.CLI{Binary: "bash"}

cmdArgs := []string{"bash", "-c", configuration.Lint}
cmdArgs := []string{"bash", "-c", configuration.Linter}

err = cli.Initialize(logger, cmdArgs)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
type ParticleConfiguration struct {
Driver Driver `yaml:"driver" validate:"required"`
Provisioner Provisioner `yaml:"provisioner" validate:"required"`
Lint string `yaml:"lint" validate:"required"`
Linter string `yaml:"lint" validate:"required"`
Verifier string `yaml:"verifier" validate:"required"`
Dependency Dependency `yaml:"dependency" validate:"required,eq=helm"`
Prepare []Prepare `yaml:"prepare,omitempty"`
Expand Down

0 comments on commit 1c2749a

Please sign in to comment.