fix: nil pointer error due to missing aws connection

flanksource · Jun 3, 2024 · e3d74b8 · e3d74b8
1 parent ea3b58a
commit e3d74b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/api/v1/aws.go b/api/v1/aws.go
@@ -9,13 +9,13 @@ import (
 
 // AWS ...
 type AWS struct {
-	BaseScraper    `json:",inline"`
-	*AWSConnection `json:",inline"`
-	Compliance     bool          `json:"compliance,omitempty"`
-	CloudTrail     CloudTrail    `json:"cloudtrail,omitempty"`
-	Include        []string      `json:"include,omitempty"`
-	Exclude        []string      `json:"exclude,omitempty"`
-	CostReporting  CostReporting `json:"costReporting,omitempty"`
+	BaseScraper   `json:",inline"`
+	AWSConnection `json:",inline"`
+	Compliance    bool          `json:"compliance,omitempty"`
+	CloudTrail    CloudTrail    `json:"cloudtrail,omitempty"`
+	Include       []string      `json:"include,omitempty"`
+	Exclude       []string      `json:"exclude,omitempty"`
+	CostReporting CostReporting `json:"costReporting,omitempty"`
 }
 
 type CloudTrail struct {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/scrapers/aws/aws.go b/scrapers/aws/aws.go
@@ -64,7 +64,7 @@ func (ctx AWSContext) String() string {
 }
 
 func (aws Scraper) getContext(ctx api.ScrapeContext, awsConfig v1.AWS, region string) (*AWSContext, error) {
-	session, err := NewSession(ctx, *awsConfig.AWSConnection, region)
+	session, err := NewSession(ctx, awsConfig.AWSConnection, region)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create AWS session for region=%q: %w", region, err)
 	}

diff --git a/scrapers/aws/cost.go b/scrapers/aws/cost.go
@@ -57,7 +57,7 @@ func getAWSAthenaConfig(ctx api.ScrapeContext, awsConfig v1.AWS) (*athena.Config
 		return nil, err
 	}
 
-	accessKey, secretKey, err := getAccessAndSecretKey(ctx, *awsConfig.AWSConnection)
+	accessKey, secretKey, err := getAccessAndSecretKey(ctx, awsConfig.AWSConnection)
 	if err != nil {
 		return nil, err
 	}
@@ -144,7 +144,7 @@ func (awsCost CostScraper) Scrape(ctx api.ScrapeContext) v1.ScrapeResults {
 	var results v1.ScrapeResults
 
 	for _, awsConfig := range ctx.ScrapeConfig().Spec.AWS {
-		session, err := NewSession(ctx, *awsConfig.AWSConnection, awsConfig.Region[0])
+		session, err := NewSession(ctx, awsConfig.AWSConnection, awsConfig.Region[0])
 		if err != nil {
 			return results.Errorf(err, "failed to create AWS session")
 		}