-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove `github.com/pkg/errors` as it's abandoned Signed-off-by: Mustafa Abdelrahman <[email protected]> * Run `go mod tidy` Signed-off-by: Mustafa Abdelrahman <[email protected]> * Add test case for error wrapping Signed-off-by: Mustafa Abdelrahman <[email protected]> * Use yaml for test data Signed-off-by: Mustafa Abdelrahman <[email protected]> * Update github.com/sarslanhan/cronmask Signed-off-by: Alexander Yastrebov <[email protected]> * Revert to JSON testdata and remove yaml unmarshalling cause it's buggy Signed-off-by: Mustafa Abdelrahman <[email protected]> --------- Signed-off-by: Mustafa Abdelrahman <[email protected]> Signed-off-by: Alexander Yastrebov <[email protected]> Co-authored-by: Alexander Yastrebov <[email protected]>
- Loading branch information
1 parent
5c90e60
commit 4d664c9
Showing
7 changed files
with
116 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,27 @@ | ||
| package definitions_test | ||
|
|
||
| import ( | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/zalando/skipper/dataclients/kubernetes/definitions" | ||
| "github.com/zalando/skipper/dataclients/kubernetes/kubernetestest" | ||
| ) | ||
|
|
||
| func TestRouteGroupValidation(t *testing.T) { | ||
| kubernetestest.FixturesToTest(t, "testdata/validation") | ||
| } | ||
|
|
||
| func TestValidateRouteGroups(t *testing.T) { | ||
| data, err := os.ReadFile("testdata/errorwrapdata/routegroups.json") | ||
| require.NoError(t, err) | ||
|
|
||
| rgl, err := definitions.ParseRouteGroupsJSON(data) | ||
| require.NoError(t, err) | ||
|
|
||
| err = definitions.ValidateRouteGroups(&rgl) | ||
|
|
||
| assert.EqualError(t, err, "route group without name\nerror in route group default/rg1: route group without backend") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
dataclients/kubernetes/definitions/testdata/errorwrapdata/routegroups.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "items": [ | ||
| { | ||
| "apiVersion": "zalando.org/v1", | ||
| "kind": "RouteGroup", | ||
| "spec": { | ||
| "hosts": [ | ||
| "test.example.com" | ||
| ], | ||
| "routes": [ | ||
| { | ||
| "filters": [ | ||
| "inlineContent(\"/foo\")" | ||
| ], | ||
| "path": "/foo" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "apiVersion": "zalando.org/v1", | ||
| "metadata": { | ||
| "name": "rg1" | ||
| }, | ||
| "kind": "RouteGroup", | ||
| "spec": { | ||
| "hosts": [ | ||
| "test.example.com" | ||
| ], | ||
| "routes": [ | ||
| { | ||
| "filters": [ | ||
| "inlineContent(\"/foo\")" | ||
| ], | ||
| "path": "/foo" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "apiVersion": "zalando.org/v1", | ||
| "metadata": { | ||
| "name": "rg1" | ||
| }, | ||
| "kind": "RouteGroup", | ||
| "spec": { | ||
| "backends": [ | ||
| { | ||
| "name": "shunt", | ||
| "type": "shunt" | ||
| } | ||
| ], | ||
| "hosts": [ | ||
| "test.example.com" | ||
| ], | ||
| "routes": [ | ||
| { | ||
| "backends": [ | ||
| { | ||
| "backendName": "shunt" | ||
| } | ||
| ], | ||
| "filters": [ | ||
| "inlineContent(\"/foo\")" | ||
| ], | ||
| "path": "/foo" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters