diff --git a/api/plugins/tests/integration/controlplane/control_plane.go b/api/plugins/tests/integration/controlplane/control_plane.go index cdfd2c07..92dcf7a2 100644 --- a/api/plugins/tests/integration/controlplane/control_plane.go +++ b/api/plugins/tests/integration/controlplane/control_plane.go @@ -184,7 +184,7 @@ func (cp *ControlPlane) UseGoPluginConfig(t *testing.T, config *filtermanager.Fi "fm": { Override: &golang.RouterPlugin_Config{ Config: proto.MessageToAny( - FilterManagerConfigToTypedStruct(NewPluinConfig(nil))), + FilterManagerConfigToTypedStruct(NewPluginConfig(nil))), }, }, }, @@ -208,7 +208,7 @@ func (cp *ControlPlane) UseGoPluginConfig(t *testing.T, config *filtermanager.Fi "fm": { Override: &golang.RouterPlugin_Config{ Config: proto.MessageToAny( - FilterManagerConfigToTypedStruct(NewSinglePluinConfig("coverage", nil))), + FilterManagerConfigToTypedStruct(NewSinglePluginConfig("coverage", nil))), }, }, }, @@ -243,14 +243,14 @@ func FilterManagerConfigToTypedStruct(fmc *filtermanager.FilterManagerConfig) *x } } -func NewSinglePluinConfig(name string, config interface{}) *filtermanager.FilterManagerConfig { +func NewSinglePluginConfig(name string, config interface{}) *filtermanager.FilterManagerConfig { fmc := &filtermanager.FilterManagerConfig{} fmc.Namespace = "ns" fmc.Plugins = []*model.FilterConfig{{Name: name, Config: config}} return fmc } -func NewPluinConfig(plugins []*model.FilterConfig) *filtermanager.FilterManagerConfig { +func NewPluginConfig(plugins []*model.FilterConfig) *filtermanager.FilterManagerConfig { fmc := &filtermanager.FilterManagerConfig{} fmc.Namespace = "ns" fmc.Plugins = plugins diff --git a/api/tests/integration/api_test.go b/api/tests/integration/api_test.go index f87384eb..ce366911 100644 --- a/api/tests/integration/api_test.go +++ b/api/tests/integration/api_test.go @@ -44,7 +44,7 @@ func TestLogLevelCache(t *testing.T) { } defer dp.Stop() - config := controlplane.NewSinglePluinConfig("buffer", map[string]interface{}{}) + config := controlplane.NewSinglePluginConfig("buffer", map[string]interface{}{}) controlPlane.UseGoPluginConfig(t, config, dp) err = dp.SetLogLevel("golang", "debug") require.Nil(t, err) diff --git a/api/tests/integration/benchmark_test.go b/api/tests/integration/benchmark_test.go index 7521d8f6..e8ad9d42 100644 --- a/api/tests/integration/benchmark_test.go +++ b/api/tests/integration/benchmark_test.go @@ -86,7 +86,7 @@ func TestBenchmarkPlugin(t *testing.T) { } defer dp.Stop() - config := controlplane.NewSinglePluinConfig("benchmark", map[string]interface{}{}) + config := controlplane.NewSinglePluginConfig("benchmark", map[string]interface{}{}) controlPlane.UseGoPluginConfig(t, config, dp) runBenchmark(t, clientBin, "http://localhost:10000/echo") @@ -114,7 +114,7 @@ func TestBenchmarkPluginFromConsumer(t *testing.T) { } defer dp.Stop() - config := controlplane.NewPluinConfig([]*model.FilterConfig{ + config := controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "consumer", Config: map[string]interface{}{}, diff --git a/api/tests/integration/consumer_test.go b/api/tests/integration/consumer_test.go index 992a5a03..a8152d0f 100644 --- a/api/tests/integration/consumer_test.go +++ b/api/tests/integration/consumer_test.go @@ -53,7 +53,7 @@ func TestConsumerWithFilter(t *testing.T) { }{ { name: "authn & exec", - config: controlplane.NewSinglePluinConfig("consumer", map[string]interface{}{}), + config: controlplane.NewSinglePluginConfig("consumer", map[string]interface{}{}), run: func(t *testing.T) { resp, _ := dp.Get("/echo", http.Header{"Authorization": []string{"marvin"}}) assert.Equal(t, 206, resp.StatusCode) @@ -102,7 +102,7 @@ func TestConsumerWithFilterInitFailed(t *testing.T) { }{ { name: "authn & exec", - config: controlplane.NewSinglePluinConfig("consumer", map[string]interface{}{}), + config: controlplane.NewSinglePluginConfig("consumer", map[string]interface{}{}), run: func(t *testing.T) { resp, _ := dp.Get("/echo", http.Header{"Authorization": []string{"marvin"}}) assert.Equal(t, 500, resp.StatusCode) @@ -154,7 +154,7 @@ func TestConsumerWithFilterAndMergeFromFilter(t *testing.T) { }{ { name: "authn & exec", - config: controlplane.NewSinglePluinConfig("consumer", map[string]interface{}{}), + config: controlplane.NewSinglePluginConfig("consumer", map[string]interface{}{}), run: func(t *testing.T) { resp, _ := dp.Get("/echo", http.Header{"Authorization": []string{"marvin"}}) assert.Equal(t, 206, resp.StatusCode) @@ -199,7 +199,7 @@ func TestConsumerFilterNotAfterConsumerRunInLaterPhase(t *testing.T) { }{ { name: "authn & exec", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "beforeConsumerAndHasOtherMethod", Config: map[string]interface{}{}, diff --git a/api/tests/integration/filtermanager_test.go b/api/tests/integration/filtermanager_test.go index 75d7fb92..bfb612b6 100644 --- a/api/tests/integration/filtermanager_test.go +++ b/api/tests/integration/filtermanager_test.go @@ -901,7 +901,7 @@ func TestFilterManagerIgnoreUnknownFields(t *testing.T) { } defer dp.Stop() - config := controlplane.NewSinglePluinConfig("buffer", map[string]interface{}{ + config := controlplane.NewSinglePluginConfig("buffer", map[string]interface{}{ "unknown": "blah", }) controlPlane.UseGoPluginConfig(t, config, dp) @@ -927,7 +927,7 @@ func TestFilterManagerPluginReturnsErrorInParse(t *testing.T) { } defer dp.Stop() - config := controlplane.NewSinglePluinConfig("buffer", map[string]interface{}{ + config := controlplane.NewSinglePluginConfig("buffer", map[string]interface{}{ "decode": []string{"wrong type"}, }) controlPlane.UseGoPluginConfig(t, config, dp) @@ -1093,7 +1093,7 @@ func TestFilterManagerRecordLocalReplyPlugin(t *testing.T) { } defer dp.Stop() - config := controlplane.NewSinglePluinConfig("localReply", map[string]interface{}{ + config := controlplane.NewSinglePluginConfig("localReply", map[string]interface{}{ "decode": true, "headers": true, }) diff --git a/api/tests/integration/http_filter_test.go b/api/tests/integration/http_filter_test.go index 06a07e51..a3c0ab22 100644 --- a/api/tests/integration/http_filter_test.go +++ b/api/tests/integration/http_filter_test.go @@ -119,7 +119,7 @@ func TestFilterMergeIntoRoute(t *testing.T) { }, { name: "init should be called only once (route version)", - config: controlplane.NewSinglePluinConfig("init", map[string]interface{}{}), + config: controlplane.NewSinglePluginConfig("init", map[string]interface{}{}), run: func(t *testing.T) { resp, _ := dp.Get("/echo", nil) assert.Equal(t, 200, resp.StatusCode) @@ -131,7 +131,7 @@ func TestFilterMergeIntoRoute(t *testing.T) { }, { name: "override", - config: controlplane.NewSinglePluinConfig("buffer", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("buffer", map[string]interface{}{ "decode": true, "need": true, }), @@ -143,7 +143,7 @@ func TestFilterMergeIntoRoute(t *testing.T) { }, { name: "sort merged plugins", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "stream", Config: map[string]interface{}{}, diff --git a/plugins/tests/integration/casbin_test.go b/plugins/tests/integration/casbin_test.go index 990ed6ee..c35bafb0 100644 --- a/plugins/tests/integration/casbin_test.go +++ b/plugins/tests/integration/casbin_test.go @@ -74,7 +74,7 @@ g, bob, admin }{ { name: "happy path", - config: controlplane.NewSinglePluinConfig("casbin", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("casbin", map[string]interface{}{ "rule": map[string]string{ "model": modelFile.Name(), "policy": policyFile.Name(), @@ -89,7 +89,7 @@ g, bob, admin }, { name: "change config", - config: controlplane.NewSinglePluinConfig("casbin", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("casbin", map[string]interface{}{ "rule": map[string]string{ "model": modelFile.Name(), "policy": policyFile2.Name(), diff --git a/plugins/tests/integration/cel_script_test.go b/plugins/tests/integration/cel_script_test.go index c17eb45b..36042c44 100644 --- a/plugins/tests/integration/cel_script_test.go +++ b/plugins/tests/integration/cel_script_test.go @@ -40,7 +40,7 @@ func TestCelScript(t *testing.T) { }{ { name: "allowIf", - config: controlplane.NewSinglePluinConfig("celScript", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("celScript", map[string]interface{}{ "allowIf": `request.path() == "/echo" && request.method() == "GET"`, }), expect: func(t *testing.T, resp *http.Response) { @@ -49,7 +49,7 @@ func TestCelScript(t *testing.T) { }, { name: "allowIf, reject", - config: controlplane.NewSinglePluinConfig("celScript", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("celScript", map[string]interface{}{ "allowIf": `request.path() == "/echo" && request.method() != "GET"`, }), expect: func(t *testing.T, resp *http.Response) { diff --git a/plugins/tests/integration/consumer_restriction_test.go b/plugins/tests/integration/consumer_restriction_test.go index 843dbcf7..d0d0db28 100644 --- a/plugins/tests/integration/consumer_restriction_test.go +++ b/plugins/tests/integration/consumer_restriction_test.go @@ -58,7 +58,7 @@ func TestConsumerRestriction(t *testing.T) { }{ { name: "allow", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "keyAuth", Config: map[string]interface{}{ @@ -92,7 +92,7 @@ func TestConsumerRestriction(t *testing.T) { }, { name: "allowed by method", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "keyAuth", Config: map[string]interface{}{ @@ -136,7 +136,7 @@ func TestConsumerRestriction(t *testing.T) { }, { name: "deny", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "keyAuth", Config: map[string]interface{}{ @@ -179,7 +179,7 @@ func TestConsumerRestriction(t *testing.T) { }, { name: "denied by method", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "keyAuth", Config: map[string]interface{}{ diff --git a/plugins/tests/integration/debug_mode_test.go b/plugins/tests/integration/debug_mode_test.go index 39308610..e729255f 100644 --- a/plugins/tests/integration/debug_mode_test.go +++ b/plugins/tests/integration/debug_mode_test.go @@ -40,7 +40,7 @@ func TestDebugModeSlowLog(t *testing.T) { } defer dp.Stop() - config := controlplane.NewPluinConfig([]*model.FilterConfig{ + config := controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "debugMode", Config: map[string]interface{}{ @@ -87,7 +87,7 @@ func TestDebugModeSlowLogNoPlugin(t *testing.T) { } defer dp.Stop() - config := controlplane.NewPluinConfig([]*model.FilterConfig{ + config := controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "debugMode", Config: map[string]interface{}{ @@ -119,7 +119,7 @@ func TestDebugModeSlowLogNoEncodeHeaders(t *testing.T) { } defer dp.Stop() - config := controlplane.NewPluinConfig([]*model.FilterConfig{ + config := controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "debugMode", Config: map[string]interface{}{ @@ -156,7 +156,7 @@ func TestDebugModeSlowLogNotEmit(t *testing.T) { }{ { name: "not emit", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "debugMode", Config: map[string]interface{}{ @@ -212,7 +212,7 @@ func TestDebugModeSlowLogWithFiltersFromConsumer(t *testing.T) { }{ { name: "sanity", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "debugMode", Config: map[string]interface{}{ diff --git a/plugins/tests/integration/demo_test.go b/plugins/tests/integration/demo_test.go index b16c561a..7f50ec00 100644 --- a/plugins/tests/integration/demo_test.go +++ b/plugins/tests/integration/demo_test.go @@ -41,7 +41,7 @@ func TestDemo(t *testing.T) { }{ { name: "happy path", - config: controlplane.NewSinglePluinConfig("demo", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("demo", map[string]interface{}{ "hostName": "Tom", }), expect: func(t *testing.T, resp *http.Response) { @@ -51,7 +51,7 @@ func TestDemo(t *testing.T) { }, { name: "change config", - config: controlplane.NewSinglePluinConfig("demo", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("demo", map[string]interface{}{ "hostName": "Mike", }), diff --git a/plugins/tests/integration/ext_auth_test.go b/plugins/tests/integration/ext_auth_test.go index b9528ab5..b787ac89 100644 --- a/plugins/tests/integration/ext_auth_test.go +++ b/plugins/tests/integration/ext_auth_test.go @@ -49,7 +49,7 @@ func TestExtAuth(t *testing.T) { }{ { name: "default", - config: controlplane.NewSinglePluinConfig("extAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("extAuth", map[string]interface{}{ "httpService": map[string]interface{}{ "url": "http://127.0.0.1:10001/ext_auth", }, @@ -68,7 +68,7 @@ func TestExtAuth(t *testing.T) { }, { name: "failed to ext auth", - config: controlplane.NewSinglePluinConfig("extAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("extAuth", map[string]interface{}{ "httpService": map[string]interface{}{ "url": "http://127.0.0.1:2023/ext_auth", "statusOnError": 401, @@ -81,7 +81,7 @@ func TestExtAuth(t *testing.T) { }, { name: "allow failure mode", - config: controlplane.NewSinglePluinConfig("extAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("extAuth", map[string]interface{}{ "httpService": map[string]interface{}{ "url": "http://127.0.0.1:2023/ext_auth", "statusOnError": 403, @@ -95,7 +95,7 @@ func TestExtAuth(t *testing.T) { }, { name: "with body", - config: controlplane.NewSinglePluinConfig("extAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("extAuth", map[string]interface{}{ "httpService": map[string]interface{}{ "url": "http://127.0.0.1:10001/ext_auth", "withRequestBody": true, diff --git a/plugins/tests/integration/hmac_auth_test.go b/plugins/tests/integration/hmac_auth_test.go index 50a83694..efb7c85e 100644 --- a/plugins/tests/integration/hmac_auth_test.go +++ b/plugins/tests/integration/hmac_auth_test.go @@ -57,7 +57,7 @@ func TestHmacAuth(t *testing.T) { }{ { name: "sanity", - config: controlplane.NewSinglePluinConfig("hmacAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("hmacAuth", map[string]interface{}{ "signatureHeader": "x-sign-hdr", "accessKeyHeader": "x-ak", "dateHeader": "x-date", @@ -76,7 +76,7 @@ func TestHmacAuth(t *testing.T) { }, { name: "bypass if no credential", - config: controlplane.NewPluinConfig([]*model.FilterConfig{ + config: controlplane.NewPluginConfig([]*model.FilterConfig{ { Name: "hmacAuth", Config: map[string]interface{}{ diff --git a/plugins/tests/integration/key_auth_test.go b/plugins/tests/integration/key_auth_test.go index 60e8a2c1..d0e4ad3e 100644 --- a/plugins/tests/integration/key_auth_test.go +++ b/plugins/tests/integration/key_auth_test.go @@ -51,7 +51,7 @@ func TestKeyAuth(t *testing.T) { }{ { name: "key in the header", - config: controlplane.NewSinglePluinConfig("keyAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("keyAuth", map[string]interface{}{ "keys": []interface{}{ map[string]interface{}{ "name": "Authorization", @@ -72,7 +72,7 @@ func TestKeyAuth(t *testing.T) { }, { name: "key in the query", - config: controlplane.NewSinglePluinConfig("keyAuth", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("keyAuth", map[string]interface{}{ "keys": []interface{}{ map[string]interface{}{ "name": "Authorization", diff --git a/plugins/tests/integration/limit_count_redis_test.go b/plugins/tests/integration/limit_count_redis_test.go index 300535c4..c1ef5c64 100644 --- a/plugins/tests/integration/limit_count_redis_test.go +++ b/plugins/tests/integration/limit_count_redis_test.go @@ -44,7 +44,7 @@ func TestLimitCountRedis(t *testing.T) { }{ { name: "sanity", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "e27e2f7f", "address": "redis:6379", "rules": []interface{}{ @@ -74,7 +74,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "multiple rules", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "cd81da10", "address": "redis:6379", "rules": []interface{}{ @@ -113,7 +113,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "single rule, with limit quota headers enabled", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "24e24b12", "address": "redis:6379", "enableLimitQuotaHeaders": true, @@ -142,7 +142,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "multiple rules, with limit quota headers enabled", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "2ce0ecd7", "address": "redis:6379", "enableLimitQuotaHeaders": true, @@ -188,7 +188,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "passwd", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "ff100fd4", "address": "redis:6379", "rules": []interface{}{ @@ -212,7 +212,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "tls", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "f7ce8fed", "address": "redis:6380", "rules": []interface{}{ @@ -236,7 +236,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "rateLimitedStatus", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "b52c8aee", "address": "redis:6379", "rules": []interface{}{ @@ -259,7 +259,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "rateLimitedStatus < 400", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "56102bea", "address": "redis:6379", "rules": []interface{}{ @@ -282,7 +282,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "keep counter across rds update (part 1)", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "f7ce8fcc", "address": "redis:6379", "rules": []interface{}{ @@ -303,7 +303,7 @@ func TestLimitCountRedis(t *testing.T) { }, { name: "keep counter across rds update (part 2)", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "f7ce8fcc", "address": "redis:6379", "rules": []interface{}{ @@ -349,7 +349,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }{ { name: "bad redis", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "6e1643e9", "address": "redisx:6379", "rules": []interface{}{ @@ -366,7 +366,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }, { name: "bad redis, failure mode deny", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "22e1afc9", "address": "redisx:6379", "failureModeDeny": true, @@ -384,7 +384,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }, { name: "statusOnError", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "02945c93", "address": "redisx:6379", "rules": []interface{}{ @@ -404,7 +404,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }, { name: "statusOnError, no failureModeDeny", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "efa91d02", "address": "redisx:6379", "rules": []interface{}{ @@ -423,7 +423,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }, { name: "bad redis, wrong passwd", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "f446d349", "address": "redis:6379", "username": "user", @@ -443,7 +443,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }, { name: "bad redis, tls verify", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "6e4fca85", "address": "redis:6380", "failureModeDeny": true, @@ -462,7 +462,7 @@ func TestLimitCountRedisBadService(t *testing.T) { }, { name: "bad redis, don't produce limit quota headers", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "7f1cf524", "address": "redisx:6379", "rules": []interface{}{ @@ -505,7 +505,7 @@ func TestLimitCountRedisClusterMode(t *testing.T) { }{ { name: "single rules", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "c8e8eeb9", "cluster": map[string]interface{}{ "addresses": []interface{}{ @@ -535,7 +535,7 @@ func TestLimitCountRedisClusterMode(t *testing.T) { }, { name: "multiple rules", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "1d5db164", "cluster": map[string]interface{}{ "addresses": []interface{}{ @@ -609,7 +609,7 @@ func TestLimitCountRedisClusterModeBadService(t *testing.T) { }{ { name: "failure mode deny", - config: controlplane.NewSinglePluinConfig("limitCountRedis", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitCountRedis", map[string]interface{}{ "prefix": "e2cbf683", "cluster": map[string]interface{}{ "addresses": []interface{}{ diff --git a/plugins/tests/integration/limit_req_test.go b/plugins/tests/integration/limit_req_test.go index 442b4130..62ce1202 100644 --- a/plugins/tests/integration/limit_req_test.go +++ b/plugins/tests/integration/limit_req_test.go @@ -41,7 +41,7 @@ func TestLimitReq(t *testing.T) { }{ { name: "rps > 1", - config: controlplane.NewSinglePluinConfig("limitReq", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitReq", map[string]interface{}{ "average": 1, "period": "0.1s", }), @@ -66,7 +66,7 @@ func TestLimitReq(t *testing.T) { }, { name: "rps <= 1", - config: controlplane.NewSinglePluinConfig("limitReq", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitReq", map[string]interface{}{ "average": 1, "period": "60s", }), @@ -79,7 +79,7 @@ func TestLimitReq(t *testing.T) { }, { name: "by header, fallback to source ip", - config: controlplane.NewSinglePluinConfig("limitReq", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitReq", map[string]interface{}{ "average": 1, "key": `request.header("x-key")`, }), @@ -104,7 +104,7 @@ func TestLimitReq(t *testing.T) { }, { name: "complex key", - config: controlplane.NewSinglePluinConfig("limitReq", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("limitReq", map[string]interface{}{ "average": 1, "key": `request.header("x-key") != "" ? request.header("x-key") : source.ip()`, }), diff --git a/plugins/tests/integration/oidc_test.go b/plugins/tests/integration/oidc_test.go index 4487474e..ced42f50 100644 --- a/plugins/tests/integration/oidc_test.go +++ b/plugins/tests/integration/oidc_test.go @@ -64,7 +64,7 @@ func TestOIDC(t *testing.T) { var hydra hydraOutput json.Unmarshal(stdout, &hydra) - config := controlplane.NewSinglePluinConfig("oidc", map[string]interface{}{ + config := controlplane.NewSinglePluginConfig("oidc", map[string]interface{}{ "clientId": hydra.ClientID, "clientSecret": hydra.ClientSecret, "redirectUrl": redirectURL, diff --git a/plugins/tests/integration/opa_test.go b/plugins/tests/integration/opa_test.go index 5f544527..6cc26a58 100644 --- a/plugins/tests/integration/opa_test.go +++ b/plugins/tests/integration/opa_test.go @@ -43,7 +43,7 @@ func TestOpa(t *testing.T) { }{ { name: "happy path", - config: controlplane.NewSinglePluinConfig("opa", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("opa", map[string]interface{}{ "remote": map[string]string{ "url": "http://opa:8181", "policy": "test", @@ -59,7 +59,7 @@ func TestOpa(t *testing.T) { }, { name: "local", - config: controlplane.NewSinglePluinConfig("opa", map[string]interface{}{ + config: controlplane.NewSinglePluginConfig("opa", map[string]interface{}{ "local": map[string]string{ "text": `package test import input.request