refactor: s/CostExplorable/CostExplorer

grafana · Dec 5, 2023 · 4c9e930 · 4c9e930
1 parent e51b26d
commit 4c9e930
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/mocks/pkg/aws/costexplorer/CostExplorable.go → mocks/pkg/aws/costexplorer/CostExplorer.go b/mocks/pkg/aws/costexplorer/CostExplorable.go → mocks/pkg/aws/costexplorer/CostExplorer.go
diff --git a/pkg/aws/costexplorer/costexplorer.go b/pkg/aws/costexplorer/costexplorer.go
@@ -7,15 +7,15 @@ import (
 )
 
 var (
-	_ CostExplorable = Client{}
+	_ CostExplorer = Client{}
 )
 
-type CostExplorable interface {
+type CostExplorer interface {
 	GetCostAndUsage(ctx context.Context, params *costexplorer.GetCostAndUsageInput, optFns ...func(*costexplorer.Options)) (*costexplorer.GetCostAndUsageOutput, error)
 }
 
 type Client struct {
-	c CostExplorable
+	c CostExplorer
 }
 
 func (c Client) GetCostAndUsage(ctx context.Context, params *costexplorer.GetCostAndUsageInput, optFns ...func(*costexplorer.Options)) (*costexplorer.GetCostAndUsageOutput, error) {

diff --git a/pkg/aws/s3/s3.go b/pkg/aws/s3/s3.go
@@ -104,13 +104,13 @@ var (
 // Collector is the AWS implementation of the Collector interface
 // It is responsible for registering and collecting metrics
 type Collector struct {
-	client     costexplorer.CostExplorable
+	client     costexplorer.CostExplorer
 	interval   time.Duration
 	nextScrape time.Time
 }
 
 // New creates a new Collector with a client and scrape interval defined.
-func New(scrapeInterval time.Duration, client costexplorer.CostExplorable) (*Collector, error) {
+func New(scrapeInterval time.Duration, client costexplorer.CostExplorer) (*Collector, error) {
 	return &Collector{
 		client:   client,
 		interval: scrapeInterval,
@@ -220,7 +220,7 @@ func (s S3BillingData) AddMetricGroup(region string, component string, group typ
 
 // getBillingData is responsible for making the API call to the AWS Cost Explorer API and parsing the response
 // into a S3BillingData struct
-func getBillingData(client costexplorer.CostExplorable, startDate time.Time, endDate time.Time) (S3BillingData, error) {
+func getBillingData(client costexplorer.CostExplorer, startDate time.Time, endDate time.Time) (S3BillingData, error) {
 	log.Printf("Getting billing data for %s to %s\n", startDate.Format("2006-01-02"), endDate.Format("2006-01-02"))
 	input := &awscostexplorer.GetCostAndUsageInput{
 		TimePeriod: &types.DateInterval{
@@ -329,7 +329,7 @@ func getComponentFromKey(key string) string {
 }
 
 // ExportBillingData will query the previous 30 days of S3 billing data and export it to the prometheus metrics
-func ExportBillingData(client costexplorer.CostExplorable) error {
+func ExportBillingData(client costexplorer.CostExplorer) error {
 	// We go one day into the past as the current days billing data has no guarantee of being complete
 	endDate := time.Now().AddDate(0, 0, -1)
 	// Current assumption is that we're going to pull 30 days worth of billing data

diff --git a/pkg/aws/s3/s3_test.go b/pkg/aws/s3/s3_test.go
@@ -160,7 +160,7 @@ func TestS3BillingData_AddRegion(t *testing.T) {
 func TestNewCollector(t *testing.T) {
 	type args struct {
 		interval time.Duration
-		client   costexplorer.CostExplorable
+		client   costexplorer.CostExplorer
 	}
 	tests := map[string]struct {
 		args  args
@@ -177,7 +177,7 @@ func TestNewCollector(t *testing.T) {
 	}
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
-			c := mockcostexplorer.NewCostExplorable(t)
+			c := mockcostexplorer.NewCostExplorer(t)
 
 			got, err := New(tt.args.interval, c)
 			if tt.error {
@@ -221,7 +221,7 @@ func TestExportBillingData(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			ce := mockcostexplorer.NewCostExplorable(t)
+			ce := mockcostexplorer.NewCostExplorer(t)
 			if tc.GetCostAndUsage != nil {
 				ce.EXPECT().
 					GetCostAndUsage(mock.Anything, mock.Anything, mock.Anything).