Skip to content
This repository has been archived by the owner on Aug 16, 2022. It is now read-only.

fix: Ignore NotFound on all aws resoruces #982

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion client/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,13 @@ func IgnoreAccessDeniedServiceDisabled(err error) bool {
return false
}

func IgnoreCommonErrors(err error) bool {
if IgnoreAccessDeniedServiceDisabled(err) || IgnoreNotAvailableRegion(err) || IgnoreWithInvalidAction(err) || isNotFoundError(err) {
return true
}
return false
}

func IgnoreWithInvalidAction(err error) bool {
var ae smithy.APIError
if errors.As(err, &ae) {
Expand Down Expand Up @@ -272,14 +279,21 @@ func ResolveARNGlobal(service AWSService, resourceID func(resource *schema.Resou

// IsNotFoundError checks if api error should be ignored
func (c *Client) IsNotFoundError(err error) bool {
if isNotFoundError(err) {
c.logger.Warn("API returned \"NotFound\" error ignoring it...", "error", err)
return true
}
return false
}

func isNotFoundError(err error) bool {
var ae smithy.APIError
if !errors.As(err, &ae) {
return false
}
errorCode := ae.ErrorCode()
for _, s := range notFoundErrorPrefixes {
if strings.Contains(errorCode, s) {
c.logger.Warn("API returned \"NotFound\" error ignoring it...", "error", err)
return true
}
}
Expand Down
2 changes: 1 addition & 1 deletion resources/services/acm/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func AcmCertificates() *schema.Table {
Description: "Contains metadata about an ACM certificate",
Resolver: fetchAcmCertificates,
Multiplex: client.ServiceAccountRegionMultiplexer("acm"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/dms/replication_instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func DmsReplicationInstances() *schema.Table {
Description: "Provides information that defines a replication instance.",
Resolver: fetchDmsReplicationInstances,
Multiplex: client.ServiceAccountRegionMultiplexer("dms"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "arn"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/customer_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Ec2CustomerGateways() *schema.Table {
Description: "Describes a customer gateway.",
Resolver: fetchEc2CustomerGateways,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/ebs_snapshots.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func Ec2EbsSnapshots() *schema.Table {
Description: "Describes a snapshot.",
Resolver: fetchEc2EbsSnapshots,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "snapshot_id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/ebs_volumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Ec2EbsVolumes() *schema.Table {
Name: "aws_ec2_ebs_volumes",
Resolver: fetchEc2EbsVolumes,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/egress_only_internet_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func EgressOnlyInternetGateways() *schema.Table {
Description: "Describes an egress-only internet gateway.",
Resolver: fetchEc2EgressOnlyInternetGateways,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/eips.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Ec2Eips() *schema.Table {
Description: "Describes an Elastic IP address, or a carrier IP address.",
Resolver: fetchEc2Eips,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "allocation_id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/flow_logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2FlowLogs() *schema.Table {
Description: "Describes a flow log.",
Resolver: fetchEc2FlowLogs,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
6 changes: 3 additions & 3 deletions resources/services/ec2/gen.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ add_generate = true
resource "aws" "ec2" "egress_only_internet_gateways" {
path = "github.com/aws/aws-sdk-go-v2/service/ec2/types.EgressOnlyInternetGateway"
ignoreError "IgnoreAccessDenied" {
path = "github.com/cloudquery/cq-provider-aws/client.IgnoreAccessDeniedServiceDisabled"
path = "github.com/cloudquery/cq-provider-aws/client.IgnoreCommonErrors"
}
deleteFilter "AccountRegionFilter" {
path = "github.com/cloudquery/cq-provider-aws/client.DeleteAccountRegionFilter"
Expand Down Expand Up @@ -62,7 +62,7 @@ resource "aws" "ec2" "egress_only_internet_gateways" {
resource "aws" "ec2" "network_interfaces" {
path = "github.com/aws/aws-sdk-go-v2/service/ec2/types.NetworkInterface"
ignoreError "IgnoreAccessDenied" {
path = "github.com/cloudquery/cq-provider-aws/client.IgnoreAccessDeniedServiceDisabled"
path = "github.com/cloudquery/cq-provider-aws/client.IgnoreCommonErrors"
}
deleteFilter "AccountRegionFilter" {
path = "github.com/cloudquery/cq-provider-aws/client.DeleteAccountRegionFilter"
Expand Down Expand Up @@ -146,7 +146,7 @@ resource "aws" "ec2" "network_interfaces" {
resource "aws" "ec2" "hosts" {
path = "github.com/aws/aws-sdk-go-v2/service/ec2/types.Host"
ignoreError "IgnoreAccessDenied" {
path = "github.com/cloudquery/cq-provider-aws/client.IgnoreAccessDeniedServiceDisabled"
path = "github.com/cloudquery/cq-provider-aws/client.IgnoreCommonErrors"
}
deleteFilter "AccountRegionFilter" {
path = "github.com/cloudquery/cq-provider-aws/client.DeleteAccountRegionFilter"
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func Hosts() *schema.Table {
Description: "Describes the properties of the Dedicated Host.",
Resolver: fetchEc2Hosts,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
IgnoreInTests: true,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func Ec2Images() *schema.Table {
Description: "Describes an image.",
Resolver: fetchEc2Images,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/instance_statuses.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2InstanceStatuses() *schema.Table {
Description: "Describes the status of an instance.",
Resolver: fetchEc2InstanceStatuses,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func Ec2Instances() *schema.Table {
Description: "Describes an instance.",
Resolver: fetchEc2Instances,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/internet_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2InternetGateways() *schema.Table {
Description: "Describes an internet gateway.",
Resolver: fetchEc2InternetGateways,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/nat_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2NatGateways() *schema.Table {
Description: "Describes a NAT gateway.",
Resolver: fetchEc2NatGateways,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/network_acls.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2NetworkAcls() *schema.Table {
Description: "Describes a network ACL.",
Resolver: fetchEc2NetworkAcls,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/network_interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func NetworkInterfaces() *schema.Table {
Description: "Describes a network interface.",
Resolver: fetchEc2NetworkInterfaces,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/regional_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func Ec2RegionalConfig() *schema.Table {
Description: "Ec2 Regional Config defines common default configuration for ec2 service",
Resolver: fetchEc2RegionalConfig,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "region"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/regions.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func AwsRegions() *schema.Table {
Description: "Describes a Region.",
Resolver: fetchRegions,
Multiplex: client.AccountMultiplex,
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountFilter,
Columns: []schema.Column{
{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/route_tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2RouteTables() *schema.Table {
Description: "Describes a route table.",
Resolver: fetchEc2RouteTables,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/security_groups.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func Ec2SecurityGroups() *schema.Table {
Description: "Describes a security group .",
Resolver: fetchEc2SecurityGroups,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/subnets.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2Subnets() *schema.Table {
Description: "Describes a subnet.",
Resolver: fetchEc2Subnets,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/transit_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Ec2TransitGateways() *schema.Table {
Name: "aws_ec2_transit_gateways",
Resolver: fetchEc2TransitGateways,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/vpc_endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2VpcEndpoints() *schema.Table {
Description: "Describes a VPC endpoint.",
Resolver: fetchEc2VpcEndpoints,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/vpc_peering_connections.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2VpcPeeringConnections() *schema.Table {
Description: "Describes a VPC peering connection.",
Resolver: fetchEc2VpcPeeringConnections,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "region", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/vpcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Ec2Vpcs() *schema.Table {
Description: "Describes a VPC.",
Resolver: fetchEc2Vpcs,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ec2/vpn_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func Ec2VpnGateways() *schema.Table {
Name: "aws_ec2_vpn_gateways",
Resolver: fetchEc2VpnGateways,
Multiplex: client.ServiceAccountRegionMultiplexer("ec2"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ecr/repositories.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func EcrRepositories() *schema.Table {
Description: "An object representing a repository.",
Resolver: fetchEcrRepositories,
Multiplex: client.ServiceAccountRegionMultiplexer("api.ecr"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "arn"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ecs/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func Clusters() *schema.Table {
Description: "A regional grouping of one or more container instances where you can run task requests",
Resolver: fetchEcsClusters,
Multiplex: client.ServiceAccountRegionMultiplexer("ecs"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/ecs/task_definitions.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func EcsTaskDefinitions() *schema.Table {
Description: "The details of a task definition which describes the container and volume definitions of an Amazon Elastic Container Service task",
Resolver: listEcsTaskDefinitions,
Multiplex: client.ServiceAccountRegionMultiplexer("ecs"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/efs/filesystems.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func EfsFilesystems() *schema.Table {
Description: "A description of the file system.",
Resolver: fetchEfsFilesystems,
Multiplex: client.ServiceAccountRegionMultiplexer("elasticfilesystem"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/eks/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func EksClusters() *schema.Table {
Description: "An object representing an Amazon EKS cluster.",
Resolver: fetchEksClusters,
Multiplex: client.ServiceAccountRegionMultiplexer("eks"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/emr/block_public_access_configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func EmrBlockPublicAccessConfigs() *schema.Table {
Name: "aws_emr_block_public_access_configs",
Resolver: fetchEmrBlockPublicAccessConfigs,
Multiplex: client.ServiceAccountRegionMultiplexer("elasticmapreduce"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "region"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/emr/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func EmrClusters() *schema.Table {
Description: "The detailed description of the cluster.",
Resolver: fetchEmrClusters,
Multiplex: client.ServiceAccountRegionMultiplexer("elasticmapreduce"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/fsx/backups.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func FsxBackups() *schema.Table {
Description: "A backup of an Amazon FSx file system.",
Resolver: fetchFsxBackups,
Multiplex: client.ServiceAccountRegionMultiplexer("fsx"),
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountRegionFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}},
Columns: []schema.Column{
Expand Down
2 changes: 1 addition & 1 deletion resources/services/iam/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func IamAccounts() *schema.Table {
Description: "Information about IAM entity usage and IAM quotas in the AWS account.",
Resolver: fetchAccountSummary,
Multiplex: client.AccountMultiplex,
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
DeleteFilter: client.DeleteAccountFilter,
Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id"}},
IgnoreInTests: true,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/iam/group_policies.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func IamGroupPolicies() *schema.Table {
Name: "aws_iam_group_policies",
Description: "Inline policies that are embedded in the specified IAM group",
Resolver: fetchIamGroupPolicies,
IgnoreError: client.IgnoreAccessDeniedServiceDisabled,
IgnoreError: client.IgnoreCommonErrors,
IgnoreInTests: true,
Columns: []schema.Column{
{
Expand Down
Loading