Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create validator object to give more validation flexibility #2484

Merged
merged 12 commits into from
Aug 2, 2023
Merged

Create validator object to give more validation flexibility #2484

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ad8aab5
Create `validator` object to give more validation flexiability
MustafaSaber Jul 26, 2023
b638e85
Change under the hood for now to not break the API
MustafaSaber Jul 27, 2023
948e75a
Start with `eskip.ParseFilters` and fix failing tests logs
MustafaSaber Jul 27, 2023
2ed2a1c
Join filters issues
MustafaSaber Jul 27, 2023
903ee88
Fail after basic validation fails otherwise join errors
MustafaSaber Jul 27, 2023
1c374d3
Refactor & add more validation webhook tests
MustafaSaber Jul 31, 2023
64b1e3e
Parse `predicates` eskip also
MustafaSaber Aug 1, 2023
8fc2946
Update failing eskip parsing tests to indicate that it only generate …
MustafaSaber Aug 1, 2023
438a949
Wait for `go1.21` to use `errors.Join` for now use an adhoc wrapper
MustafaSaber Aug 1, 2023
ceefece
Use `errorJoin` for wrapping errors and keep `ValidateRouteGroups` na…
MustafaSaber Aug 2, 2023
1eef03a
rebasing mistakes
MustafaSaber Aug 2, 2023
a305df3
Cleanup leftovers & typos
MustafaSaber Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 66 additions & 66 deletions cmd/webhook/admission/admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,40 @@ package admission

import (
"bytes"
"fmt"
"io"
"net/http"
"net/http/httptest"
"os"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

const (
responseAllowedFmt = `{
"kind": "AdmissionReview",
"apiVersion": "admission.k8s.io/v1",
"response": {
"uid": "req-uid",
"allowed": true
}
}`

responseNotAllowedFmt = `{
"kind": "AdmissionReview",
"apiVersion": "admission.k8s.io/v1",
"response": {
"uid": "req-uid",
"allowed": false,
"status": {
"message": "%s"
}
}
}`
)

type testAdmitter struct {
// validate validates & plugs parameters for Admit
validate func(response *admissionRequest) (*admissionResponse, error)
Expand Down Expand Up @@ -60,78 +85,53 @@ func TestUnsupportedContentType(t *testing.T) {

func TestRouteGroupAdmitter(t *testing.T) {
for _, tc := range []struct {
name string
input string
result string
name string
inputFile string
message string
}{
{
name: "allowed",
input: `{
"request": {
"uid": "req-uid",
"name": "req1",
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
},
"spec": {
"backends": [
{
"name": "backend",
"type": "shunt"
}
],
"defaultBackends": [
{
"backendName": "backend"
}
]
}
}
}
}`,
result: `{
"kind": "AdmissionReview",
"apiVersion": "admission.k8s.io/v1",
"response": {
"uid": "req-uid",
"allowed": true
}
}`,
name: "allowed",
inputFile: "valid-rg.json",
},
{
name: "not allowed",
inputFile: "invalid-rg.json",
message: "could not validate RouteGroup, error in route group n1/rg1: route group without spec",
},
{
name: "valid eskip filters",
inputFile: "rg-with-valid-eskip-filters.json",
},
{
name: "invalid eskip filters",
inputFile: "rg-with-invalid-eskip-filters.json",
message: "could not validate RouteGroup, parse failed after token status, last route id: , position 11: syntax error",
},
{
name: "not allowed",
input: `{
"request": {
"uid": "req-uid",
"name": "req1",
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
}
}
}
}`,
result: `{
"kind": "AdmissionReview",
"apiVersion": "admission.k8s.io/v1",
"response": {
"uid": "req-uid",
"allowed": false,
"status": {
"message":
"could not validate RouteGroup, error in route group n1/rg1: route group without spec"
}
}
}`,
name: "valid eskip predicates",
inputFile: "rg-with-valid-eskip-predicates.json",
},
{
name: "invalid eskip predicates",
inputFile: "rg-with-invalid-eskip-predicates.json",
message: "could not validate RouteGroup, parse failed after token Method, last route id: Method, position 6: syntax error",
},
{
name: "invalid eskip filters and predicates",
inputFile: "rg-with-invalid-eskip-filters-and-predicates.json",
message: "could not validate RouteGroup, parse failed after token status, last route id: , position 11: syntax error\\nparse failed after token Method, last route id: Method, position 6: syntax error",
},
} {
t.Run(tc.name, func(t *testing.T) {
req := httptest.NewRequest("POST", "http://example.com/foo", bytes.NewBuffer([]byte(tc.input)))
result := responseAllowedFmt
AlexanderYastrebov marked this conversation as resolved.
Show resolved Hide resolved
if len(tc.message) > 0 {
result = fmt.Sprintf(responseNotAllowedFmt, tc.message)
}

input, err := os.ReadFile("testdata/" + tc.inputFile)
MustafaSaber marked this conversation as resolved.
Show resolved Hide resolved
require.NoError(t, err)

req := httptest.NewRequest("POST", "http://example.com/foo", bytes.NewBuffer(input))
req.Header.Set("Content-Type", "application/json")

w := httptest.NewRecorder()
Expand All @@ -146,7 +146,7 @@ func TestRouteGroupAdmitter(t *testing.T) {
require.NoError(t, err)
resp.Body.Close()

assert.JSONEq(t, tc.result, string(rb))
assert.JSONEq(t, result, string(rb))
})
}
}
13 changes: 13 additions & 0 deletions cmd/webhook/admission/testdata/invalid-rg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"request": {
"uid": "req-uid",
"name": "req1",
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
}
}
}
}
48 changes: 48 additions & 0 deletions cmd/webhook/admission/testdata/rg-with-invalid-eskip-filters-and-predicates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"request": {
"uid": "req-uid",
"name": "req1",
"operation": "create",
"kind": {
"group": "zalando",
"version": "v1",
"kind": "RouteGroup"
},
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
},
"spec": {
"backends": [
{
"name": "backend",
"type": "shunt"
}
],
"defaultBackends": [
{
"backendName": "backend"
}
],
"routes": [
{
"backends": [
{
"backendName": "backend"
}
],
"filters": [
"status&(201)"
],
"path": "/",
"predicates": [
"Method&(\"GET\")"
]
}
]
}
}
}
}
48 changes: 48 additions & 0 deletions cmd/webhook/admission/testdata/rg-with-invalid-eskip-filters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"request": {
"uid": "req-uid",
"name": "req1",
"operation": "create",
"kind": {
"group": "zalando",
"version": "v1",
"kind": "RouteGroup"
},
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
},
"spec": {
"backends": [
{
"name": "backend",
"type": "shunt"
}
],
"defaultBackends": [
{
"backendName": "backend"
}
],
"routes": [
{
"backends": [
{
"backendName": "backend"
}
],
"filters": [
"status&(201)"
],
"path": "/",
"predicates": [
"Method(\"GET\")"
]
}
]
}
}
}
}
48 changes: 48 additions & 0 deletions cmd/webhook/admission/testdata/rg-with-invalid-eskip-predicates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"request": {
"uid": "req-uid",
"name": "req1",
"operation": "create",
"kind": {
"group": "zalando",
"version": "v1",
"kind": "RouteGroup"
},
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
},
"spec": {
"backends": [
{
"name": "backend",
"type": "shunt"
}
],
"defaultBackends": [
{
"backendName": "backend"
}
],
"routes": [
{
"backends": [
{
"backendName": "backend"
}
],
"filters": [
"status(201)"
],
"path": "/",
"predicates": [
"Method&(\"GET\")"
]
}
]
}
}
}
}
48 changes: 48 additions & 0 deletions cmd/webhook/admission/testdata/rg-with-valid-eskip-filters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"request": {
"uid": "req-uid",
"name": "req1",
"operation": "create",
"kind": {
"group": "zalando",
"version": "v1",
"kind": "RouteGroup"
},
"namespace": "n1",
"object": {
"metadata": {
"name": "rg1",
"namespace": "n1"
},
"spec": {
"backends": [
{
"name": "backend",
"type": "shunt"
}
],
"defaultBackends": [
{
"backendName": "backend"
}
],
"routes": [
{
"backends": [
{
"backendName": "backend"
}
],
"filters": [
"status(201)"
],
"path": "/",
"predicates": [
"Method(\"GET\")"
]
}
]
}
}
}
}
Loading