chore: move hello mutator to testutils

mxab · Mar 7, 2023 · d77196c · d77196c
1 parent 0b1745f
commit d77196c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 32 deletions.
diff --git a/admissionctrl/mutator/mutator_test.go b/admissionctrl/mutator/mutator_test.go
diff --git a/nacp.go b/nacp.go
@@ -436,8 +436,6 @@ func createMutatators(c *config.Config, appLogger hclog.Logger) ([]admissionctrl
 	var jobMutators []admissionctrl.JobMutator
 	for _, m := range c.Mutators {
 		switch m.Type {
-		case "hello":
-			jobMutators = append(jobMutators, &mutator.HelloMutator{})
 
 		case "opa_jsonpatch":
 

diff --git a/nacp_test.go b/nacp_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/helper"
 	"github.com/mxab/nacp/admissionctrl"
-	"github.com/mxab/nacp/admissionctrl/mutator"
 	"github.com/mxab/nacp/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -57,7 +56,7 @@ func TestProxy(t *testing.T) {
 			nomadResponse: toJson(t, &api.JobRegisterResponse{}),
 			validators:    []admissionctrl.JobValidator{},
 			mutators: []admissionctrl.JobMutator{
-				&mutator.HelloMutator{},
+				&testutil.HelloMutator{},
 			},
 		},
 
@@ -78,7 +77,7 @@ func TestProxy(t *testing.T) {
 
 			validators: []admissionctrl.JobValidator{},
 			mutators: []admissionctrl.JobMutator{
-				&mutator.HelloMutator{},
+				&testutil.HelloMutator{},
 			},
 		},
 		{
@@ -161,7 +160,7 @@ func TestProxy(t *testing.T) {
 			nomadResponse: toJson(t, &api.JobValidateResponse{}),
 			validators:    []admissionctrl.JobValidator{},
 			mutators: []admissionctrl.JobMutator{
-				&mutator.HelloMutator{},
+				&testutil.HelloMutator{},
 			},
 		},
 		{
@@ -285,7 +284,7 @@ func TestJobUpdateProxy(t *testing.T) {
 			nomadResponse: toJson(t, &api.JobRegisterResponse{}),
 			validators:    []admissionctrl.JobValidator{},
 			mutators: []admissionctrl.JobMutator{
-				&mutator.HelloMutator{},
+				&testutil.HelloMutator{},
 			},
 		},
 	}

diff --git a/admissionctrl/mutator/mutator.go → testutil/hello_mutator.go b/admissionctrl/mutator/mutator.go → testutil/hello_mutator.go
@@ -1,8 +1,6 @@
-package mutator
+package testutil
 
-import (
-	"github.com/hashicorp/nomad/api"
-)
+import "github.com/hashicorp/nomad/api"
 
 type HelloMutator struct {
 	MutatorName string