chore: fix opa validator testdata packages according to regal

Author: mxab

admissionctrl/validator/opa_validator_test.go

@@ -17,7 +17,7 @@ func TestOpaValidator(t *testing.T) {
 	// create a context with a timeout
 
 	// create a new OPA object
-	opaValidator, err := NewOpaValidator("testopavalidator", testutil.Filepath(t, "opa/validators/prefixed_policies.rego"),
+	opaValidator, err := NewOpaValidator("testopavalidator", testutil.Filepath(t, "opa/validators/prefixed_policies/prefixed_policies.rego"),
 		"errors = data.prefixed_policies.errors", slog.New(slog.DiscardHandler), nil)
 
 	require.NoError(t, err)
@@ -186,7 +186,7 @@ func TestOpaValidatorContext(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			validator, err := NewOpaValidator(
 				"test_context_validator",
-				testutil.Filepath(t, "opa/validators/context.rego"),
+				testutil.Filepath(t, "opa/validators/context/context.rego"),
 				tt.query,
 				slog.New(slog.DiscardHandler),
 				nil,

config/config_test.go

@@ -81,7 +81,7 @@ func TestLoadConfig(t *testing.T) {
 						OpaRule: &OpaRule{
 
 							Query:    "errors = data.costcenter_meta.errors",
-							Filename: "testdata/opa/validators/costcenter_meta.rego",
+							Filename: "testdata/opa/validators/costcenter_meta/costcenter_meta.rego",
 						},
 					},
 					{

config/testdata/with_admission.hcl

@@ -3,7 +3,7 @@ validator "opa" "some_opa_validator" {
 
     opa_rule {
         query = "errors = data.costcenter_meta.errors"
-        filename = "testdata/opa/validators/costcenter_meta.rego"
+        filename = "testdata/opa/validators/costcenter_meta/costcenter_meta.rego"
     }
 }
 validator "notation" "some_notation_validator" {

testdata/opa/validators/context.rego …data/opa/validators/context/context.regotestdata/opa/validators/context.rego renamed to testdata/opa/validators/context/context.rego testdata/opa/validators/context.rego renamed to testdata/opa/validators/context/context.rego

@@ -5,22 +5,22 @@ import data.costcenter_meta.errors
 import future.keywords
 
 test_missing_costcenter if {
-	count(errors) == 1 with input as {
+	count(errors) == 1 with input as {"job": {
 		"ID": "my-job",
 		"Meta": {},
-	}
+	}}
 }
 
 test_costcenter_prefix_wrong if {
-	count(errors) == 1 with input as {
+	count(errors) == 1 with input as {"job": {
 		"ID": "my-job",
 		"Meta": {"costcenter": "my-costcenter"},
-	}
+	}}
 }
 
 test_costcenter_correct if {
-	count(errors) == 0 with input as {
+	count(errors) == 0 with input as {"job": {
 		"ID": "my-job",
 		"Meta": {"costcenter": "cccode-my-costcenter"},
-	}
+	}}
 }

testdata/opa/validators/context_test.rego …opa/validators/context/context_test.regotestdata/opa/validators/context_test.rego renamed to testdata/opa/validators/context/context_test.rego testdata/opa/validators/context_test.rego renamed to testdata/opa/validators/context/context_test.rego

@@ -5,31 +5,31 @@ import data.prefixed_policies.errors
 import future.keywords
 
 test_no_errors if {
-	count(errors) == 0 with input as {
+	count(errors) == 0 with input as {"job": {
 		"ID": "example",
 		"Name": "example",
 		"TaskGroups": [{
 			"Name": "cache",
 			"Tasks": [],
 		}],
 		"Type": "service",
-	}
+	}}
 }
 
 test_no_errors_for_valid_policy if {
-	count(errors) == 0 with input as {
+	count(errors) == 0 with input as {"job": {
 		"ID": "example",
 		"Name": "example",
 		"TaskGroups": [{
 			"Name": "cache",
 			"Tasks": [{"Vault": {"Policies": ["example-redis"]}}],
 		}],
 		"Type": "service",
-	}
+	}}
 }
 
 test_no_errors_for_multi_valid_policy if {
-	count(errors) == 0 with input as {
+	count(errors) == 0 with input as {"job": {
 		"ID": "example",
 		"Name": "example",
 		"TaskGroups": [{
@@ -40,35 +40,35 @@ test_no_errors_for_multi_valid_policy if {
 			]}}],
 		}],
 		"Type": "service",
-	}
+	}}
 }
 
 test_errors_for_wrong_task_policy if {
-	count(errors) == 1 with input as {
+	count(errors) == 1 with input as {"job": {
 		"ID": "example",
 		"Name": "example",
 		"TaskGroups": [{
 			"Name": "cache",
 			"Tasks": [{"Vault": {"Policies": ["some-randome-policy"]}}],
 		}],
 		"Type": "service",
-	}
+	}}
 }
 
 test_errors_for_multi_wrong_policy if {
-	count(errors) == 2 with input as {
+	count(errors) == 2 with input as {"job": {
 		"ID": "example",
 		"Name": "example",
 		"TaskGroups": [{
 			"Name": "cache",
 			"Tasks": [{"Vault": {"Policies": ["some-randome-policy", "also-not-valid"]}}],
 		}],
 		"Type": "service",
-	}
+	}}
 }
 
 test_errors_for_wrong_task_group_policy if {
-	count(errors) == 1 with input as {
+	count(errors) == 1 with input as {"job": {
 		"ID": "example",
 		"Name": "example",
 		"TaskGroups": [{
@@ -77,5 +77,5 @@ test_errors_for_wrong_task_group_policy if {
 			"Tasks": [],
 		}],
 		"Type": "service",
-	}
+	}}
 }