Merge pull request #63 from OpsHelmInc/update-ebs-snapshopts

update ebs snapshot fetching to use paginator
OpsHelmInc · Dec 16, 2023 · 0984ecd · 0984ecd
2 parents fc6846f + deea8ad
commit 0984ecd
Show file tree

Hide file tree

Showing 354 changed files with 515 additions and 502 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -48,5 +48,5 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.51.2
+        version: v1.55.2
         args: --timeout=5m
diff --git a/.golangci.yml b/.golangci.yml
@@ -11,6 +11,10 @@ run:
     - all
 
 linters-settings:
+  gofmt:
+    rewrite-rules:
+      - pattern: 'interface{}'
+        replacement: 'any'
   errcheck:
     check-blank: false
     ignore: fmt:.*,[rR]ead|[wW]rite|[cC]lose,io:Copy
@@ -64,12 +68,15 @@ linters-settings:
         disabled: true
       - name: nested-structs
         disabled: true
+      - name: unchecked-type-assertion
+        disabled: true
+      - name: import-alias-naming
+        disabled: true
 
 linters:
   enable:
     - asciicheck
     - bodyclose
-    - depguard
     - dupl
     - errcheck
     - gocritic
@@ -94,6 +101,7 @@ issues:
       linters:
         - dupl
         - gocritic
+        - revive
       # Exclude some linters from running on resource files.
     - path: resources(\\|\/).*\.go
       linters:

diff --git a/client/client.go b/client/client.go
@@ -409,7 +409,7 @@ func filterDisabledRegions(regions []string, enabledRegions []types.Region) []st
 	return filteredRegions
 }
 
-func (a AwsLogger) Logf(classification logging.Classification, format string, v ...interface{}) {
+func (a AwsLogger) Logf(classification logging.Classification, format string, v ...any) {
 	if classification == logging.Warn {
 		a.l.Warn().Msg(fmt.Sprintf(format, v...))
 	} else {

diff --git a/client/helpers.go b/client/helpers.go
@@ -19,7 +19,7 @@ import (
 type AWSService string
 
 type AwsService struct {
-	Regions map[string]*map[string]interface{} `json:"regions"`
+	Regions map[string]*map[string]any `json:"regions"`
 }
 
 type AwsPartition struct {
@@ -34,10 +34,10 @@ type SupportedServiceRegionsData struct {
 }
 
 // ListResolver is responsible for iterating through entire list of resources that should be grabbed (if API is paginated). It should send list of items via the `resultsChan` so that the DetailResolver can grab the details of each item. All errors should be sent to the error channel.
-type ListResolverFunc func(ctx context.Context, meta schema.ClientMeta, detailChan chan<- interface{}) error
+type ListResolverFunc func(ctx context.Context, meta schema.ClientMeta, detailChan chan<- any) error
 
 // DetailResolveFunc is responsible for grabbing any and all metadata for a resource. All errors should be sent to the error channel.
-type DetailResolverFunc func(ctx context.Context, meta schema.ClientMeta, resultsChan chan<- interface{}, errorChan chan<- error, summary interface{})
+type DetailResolverFunc func(ctx context.Context, meta schema.ClientMeta, resultsChan chan<- any, errorChan chan<- error, summary any)
 
 const (
 	ApigatewayService           AWSService = "apigateway"
@@ -342,7 +342,7 @@ func IsAWSError(err error, code ...string) bool {
 }
 
 // TagsIntoMap expects []T (usually "[]Tag") where T has "Key" and "Value" fields (of type string or *string) and writes them into the given map
-func TagsIntoMap(tagSlice interface{}, dst map[string]string) {
+func TagsIntoMap(tagSlice any, dst map[string]string) {
 	stringify := func(v reflect.Value) string {
 		vt := v.Type()
 		if vt.Kind() == reflect.String {
@@ -386,7 +386,7 @@ func TagsIntoMap(tagSlice interface{}, dst map[string]string) {
 }
 
 // TagsToMap expects []T (usually "[]Tag") where T has "Key" and "Value" fields (of type string or *string) and returns a map
-func TagsToMap(tagSlice interface{}) map[string]string {
+func TagsToMap(tagSlice any) map[string]string {
 	if k := reflect.TypeOf(tagSlice).Kind(); k != reflect.Slice {
 		panic("invalid usage: Only slices are supported as input: " + k.String())
 	}

diff --git a/client/helpers_test.go b/client/helpers_test.go
@@ -21,7 +21,7 @@ func TestResolveARN(t *testing.T) {
 		service    AWSService
 		resourceID func(resource *schema.Resource) ([]string, error)
 		resource   *schema.Resource
-		want       interface{}
+		want       any
 		wantErr    bool
 	}{
 		{
@@ -83,7 +83,7 @@ func TestTagsToMap(t *testing.T) {
 	}
 
 	tests := []struct {
-		Input    interface{}
+		Input    any
 		Expected map[string]string
 	}{
 		{

diff --git a/client/resolvers_test.go b/client/resolvers_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestResolveTags(t *testing.T) {
 	cases := []struct {
-		InputItem    interface{}
+		InputItem    any
 		ExpectedTags map[string]string
 	}{
 		{

diff --git a/resources/services/accessanalyzer/analyzers_fetch.go b/resources/services/accessanalyzer/analyzers_fetch.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchAccessanalyzerAnalyzers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchAccessanalyzerAnalyzers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	config := accessanalyzer.ListAnalyzersInput{}
 	c := meta.(*client.Client)
 	svc := c.Services().Accessanalyzer
@@ -44,7 +44,7 @@ func fetchAccessanalyzerAnalyzers(ctx context.Context, meta schema.ClientMeta, p
 	return nil
 }
 
-func fetchAccessanalyzerAnalyzerFindings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchAccessanalyzerAnalyzerFindings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	analyzer := parent.Item.(types.AnalyzerSummary)
 	c := meta.(*client.Client)
 	svc := c.Services().Accessanalyzer
@@ -66,7 +66,7 @@ func fetchAccessanalyzerAnalyzerFindings(ctx context.Context, meta schema.Client
 	return nil
 }
 
-func fetchAccessanalyzerAnalyzerArchiveRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchAccessanalyzerAnalyzerArchiveRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	analyzer := parent.Item.(types.AnalyzerSummary)
 	c := meta.(*client.Client)
 	svc := c.Services().Accessanalyzer

diff --git a/resources/services/account/alternate_contacts_fetch.go b/resources/services/account/alternate_contacts_fetch.go
@@ -9,7 +9,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchAccountAlternateContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchAccountAlternateContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	cl := meta.(*client.Client)
 	svc := cl.Services().Account
 	var contactTypes types.AlternateContactType

diff --git a/resources/services/account/contacts_fetch.go b/resources/services/account/contacts_fetch.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchAccountContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchAccountContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	cl := meta.(*client.Client)
 	svc := cl.Services().Account
 	var input account.GetContactInformationInput

diff --git a/resources/services/acm/certificates_fetch.go b/resources/services/acm/certificates_fetch.go
@@ -9,7 +9,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchAcmCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchAcmCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	cl := meta.(*client.Client)
 	svc := cl.Services().Acm
 	var input acm.ListCertificatesInput

diff --git a/resources/services/apigateway/api_keys_fetch.go b/resources/services/apigateway/api_keys_fetch.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchApigatewayApiKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayApiKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	config := apigateway.GetApiKeysInput{
 		IncludeValues: aws.Bool(true),
 	}

diff --git a/resources/services/apigateway/client_certificates_fetch.go b/resources/services/apigateway/client_certificates_fetch.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchApigatewayClientCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayClientCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	var config apigateway.GetClientCertificatesInput
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway

diff --git a/resources/services/apigateway/domain_names_fetch.go b/resources/services/apigateway/domain_names_fetch.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchApigatewayDomainNames(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayDomainNames(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	var config apigateway.GetDomainNamesInput
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -36,7 +36,7 @@ func resolveApigatewayDomainNameArn(ctx context.Context, meta schema.ClientMeta,
 		Resource:  fmt.Sprintf("/domainnames/%s", aws.ToString(domain.DomainName)),
 	}.String())
 }
-func fetchApigatewayDomainNameBasePathMappings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayDomainNameBasePathMappings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.DomainName)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway

diff --git a/resources/services/apigateway/rest_apis_fetch.go b/resources/services/apigateway/rest_apis_fetch.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchApigatewayRestApis(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApis(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	var config apigateway.GetRestApisInput
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -36,7 +36,7 @@ func resolveApigatewayRestAPIArn(ctx context.Context, meta schema.ClientMeta, re
 		Resource:  fmt.Sprintf("/restapis/%s", aws.ToString(rapi.Id)),
 	}.String())
 }
-func fetchApigatewayRestApiAuthorizers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiAuthorizers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -69,7 +69,7 @@ func resolveApigatewayRestAPIAuthorizerArn(ctx context.Context, meta schema.Clie
 		Resource:  fmt.Sprintf("/restapis/%s/authorizers/%s", aws.ToString(rapi.Id), aws.ToString(auth.Id)),
 	}.String())
 }
-func fetchApigatewayRestApiDeployments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiDeployments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -98,7 +98,7 @@ func resolveApigatewayRestAPIDeploymentArn(ctx context.Context, meta schema.Clie
 		Resource:  fmt.Sprintf("/restapis/%s/deployments/%s", aws.ToString(rapi.Id), aws.ToString(d.Id)),
 	}.String())
 }
-func fetchApigatewayRestApiDocumentationParts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiDocumentationParts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -131,7 +131,7 @@ func resolveApigatewayRestAPIDocumentationPartArn(ctx context.Context, meta sche
 		Resource:  fmt.Sprintf("/restapis/%s/documentation/parts/%s", aws.ToString(rapi.Id), aws.ToString(d.Id)),
 	}.String())
 }
-func fetchApigatewayRestApiDocumentationVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiDocumentationVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -164,7 +164,7 @@ func resolveApigatewayRestAPIDocumentationVersionArn(ctx context.Context, meta s
 		Resource:  fmt.Sprintf("/restapis/%s/documentation/versions/%s", aws.ToString(rapi.Id), aws.ToString(v.Version)),
 	}.String())
 }
-func fetchApigatewayRestApiGatewayResponses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiGatewayResponses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -197,7 +197,7 @@ func resolveApigatewayRestAPIGatewayResponseArn(ctx context.Context, meta schema
 		Resource:  fmt.Sprintf("/restapis/%s/gatewayresponses/%s", aws.ToString(rapi.Id), string(r.ResponseType)),
 	}.String())
 }
-func fetchApigatewayRestApiModels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiModels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -257,7 +257,7 @@ func resolveApigatewayRestAPIModelModelTemplate(ctx context.Context, meta schema
 	}
 	return resource.Set(c.Name, response.Value)
 }
-func fetchApigatewayRestApiRequestValidators(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiRequestValidators(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -290,7 +290,7 @@ func resolveApigatewayRestAPIRequestValidatorArn(ctx context.Context, meta schem
 		Resource:  fmt.Sprintf("/restapis/%s/requestvalidators/%s", aws.ToString(rapi.Id), aws.ToString(r.Id)),
 	}.String())
 }
-func fetchApigatewayRestApiResources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiResources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -319,7 +319,7 @@ func resolveApigatewayRestAPIResourceArn(ctx context.Context, meta schema.Client
 		Resource:  fmt.Sprintf("/restapis/%s/resources/%s", aws.ToString(rapi.Id), aws.ToString(r.Id)),
 	}.String())
 }
-func fetchApigatewayRestApiStages(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayRestApiStages(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.RestApi)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway

diff --git a/resources/services/apigateway/usage_plans_fetch.go b/resources/services/apigateway/usage_plans_fetch.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchApigatewayUsagePlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayUsagePlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	var config apigateway.GetUsagePlansInput
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway
@@ -36,7 +36,7 @@ func resolveApigatewayUsagePlanArn(ctx context.Context, meta schema.ClientMeta,
 		Resource:  fmt.Sprintf("/usageplans/%s", aws.ToString(up.Id)),
 	}.String())
 }
-func fetchApigatewayUsagePlanKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayUsagePlanKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	r := parent.Item.(types.UsagePlan)
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway

diff --git a/resources/services/apigateway/vpc_links_fetch.go b/resources/services/apigateway/vpc_links_fetch.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/schema"
 )
 
-func fetchApigatewayVpcLinks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
+func fetchApigatewayVpcLinks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
 	var config apigateway.GetVpcLinksInput
 	c := meta.(*client.Client)
 	svc := c.Services().Apigateway