sundowndev
/
driftctl
mirror of https://github.com/sundowndev/driftctl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #830 from cloudskiff/issue_823_use_supportedtype 

Use SupportedType() in enumerator
main
Toussaint Louis 2021-07-09 16:17:11 +02:00 committed by GitHub
parent 111681edd9 afe3fc3186
commit 9cb7a57e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/remote/aws/route53_record_enumerator.go
View File

@ -31,7 +31,7 @@ func (e *Route53RecordEnumerator) Enumerate() ([]resource.Resource, error) {
zones, err := e.client.ListAllZones() zones, err := e.client.ListAllZones()
if err != nil { if err != nil {
return nil, remoteerror.NewResourceEnumerationErrorWithType(err, resourceaws.AwsRoute53RecordResourceType, resourceaws.AwsRoute53ZoneResourceType) return nil, remoteerror.NewResourceEnumerationErrorWithType(err, string(e.SupportedType()), resourceaws.AwsRoute53ZoneResourceType)
} }
results := make([]resource.Resource, len(zones)) results := make([]resource.Resource, len(zones))
@ -39,7 +39,7 @@ func (e *Route53RecordEnumerator) Enumerate() ([]resource.Resource, error) {
for _, hostedZone := range zones { for _, hostedZone := range zones {
records, err := e.listRecordsForZone(strings.TrimPrefix(*hostedZone.Id, "/hostedzone/")) records, err := e.listRecordsForZone(strings.TrimPrefix(*hostedZone.Id, "/hostedzone/"))
if err != nil { if err != nil {
return nil, remoteerror.NewResourceEnumerationError(err, resourceaws.AwsRoute53RecordResourceType) return nil, remoteerror.NewResourceEnumerationError(err, string(e.SupportedType()))
} }
results = append(results, records...) results = append(results, records...)

2
pkg/remote/aws/route53_zone_enumerator.go
View File

@ -30,7 +30,7 @@ func (e *Route53ZoneSupplier) SupportedType() resource.ResourceType {
func (e *Route53ZoneSupplier) Enumerate() ([]resource.Resource, error) { func (e *Route53ZoneSupplier) Enumerate() ([]resource.Resource, error) {
zones, err := e.client.ListAllZones() zones, err := e.client.ListAllZones()
if err != nil { if err != nil {
return nil, remoteerror.NewResourceEnumerationError(err, resourceaws.AwsRoute53ZoneResourceType) return nil, remoteerror.NewResourceEnumerationError(err, string(e.SupportedType()))
} }
results := make([]resource.Resource, len(zones)) results := make([]resource.Resource, len(zones))

2
pkg/remote/aws/vpc_default_security_group_enumerator.go
View File

@ -29,7 +29,7 @@ func (e *VPCDefaultSecurityGroupEnumerator) SupportedType() resource.ResourceTyp
func (e *VPCDefaultSecurityGroupEnumerator) Enumerate() ([]resource.Resource, error) { func (e *VPCDefaultSecurityGroupEnumerator) Enumerate() ([]resource.Resource, error) {
_, defaultSecurityGroups, err := e.repository.ListAllSecurityGroups() _, defaultSecurityGroups, err := e.repository.ListAllSecurityGroups()
if err != nil { if err != nil {
return nil, remoteerror.NewResourceEnumerationError(err, resourceaws.AwsSecurityGroupResourceType) return nil, remoteerror.NewResourceEnumerationError(err, string(e.SupportedType()))
} }
results := make([]resource.Resource, 0, len(defaultSecurityGroups)) results := make([]resource.Resource, 0, len(defaultSecurityGroups))

2
pkg/remote/aws/vpc_security_group_enumerator.go
View File

@ -29,7 +29,7 @@ func (e *VPCSecurityGroupEnumerator) SupportedType() resource.ResourceType {
func (e *VPCSecurityGroupEnumerator) Enumerate() ([]resource.Resource, error) { func (e *VPCSecurityGroupEnumerator) Enumerate() ([]resource.Resource, error) {
securityGroups, _, err := e.repository.ListAllSecurityGroups() securityGroups, _, err := e.repository.ListAllSecurityGroups()
if err != nil { if err != nil {
return nil, remoteerror.NewResourceEnumerationError(err, resourceaws.AwsSecurityGroupResourceType) return nil, remoteerror.NewResourceEnumerationError(err, string(e.SupportedType()))
} }
results := make([]resource.Resource, 0, len(securityGroups)) results := make([]resource.Resource, 0, len(securityGroups))