mirror of
https://github.com/coredns/coredns.git
synced 2025-10-29 01:04:15 -04:00
plugin/route53: remove amazon intialization from init (#3348)
Don't perform this code in the init, this allocated 1 megabyte of memory even if you don't use the plugin. Looks to be only there for testing, adding a comment to reflect that. Fixes #3342 Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
@@ -24,20 +24,14 @@ import (
|
|||||||
|
|
||||||
var log = clog.NewWithPlugin("route53")
|
var log = clog.NewWithPlugin("route53")
|
||||||
|
|
||||||
func init() {
|
func init() { plugin.Register("route53", setup) }
|
||||||
plugin.Register("route53",
|
|
||||||
func(c *caddy.Controller) error {
|
// exposed for testing
|
||||||
f := func(credential *credentials.Credentials) route53iface.Route53API {
|
var f = func(credential *credentials.Credentials) route53iface.Route53API {
|
||||||
return route53.New(session.Must(session.NewSession(&aws.Config{
|
return route53.New(session.Must(session.NewSession(&aws.Config{Credentials: credential})))
|
||||||
Credentials: credential,
|
|
||||||
})))
|
|
||||||
}
|
|
||||||
return setup(c, f)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func setup(c *caddy.Controller, f func(*credentials.Credentials) route53iface.Route53API) error {
|
func setup(c *caddy.Controller) error {
|
||||||
for c.Next() {
|
for c.Next() {
|
||||||
keyPairs := map[string]struct{}{}
|
keyPairs := map[string]struct{}{}
|
||||||
keys := map[string][]string{}
|
keys := map[string][]string{}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestSetupRoute53(t *testing.T) {
|
func TestSetupRoute53(t *testing.T) {
|
||||||
f := func(credential *credentials.Credentials) route53iface.Route53API {
|
f = func(credential *credentials.Credentials) route53iface.Route53API {
|
||||||
return fakeRoute53{}
|
return fakeRoute53{}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,7 +73,7 @@ func TestSetupRoute53(t *testing.T) {
|
|||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
c := caddy.NewTestController("dns", test.body)
|
c := caddy.NewTestController("dns", test.body)
|
||||||
if err := setup(c, f); (err == nil) == test.expectedError {
|
if err := setup(c); (err == nil) == test.expectedError {
|
||||||
t.Errorf("Unexpected errors: %v", err)
|
t.Errorf("Unexpected errors: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user