move context to first argument

Signed-off-by: Sean Holcomb <seanholcomb@gmail.com>

pkg/cloudcost/querier.go

@@ -12,7 +12,7 @@ import (
 
 // Querier allows for querying ranges of CloudCost data
 type Querier interface {
-	Query(QueryRequest, context.Context) (*opencost.CloudCostSetRange, error)
+	Query(context.Context, QueryRequest) (*opencost.CloudCostSetRange, error)
 }
 
 type QueryRequest struct {
@@ -28,9 +28,9 @@ const DefaultChartItemsLength int = 10
 
 // ViewQuerier defines a contract for return View types to the QueryService to service the View Api
 type ViewQuerier interface {
-	QueryViewGraph(ViewQueryRequest, context.Context) (ViewGraphData, error)
-	QueryViewTotals(ViewQueryRequest, context.Context) (*ViewTotals, error)
-	QueryViewTable(ViewQueryRequest, context.Context) (ViewTableRows, error)
+	QueryViewGraph(context.Context, ViewQueryRequest) (ViewGraphData, error)
+	QueryViewTotals(context.Context, ViewQueryRequest) (*ViewTotals, error)
+	QueryViewTable(context.Context, ViewQueryRequest) (ViewTableRows, error)
 }
 
 type ViewQueryRequest struct {

pkg/cloudcost/queryservice.go

@@ -55,7 +55,7 @@ func (s *QueryService) GetCloudCostHandler() func(w http.ResponseWriter, r *http
 			return
 		}
 
-		resp, err := s.Querier.Query(*request, ctx)
+		resp, err := s.Querier.Query(ctx, *request)
 		if err != nil {
 			http.Error(w, fmt.Sprintf("Internal server error: %s", err), http.StatusInternalServerError)
 			return
@@ -93,7 +93,7 @@ func (s *QueryService) GetCloudCostViewGraphHandler() func(w http.ResponseWriter
 			return
 		}
 
-		resp, err := s.ViewQuerier.QueryViewGraph(*request, ctx)
+		resp, err := s.ViewQuerier.QueryViewGraph(ctx, *request)
 		if err != nil {
 			http.Error(w, fmt.Sprintf("Internal server error: %s", err), http.StatusInternalServerError)
 			return
@@ -131,7 +131,7 @@ func (s *QueryService) GetCloudCostViewTotalsHandler() func(w http.ResponseWrite
 			return
 		}
 
-		resp, err := s.ViewQuerier.QueryViewTotals(*request, ctx)
+		resp, err := s.ViewQuerier.QueryViewTotals(ctx, *request)
 		if err != nil {
 			http.Error(w, fmt.Sprintf("Internal server error: %s", err), http.StatusInternalServerError)
 			return
@@ -178,7 +178,7 @@ func (s *QueryService) GetCloudCostViewTableHandler() func(w http.ResponseWriter
 			w.Header().Set("Content-Type", "application/json")
 		}
 
-		resp, err := s.ViewQuerier.QueryViewTable(*request, ctx)
+		resp, err := s.ViewQuerier.QueryViewTable(ctx, *request)
 		if err != nil {
 			http.Error(w, fmt.Sprintf("Internal server error: %s", err), http.StatusInternalServerError)
 			return

pkg/cloudcost/repositoryquerier.go

@@ -18,7 +18,7 @@ func NewRepositoryQuerier(repo Repository) *RepositoryQuerier {
 	return &RepositoryQuerier{repo: repo}
 }
 
-func (rq *RepositoryQuerier) Query(request QueryRequest, ctx context.Context) (*opencost.CloudCostSetRange, error) {
+func (rq *RepositoryQuerier) Query(ctx context.Context, request QueryRequest) (*opencost.CloudCostSetRange, error) {
 	repoKeys, err := rq.repo.Keys()
 	if err != nil {
 		return nil, fmt.Errorf("RepositoryQuerier: Query: failed to get list of keys from repository: %w", err)
@@ -67,8 +67,8 @@ func (rq *RepositoryQuerier) Query(request QueryRequest, ctx context.Context) (*
 	return ccsr, nil
 }
 
-func (rq *RepositoryQuerier) QueryViewGraph(request ViewQueryRequest, ctx context.Context) (ViewGraphData, error) {
-	ccasr, err := rq.Query(request.QueryRequest, ctx)
+func (rq *RepositoryQuerier) QueryViewGraph(ctx context.Context, request ViewQueryRequest) (ViewGraphData, error) {
+	ccasr, err := rq.Query(ctx, request.QueryRequest)
 	if err != nil {
 		return nil, fmt.Errorf("QueryViewGraph: query failed: %w", err)
 	}
@@ -114,8 +114,8 @@ func (rq *RepositoryQuerier) QueryViewGraph(request ViewQueryRequest, ctx contex
 	return sets, nil
 }
 
-func (rq *RepositoryQuerier) QueryViewTotals(request ViewQueryRequest, ctx context.Context) (*ViewTotals, error) {
-	ccasr, err := rq.Query(request.QueryRequest, ctx)
+func (rq *RepositoryQuerier) QueryViewTotals(ctx context.Context, request ViewQueryRequest) (*ViewTotals, error) {
+	ccasr, err := rq.Query(ctx, request.QueryRequest)
 	if err != nil {
 		return nil, fmt.Errorf("QueryViewTotals: query failed: %w", err)
 	}
@@ -155,8 +155,8 @@ func (rq *RepositoryQuerier) QueryViewTotals(request ViewQueryRequest, ctx conte
 	}, nil
 }
 
-func (rq *RepositoryQuerier) QueryViewTable(request ViewQueryRequest, ctx context.Context) (ViewTableRows, error) {
-	ccasr, err := rq.Query(request.QueryRequest, ctx)
+func (rq *RepositoryQuerier) QueryViewTable(ctx context.Context, request ViewQueryRequest) (ViewTableRows, error) {
+	ccasr, err := rq.Query(ctx, request.QueryRequest)
 	if err != nil {
 		return nil, fmt.Errorf("QueryViewTable: query failed: %w", err)
 	}