Review changes

pkg/awsclient/awsclient.go

@@ -33,16 +33,6 @@ type awsClient struct {
 	serviceQuotasClient servicequotasiface.ServiceQuotasAPI
 }
 
-// NewAwsClientInput input for new aws client
-type NewAwsClientInput struct {
-	AwsCredsSecretIDKey     string
-	AwsCredsSecretAccessKey string
-	AwsToken                string
-	AwsRegion               string
-	SecretName              string
-	NameSpace               string
-}
-
 func (c *awsClient) DescribeTransitGatewaysWithContext(ctx aws.Context, input *ec2.DescribeTransitGatewaysInput, opts ...request.Option) (*ec2.DescribeTransitGatewaysOutput, error) {
 	return c.ec2Client.DescribeTransitGatewaysWithContext(ctx, input, opts...)
 }

pkg/ec2.go

@@ -120,7 +120,7 @@ func getAllTransitGatewaysWithContext(client awsclient.Client, ctx context.Conte
 		return nil, err
 	}
 	results = append(results, describeGatewaysOutput.TransitGateways...)
-
+	// TODO: replace with aws-go-sdk pagination method
 	for describeGatewaysOutput.NextToken != nil {
 		describeGatewaysInput.SetNextToken(*describeGatewaysOutput.NextToken)
 		describeGatewaysOutput, err := client.DescribeTransitGatewaysWithContext(ctx, describeGatewaysInput)

pkg/ec2_test.go

@@ -38,10 +38,10 @@ func TestGetQuotaValueWithContext(t *testing.T) {
 
 	mockClient.EXPECT().GetServiceQuotaWithContext(ctx,
 		createGetServiceQuotaInput(ec2ServiceCode, transitGatewayPerAccountQuotaCode)).Return(
-		&servicequotas.GetServiceQuotaOutput{Quota: &servicequotas.ServiceQuota{Value: aws.Float64(1337.0)}}, nil,
+		&servicequotas.GetServiceQuotaOutput{Quota: &servicequotas.ServiceQuota{Value: aws.Float64(123.0)}}, nil,
 	)
 
 	quotaValue, err := getQuotaValueWithContext(mockClient, ec2ServiceCode, transitGatewayPerAccountQuotaCode, ctx)
 	assert.Nil(t, err)
-	assert.Equal(t, quotaValue, 1337.0)
+	assert.Equal(t, quotaValue, 123.0)
 }

pkg/route53.go

@@ -112,7 +112,7 @@ func (e *Route53Exporter) getHostedZonesPerAccountMetrics(client awsclient.Clien
 // CollectLoop runs indefinitely to collect the route53 metrics in a cache. Metrics are only written into the cache once all have been collected to ensure that we don't have a partial collect.
 func (e *Route53Exporter) CollectLoop() {
 	route53Svc := route53.New(e.sess)
-	awsclient := awsclient.NewClientFromSession(e.sess)
+	client := awsclient.NewClientFromSession(e.sess)
 
 	for {
 		ctx, ctxCancelFunc := context.WithTimeout(context.Background(), e.timeout)
@@ -127,7 +127,7 @@ func (e *Route53Exporter) CollectLoop() {
 			AwsExporterMetrics.IncrementErrors()
 		}
 
-		err = e.getHostedZonesPerAccountMetrics(awsclient, hostedZones, ctx)
+		err = e.getHostedZonesPerAccountMetrics(client, hostedZones, ctx)
 		if err != nil {
 			level.Error(e.logger).Log("msg", "Could not get limits for hosted zone", "error", err.Error())
 			AwsExporterMetrics.IncrementErrors()