refactor: change how the verifier command processes orders

It's been moved to the same way that the linter acts. It will just act as a bash script, so it's easier to do whatever is needed.
little-angry-clouds · Jul 4, 2021 · 48b529c · 48b529c
1 parent f6e8d80
commit 48b529c
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 24 deletions.
diff --git a/cmd/chart.go b/cmd/chart.go
@@ -20,6 +20,7 @@ func chart(cmd *cobra.Command, args []string) {
 	var driver string
 	var chartName string = args[0]
 	var lint string = "set -e\nhelm lint"
+	var verifier string = "set -e\nhelm test " + chartName
 	var debug bool
 	var err error
 	var configuration config.ParticleConfiguration
@@ -49,8 +50,7 @@ func chart(cmd *cobra.Command, args []string) {
 	configuration.Driver.Name = driver
 	configuration.Provisioner.Name = helm
 	configuration.Lint = lint
-	configuration.Verifier.Name = helm
-	configuration.Verifier.Command = []string{"helm", "test", chartName}
+	configuration.Verifier = verifier
 	configuration.Dependency.Name = helm
 
 	logger.WithFields(log.Fields{

diff --git a/cmd/cleanup.go b/cmd/cleanup.go
@@ -30,7 +30,7 @@ func cleanup(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/converge.go b/cmd/converge.go
@@ -30,7 +30,7 @@ func converge(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/create.go b/cmd/create.go
@@ -30,7 +30,7 @@ func create(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/dependency.go b/cmd/dependency.go
@@ -29,7 +29,7 @@ func dependency(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/destroy.go b/cmd/destroy.go
@@ -30,7 +30,7 @@ func destroy(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/lint.go b/cmd/lint.go
@@ -30,7 +30,7 @@ func lint(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/prepare.go b/cmd/prepare.go
@@ -29,7 +29,7 @@ func prepare(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/syntax.go b/cmd/syntax.go
@@ -30,7 +30,7 @@ func syntax(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/test.go b/cmd/test.go
@@ -28,7 +28,7 @@ func test(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/cmd/verify.go b/cmd/verify.go
@@ -30,7 +30,7 @@ func verify(cmd *cobra.Command, args []string) {
 	logger.WithFields(log.Fields{
 		"driver":      configuration.Driver.Name,
 		"provisioner": configuration.Provisioner.Name,
-		"verifier":    configuration.Verifier.Name,
+		"verifier":    strings.Replace(configuration.Verifier, "\n", " && ", -1),
 		"lint":        strings.Replace(configuration.Lint, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 

diff --git a/internal/cli/verify.go b/internal/cli/verify.go
@@ -9,10 +9,9 @@ import (
 
 func Verify(scenario string, configuration config.ParticleConfiguration, logger *log.Entry) error {
 	var err error
-	var cli cmd.CLI
 	var vrf verifier.Verifier
+	var cli cmd.CLI = cmd.CLI{Binary: "bash"}
 
-	cli = cmd.CLI{Binary: configuration.Verifier.Command[0]}
 	vrf = &verifier.Command{Logger: logger}
 
 	err = vrf.Verify(configuration, &cli)

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -11,7 +11,7 @@ type ParticleConfiguration struct {
 	Driver      Driver      `yaml:"driver" validate:"required"`
 	Provisioner Provisioner `yaml:"provisioner" validate:"required"`
 	Lint        string      `yaml:"lint" validate:"required"`
-	Verifier    Verifier    `yaml:"verifier" validate:"required,eq=helm"`
+	Verifier    string      `yaml:"verifier" validate:"required"`
 	Dependency  Dependency  `yaml:"dependency" validate:"required,eq=helm"`
 	Prepare     []Prepare   `yaml:"prepare,omitempty"`
 }
@@ -26,11 +26,6 @@ type Provisioner struct {
 	Values map[string]interface{} `yaml:"values,omitempty"`
 }
 
-type Verifier struct {
-	Name    string   `yaml:"name" validate:"required"`
-	Command []string `yaml:"command" validate:"required"`
-}
-
 type Dependency struct {
 	Name   string         `yaml:"name" validate:"eq=helm"`
 	Charts []Dependencies `yaml:"charts,omitempty"`

diff --git a/internal/verifier/command.go b/internal/verifier/command.go
@@ -14,8 +14,7 @@ func (c *Command) Verify(configuration config.ParticleConfiguration, cmd cmd.Cmd
 	var logger *log.Entry = c.Logger
 	var err error
 
-	// args := []string{"helm", "test", "test-" + name}
-	args := configuration.Verifier.Command
+	args := []string{"bash", "-c", configuration.Verifier}
 
 	err = cmd.Initialize(logger, args)
 	if err != nil {

diff --git a/internal/verifier/command_test.go b/internal/verifier/command_test.go
@@ -49,8 +49,7 @@ func TestVerifyCommand(t *testing.T) {
 			}
 			var configuration config.ParticleConfiguration
 
-			configuration.Verifier.Name = "helm"
-			configuration.Verifier.Command = []string{"helm", "test", "test-helm"}
+			configuration.Verifier = "set -e && helm test example"
 
 			err = vrf.Verify(configuration, &cli)
 			t.Log(fmt.Sprintf("error: %s", err))