From 524d18ba4ecbfbe289476a324a7db94998c19d38 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Tue, 21 Jun 2016 14:11:54 -0700 Subject: Make things start faster Signed-off-by: Dave Henderson --- aws/ec2info.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aws/ec2info.go b/aws/ec2info.go index deb9814f..0261eb02 100644 --- a/aws/ec2info.go +++ b/aws/ec2info.go @@ -8,7 +8,7 @@ import ( // Ec2Info - type Ec2Info struct { - describer InstanceDescriber + describer func() InstanceDescriber metaClient *Ec2Meta } @@ -17,14 +17,14 @@ type InstanceDescriber interface { DescribeInstances(*ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) } -// var _ InstanceDescriber = (*ec2.EC2)(nil) - // NewEc2Info - func NewEc2Info() *Ec2Info { metaClient := &Ec2Meta{} - region := metaClient.Region() return &Ec2Info{ - describer: ec2Client(region), + describer: func() InstanceDescriber { + region := metaClient.Region() + return ec2Client(region) + }, metaClient: metaClient, } } @@ -42,7 +42,7 @@ func (e *Ec2Info) Tag(tag string, def ...string) string { input := &ec2.DescribeInstancesInput{ InstanceIds: aws.StringSlice([]string{instanceID}), } - output, err := e.describer.DescribeInstances(input) + output, err := e.describer().DescribeInstances(input) if err != nil { return returnDefault(def) } -- cgit v1.2.3