Skip to content

Commit

Permalink
rm awserr pkg usage, part of AWS SDK v2 resource migration (#770).
Browse files Browse the repository at this point in the history
  • Loading branch information
@wakeful
wakeful committed Dec 20, 2024
1 parent 3a74149 commit a02b833
Show file tree
Hide file tree
Showing 6 changed files with 255 additions and 251 deletions.
10 changes: 6 additions & 4 deletions aws/resources/nat_gateway.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ package resources

import (
"context"
goerror "errors"
"fmt"
"sync"
"time"

"github.com/gruntwork-io/cloud-nuke/util"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/smithy-go"
"github.com/gruntwork-io/cloud-nuke/config"
"github.com/gruntwork-io/cloud-nuke/logging"
"github.com/gruntwork-io/cloud-nuke/report"
"github.com/gruntwork-io/cloud-nuke/util"
"github.com/gruntwork-io/go-commons/errors"
"github.com/gruntwork-io/go-commons/retry"
"github.com/hashicorp/go-multierror"
Expand Down Expand Up @@ -151,9 +151,11 @@ func (ngw *NatGateways) areAllNatGatewaysDeleted(identifiers []*string) (bool, e
}
resp, err := ngw.Client.DescribeNatGateways(ngw.Context, &ec2.DescribeNatGatewaysInput{NatGatewayIds: natGatewayIDs})
if err != nil {
if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NatGatewayNotFound" {
var apiErr smithy.APIError
if ok := goerror.As(err, &apiErr); ok && apiErr.ErrorCode() == "NatGatewayNotFound" {
return true, nil
}

return false, err
}
if len(resp.NatGateways) == 0 {
Expand Down
9 changes: 5 additions & 4 deletions aws/resources/nat_gateway_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws/awserr"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/aws/smithy-go"
"github.com/gruntwork-io/cloud-nuke/config"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -110,8 +109,10 @@ func TestNatGateway_NukeAll(t *testing.T) {

ngw := NatGateways{
Client: mockedNatGateway{
DeleteNatGatewayOutput: ec2.DeleteNatGatewayOutput{},
DescribeNatGatewaysError: awserr.New("NatGatewayNotFound", "", nil),
DeleteNatGatewayOutput: ec2.DeleteNatGatewayOutput{},
DescribeNatGatewaysError: &smithy.GenericAPIError{
Code: "NatGatewayNotFound",
},
},
}

Expand Down
129 changes: 64 additions & 65 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,59 @@ module github.com/gruntwork-io/cloud-nuke
go 1.21

require (
github.com/aws/aws-sdk-go v1.49.13
github.com/aws/aws-sdk-go-v2 v1.32.6
github.com/aws/aws-sdk-go-v2/config v1.28.6
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.36.2
github.com/aws/aws-sdk-go-v2/service/acm v1.30.7
github.com/aws/aws-sdk-go-v2/service/acmpca v1.37.8
github.com/aws/aws-sdk-go-v2/service/amp v1.30.4
github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.1
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.24.7
github.com/aws/aws-sdk-go-v2/service/apprunner v1.32.7
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.1
github.com/aws/aws-sdk-go-v2/service/backup v1.39.8
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.3
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.3
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.0
github.com/aws/aws-sdk-go-v2/service/codedeploy v1.29.7
github.com/aws/aws-sdk-go-v2/service/configservice v1.51.1
github.com/aws/aws-sdk-go-v2/service/datasync v1.43.5
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.7
github.com/aws/aws-sdk-go-v2/service/ecs v1.52.2
github.com/aws/aws-sdk-go-v2/service/efs v1.34.1
github.com/aws/aws-sdk-go-v2/service/eks v1.54.0
github.com/aws/aws-sdk-go-v2/service/elasticache v1.44.1
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.28.7
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.6
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.1
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.0
github.com/aws/aws-sdk-go-v2/service/firehose v1.35.2
github.com/aws/aws-sdk-go-v2/service/grafana v1.26.7
github.com/aws/aws-sdk-go-v2/service/guardduty v1.52.1
github.com/aws/aws-sdk-go-v2/service/iam v1.38.2
github.com/aws/aws-sdk-go-v2/service/kafka v1.38.7
github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.7
github.com/aws/aws-sdk-go-v2/service/kms v1.37.7
github.com/aws/aws-sdk-go-v2/service/lambda v1.69.1
github.com/aws/aws-sdk-go-v2/service/macie2 v1.43.7
github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.44.5
github.com/aws/aws-sdk-go-v2/service/opensearch v1.45.0
github.com/aws/aws-sdk-go-v2/service/rds v1.93.0
github.com/aws/aws-sdk-go-v2/service/redshift v1.53.0
github.com/aws/aws-sdk-go-v2/service/route53 v1.46.3
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.52.0
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.169.0
github.com/aws/aws-sdk-go-v2/service/scheduler v1.12.8
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.7
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.0
github.com/aws/aws-sdk-go-v2/service/ses v1.29.1
github.com/aws/aws-sdk-go-v2/service/sns v1.33.7
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.2
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2
github.com/aws/aws-sdk-go-v2/service/vpclattice v1.13.1
github.com/aws/aws-sdk-go-v2 v1.32.7
github.com/aws/aws-sdk-go-v2/config v1.28.7
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.36.3
github.com/aws/aws-sdk-go-v2/service/acm v1.30.8
github.com/aws/aws-sdk-go-v2/service/acmpca v1.37.9
github.com/aws/aws-sdk-go-v2/service/amp v1.30.5
github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.2
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.24.8
github.com/aws/aws-sdk-go-v2/service/apprunner v1.32.8
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.2
github.com/aws/aws-sdk-go-v2/service/backup v1.40.1
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.4
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.4
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.1
github.com/aws/aws-sdk-go-v2/service/codedeploy v1.29.8
github.com/aws/aws-sdk-go-v2/service/configservice v1.51.2
github.com/aws/aws-sdk-go-v2/service/datasync v1.44.1
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.1
github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.1
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.8
github.com/aws/aws-sdk-go-v2/service/ecs v1.53.1
github.com/aws/aws-sdk-go-v2/service/efs v1.34.2
github.com/aws/aws-sdk-go-v2/service/eks v1.54.1
github.com/aws/aws-sdk-go-v2/service/elasticache v1.44.2
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.28.8
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.7
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.2
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.1
github.com/aws/aws-sdk-go-v2/service/firehose v1.35.3
github.com/aws/aws-sdk-go-v2/service/grafana v1.26.8
github.com/aws/aws-sdk-go-v2/service/guardduty v1.52.2
github.com/aws/aws-sdk-go-v2/service/iam v1.38.3
github.com/aws/aws-sdk-go-v2/service/kafka v1.38.9
github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.8
github.com/aws/aws-sdk-go-v2/service/kms v1.37.8
github.com/aws/aws-sdk-go-v2/service/lambda v1.69.2
github.com/aws/aws-sdk-go-v2/service/macie2 v1.43.8
github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.44.6
github.com/aws/aws-sdk-go-v2/service/opensearch v1.45.1
github.com/aws/aws-sdk-go-v2/service/rds v1.93.1
github.com/aws/aws-sdk-go-v2/service/redshift v1.53.1
github.com/aws/aws-sdk-go-v2/service/route53 v1.46.4
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.1
github.com/aws/aws-sdk-go-v2/service/s3control v1.52.1
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.169.1
github.com/aws/aws-sdk-go-v2/service/scheduler v1.12.9
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.8
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.1
github.com/aws/aws-sdk-go-v2/service/ses v1.29.2
github.com/aws/aws-sdk-go-v2/service/sns v1.33.8
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.3
github.com/aws/aws-sdk-go-v2/service/sts v1.33.3
github.com/aws/aws-sdk-go-v2/service/vpclattice v1.13.3
github.com/aws/smithy-go v1.22.1
github.com/charmbracelet/lipgloss v0.6.0
github.com/go-errors/errors v1.4.2
Expand All @@ -74,19 +73,19 @@ require (
atomicgo.dev/cursor v0.1.1 // indirect
atomicgo.dev/keyboard v0.2.8 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.48 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down
Loading

0 comments on commit a02b833

Please sign in to comment.