TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

plugin/route53: remove amazon intialization from init (#3348)

Browse source 
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:
Miek Gieben 2019-10-03 07:21:11 +01:00 • committed by GitHub
parent 8fde7407d9
commit aa96d6b443
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugin/route53/setup.go
View file

@ -24,20 +24,14 @@ import (
var log = clog.NewWithPlugin("route53")
func init() {
plugin.Register("route53",
func(c *caddy.Controller) error {
f := func(credential *credentials.Credentials) route53iface.Route53API {
return route53.New(session.Must(session.NewSession(&aws.Config{
Credentials: credential,
})))
}
return setup(c, f)
},
)
func init() { plugin.Register("route53", setup) }
// exposed for testing
var f = func(credential *credentials.Credentials) route53iface.Route53API {
return route53.New(session.Must(session.NewSession(&aws.Config{Credentials: credential})))
}
func setup(c *caddy.Controller, f func(*credentials.Credentials) route53iface.Route53API) error {
func setup(c *caddy.Controller) error {
for c.Next() {
keyPairs := map[string]struct{}{}
keys := map[string][]string{}

4
plugin/route53/setup_test.go
View file

@ -9,7 +9,7 @@ import (
)
func TestSetupRoute53(t *testing.T) {
f := func(credential *credentials.Credentials) route53iface.Route53API {
f = func(credential *credentials.Credentials) route53iface.Route53API {
return fakeRoute53{}
}
@ -73,7 +73,7 @@ func TestSetupRoute53(t *testing.T) {
for _, test := range tests {
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)
}
}