Skip to content

Commit

Permalink
#17 update AWS SDK to v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Carter committed Jan 19, 2021
1 parent 92e0054 commit 01b4a67
Show file tree
Hide file tree
Showing 14 changed files with 467 additions and 103 deletions.
7 changes: 6 additions & 1 deletion cmd/awsets/cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,13 @@ var listCmd = &cli.Command{
fmt.Fprintf(os.Stderr, "%s - %s - %s\n", update.Region, update.Lister, update.Message)
case context.StatusProcessing:
case context.StatusComplete:
fallthrough
if bar != nil {
bar.Increment()
}
case context.StatusCompleteWithError:
if verbose {
fmt.Fprintf(os.Stderr, "complte with error: %s - %s - %s\n", update.Region, update.Lister, update.Message)
}
if bar != nil {
bar.Increment()
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/awsets/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ func Execute(buildInfo map[string]string) {

func configureAWS(ctx *cli.Context) (aws.Config, error) {
if ctx.String("profile") != "" {
return config.LoadDefaultConfig(config.WithSharedConfigProfile(ctx.String("profile")))
return config.LoadDefaultConfig(ctx.Context, config.WithSharedConfigProfile(ctx.String("profile")))
}
return config.LoadDefaultConfig()
return config.LoadDefaultConfig(ctx.Context)
}

func validateNumArgs(nArgs int) cli.BeforeFunc {
Expand Down
8 changes: 4 additions & 4 deletions cmd/awsets/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/trek10inc/awsets/cmd/awsets
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v0.30.0
github.com/aws/aws-sdk-go-v2/config v0.3.0
github.com/aws/aws-sdk-go-v2 v1.0.0
github.com/aws/aws-sdk-go-v2/config v1.0.0
github.com/cheggaaa/pb/v3 v3.0.5
github.com/emicklei/dot v0.14.0
github.com/emicklei/dot v0.15.0
github.com/jmespath/go-jmespath v0.4.0
github.com/trek10inc/awsets v0.7.0
github.com/urfave/cli/v2 v2.2.0
github.com/urfave/cli/v2 v2.3.0
go.etcd.io/bbolt v1.3.5
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
)
Expand Down
359 changes: 359 additions & 0 deletions cmd/awsets/go.sum

Large diffs are not rendered by default.

170 changes: 85 additions & 85 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,90 +3,90 @@ module github.com/trek10inc/awsets
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v0.30.0
github.com/aws/aws-sdk-go-v2/config v0.3.0
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v0.30.0
github.com/aws/aws-sdk-go-v2/service/acm v0.30.0
github.com/aws/aws-sdk-go-v2/service/amplify v0.30.0
github.com/aws/aws-sdk-go-v2/service/apigateway v0.30.0
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v0.30.0
github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v0.30.0
github.com/aws/aws-sdk-go-v2/service/appmesh v0.30.0
github.com/aws/aws-sdk-go-v2/service/appsync v0.30.0
github.com/aws/aws-sdk-go-v2/service/athena v0.30.0
github.com/aws/aws-sdk-go-v2/service/autoscaling v0.30.0
github.com/aws/aws-sdk-go-v2/service/backup v0.30.0
github.com/aws/aws-sdk-go-v2/service/batch v0.30.0
github.com/aws/aws-sdk-go-v2/service/budgets v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloud9 v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloudformation v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloudfront v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloudtrail v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloudwatch v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v0.30.0
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v0.30.0
github.com/aws/aws-sdk-go-v2/service/codebuild v0.30.0
github.com/aws/aws-sdk-go-v2/service/codecommit v0.30.0
github.com/aws/aws-sdk-go-v2/service/codedeploy v0.30.0
github.com/aws/aws-sdk-go-v2/service/codepipeline v0.30.0
github.com/aws/aws-sdk-go-v2/service/codestar v0.30.0
github.com/aws/aws-sdk-go-v2/service/cognitoidentity v0.30.0
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v0.30.0
github.com/aws/aws-sdk-go-v2/service/configservice v0.30.0
github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v0.30.0
github.com/aws/aws-sdk-go-v2/service/dax v0.30.0
github.com/aws/aws-sdk-go-v2/service/docdb v0.30.0
github.com/aws/aws-sdk-go-v2/service/dynamodb v0.30.0
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v0.30.0
github.com/aws/aws-sdk-go-v2/service/ec2 v0.30.0
github.com/aws/aws-sdk-go-v2/service/ecr v0.30.0
github.com/aws/aws-sdk-go-v2/service/ecs v0.30.0
github.com/aws/aws-sdk-go-v2/service/efs v0.30.0
github.com/aws/aws-sdk-go-v2/service/eks v0.30.0
github.com/aws/aws-sdk-go-v2/service/elasticache v0.30.0
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v0.30.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v0.30.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v0.30.0
github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v0.30.0
github.com/aws/aws-sdk-go-v2/service/emr v0.30.0
github.com/aws/aws-sdk-go-v2/service/firehose v0.30.0
github.com/aws/aws-sdk-go-v2/service/fsx v0.30.0
github.com/aws/aws-sdk-go-v2/service/glue v0.30.0
github.com/aws/aws-sdk-go-v2/service/greengrass v0.30.0
github.com/aws/aws-sdk-go-v2/service/guardduty v0.30.0
github.com/aws/aws-sdk-go-v2/service/iam v0.30.0
github.com/aws/aws-sdk-go-v2/service/imagebuilder v0.30.0
github.com/aws/aws-sdk-go-v2/service/iot v0.30.0
github.com/aws/aws-sdk-go-v2/service/iotsitewise v0.30.0
github.com/aws/aws-sdk-go-v2/service/kafka v0.30.0
github.com/aws/aws-sdk-go-v2/service/kinesis v0.30.0
github.com/aws/aws-sdk-go-v2/service/kms v0.30.0
github.com/aws/aws-sdk-go-v2/service/lambda v0.30.0
github.com/aws/aws-sdk-go-v2/service/mq v0.30.0
github.com/aws/aws-sdk-go-v2/service/neptune v0.30.0
github.com/aws/aws-sdk-go-v2/service/qldb v0.30.0
github.com/aws/aws-sdk-go-v2/service/rds v0.30.0
github.com/aws/aws-sdk-go-v2/service/redshift v0.30.0
github.com/aws/aws-sdk-go-v2/service/route53 v0.30.0
github.com/aws/aws-sdk-go-v2/service/s3 v0.30.0
github.com/aws/aws-sdk-go-v2/service/sagemaker v0.30.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager v0.30.0
github.com/aws/aws-sdk-go-v2/service/servicecatalog v0.30.0
github.com/aws/aws-sdk-go-v2/service/servicediscovery v0.30.0
github.com/aws/aws-sdk-go-v2/service/ses v0.30.0
github.com/aws/aws-sdk-go-v2/service/sfn v0.30.0
github.com/aws/aws-sdk-go-v2/service/signer v0.30.0
github.com/aws/aws-sdk-go-v2/service/sns v0.30.0
github.com/aws/aws-sdk-go-v2/service/sqs v0.30.0
github.com/aws/aws-sdk-go-v2/service/ssm v0.30.0
github.com/aws/aws-sdk-go-v2/service/sts v0.30.0
//github.com/aws/aws-sdk-go-v2/service/timestreamquery v0.30.0
//github.com/aws/aws-sdk-go-v2/service/timestreamwrite v0.30.0
github.com/aws/aws-sdk-go-v2/service/transfer v0.30.0
github.com/aws/aws-sdk-go-v2/service/waf v0.30.0
github.com/aws/aws-sdk-go-v2/service/wafregional v0.30.0
github.com/aws/aws-sdk-go-v2/service/wafv2 v0.30.0
github.com/aws/aws-sdk-go-v2/service/workspaces v0.30.0
github.com/aws/aws-sdk-go-v2 v1.0.0
github.com/aws/aws-sdk-go-v2/config v1.0.0
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.0.0
github.com/aws/aws-sdk-go-v2/service/acm v1.0.0
github.com/aws/aws-sdk-go-v2/service/amplify v1.0.0
github.com/aws/aws-sdk-go-v2/service/apigateway v1.0.0
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.0.0
github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.0.0
github.com/aws/aws-sdk-go-v2/service/appmesh v1.0.0
github.com/aws/aws-sdk-go-v2/service/appsync v1.0.0
github.com/aws/aws-sdk-go-v2/service/athena v1.0.0
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.0.0
github.com/aws/aws-sdk-go-v2/service/backup v1.0.0
github.com/aws/aws-sdk-go-v2/service/batch v1.0.0
github.com/aws/aws-sdk-go-v2/service/budgets v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloud9 v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.0.0
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.0.0
github.com/aws/aws-sdk-go-v2/service/codebuild v1.0.0
github.com/aws/aws-sdk-go-v2/service/codecommit v1.0.0
github.com/aws/aws-sdk-go-v2/service/codedeploy v1.0.0
github.com/aws/aws-sdk-go-v2/service/codepipeline v1.0.0
github.com/aws/aws-sdk-go-v2/service/codestar v1.0.0
github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.0.0
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.0.0
github.com/aws/aws-sdk-go-v2/service/configservice v1.0.0
github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.0.0
github.com/aws/aws-sdk-go-v2/service/dax v1.0.0
github.com/aws/aws-sdk-go-v2/service/docdb v1.0.0
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.0.0
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.0.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.0.0
github.com/aws/aws-sdk-go-v2/service/ecr v1.0.0
github.com/aws/aws-sdk-go-v2/service/ecs v1.0.0
github.com/aws/aws-sdk-go-v2/service/efs v1.0.0
github.com/aws/aws-sdk-go-v2/service/eks v1.0.0
github.com/aws/aws-sdk-go-v2/service/elasticache v1.0.0
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.0.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.0.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.0.0
github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.0.0
github.com/aws/aws-sdk-go-v2/service/emr v1.0.0
github.com/aws/aws-sdk-go-v2/service/firehose v1.0.0
github.com/aws/aws-sdk-go-v2/service/fsx v1.0.0
github.com/aws/aws-sdk-go-v2/service/glue v1.0.0
github.com/aws/aws-sdk-go-v2/service/greengrass v1.0.0
github.com/aws/aws-sdk-go-v2/service/guardduty v1.0.0
github.com/aws/aws-sdk-go-v2/service/iam v1.0.0
github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.0.0
github.com/aws/aws-sdk-go-v2/service/iot v1.0.0
github.com/aws/aws-sdk-go-v2/service/iotsitewise v1.0.0
github.com/aws/aws-sdk-go-v2/service/kafka v1.0.0
github.com/aws/aws-sdk-go-v2/service/kinesis v1.0.0
github.com/aws/aws-sdk-go-v2/service/kms v1.0.0
github.com/aws/aws-sdk-go-v2/service/lambda v1.0.0
github.com/aws/aws-sdk-go-v2/service/mq v1.0.0
github.com/aws/aws-sdk-go-v2/service/neptune v1.0.0
github.com/aws/aws-sdk-go-v2/service/qldb v1.0.0
github.com/aws/aws-sdk-go-v2/service/rds v1.0.0
github.com/aws/aws-sdk-go-v2/service/redshift v1.0.0
github.com/aws/aws-sdk-go-v2/service/route53 v1.0.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.0.0
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.0.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.0.0
github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.0.0
github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.0.0
github.com/aws/aws-sdk-go-v2/service/ses v1.0.0
github.com/aws/aws-sdk-go-v2/service/sfn v1.0.0
github.com/aws/aws-sdk-go-v2/service/signer v1.0.0
github.com/aws/aws-sdk-go-v2/service/sns v1.0.0
github.com/aws/aws-sdk-go-v2/service/sqs v1.0.0
github.com/aws/aws-sdk-go-v2/service/ssm v1.0.0
github.com/aws/aws-sdk-go-v2/service/sts v1.0.0
//github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.0.0
//github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.0.0
github.com/aws/aws-sdk-go-v2/service/transfer v1.0.0
github.com/aws/aws-sdk-go-v2/service/waf v1.0.0
github.com/aws/aws-sdk-go-v2/service/wafregional v1.0.0
github.com/aws/aws-sdk-go-v2/service/wafv2 v1.0.0
github.com/aws/aws-sdk-go-v2/service/workspaces v1.0.0
github.com/fatih/structs v1.1.0
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v2 v2.4.0
)
3 changes: 2 additions & 1 deletion lister/cloudfront_cachepolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"sync"

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

"github.com/aws/aws-sdk-go-v2/service/cloudfront"
"github.com/trek10inc/awsets/context"
"github.com/trek10inc/awsets/resource"
Expand Down Expand Up @@ -33,7 +34,7 @@ func (l AWSCloudfrontCachePolicy) List(ctx context.AWSetsCtx) (*resource.Group,
err := Paginator(func(nt *string) (*string, error) {
res, err := svc.ListCachePolicies(ctx.Context, &cloudfront.ListCachePoliciesInput{
Marker: nt,
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
})
if err != nil {
return nil, fmt.Errorf("failed to list cache policies: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion lister/cloudfront_distribution.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (l AWSCloudfrontDistribution) List(ctx context.AWSetsCtx) (*resource.Group,
listCloudfrontDistributionsOnce.Do(func() {
err := Paginator(func(nt *string) (*string, error) {
res, err := svc.ListDistributions(ctx.Context, &cloudfront.ListDistributionsInput{
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
Marker: nt,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lister/cloudfront_keygroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (l AWSCloudfrontKeyGroup) List(ctx context.AWSetsCtx) (*resource.Group, err
listCloudfrontKeyGroupOnce.Do(func() {
err := Paginator(func(nt *string) (*string, error) {
res, err := svc.ListKeyGroups(ctx.Context, &cloudfront.ListKeyGroupsInput{
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
Marker: nt,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lister/cloudfront_originaccessidentity.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (l AWSCloudfrontOriginAccessIdentify) List(ctx context.AWSetsCtx) (*resourc

err := Paginator(func(nt *string) (*string, error) {
res, err := svc.ListCloudFrontOriginAccessIdentities(ctx.Context, &cloudfront.ListCloudFrontOriginAccessIdentitiesInput{
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
Marker: nt,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lister/cloudfront_originrequestpolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (l AWSCloudfrontOriginRequestPolicy) List(ctx context.AWSetsCtx) (*resource
err := Paginator(func(nt *string) (*string, error) {
res, err := svc.ListOriginRequestPolicies(ctx.Context, &cloudfront.ListOriginRequestPoliciesInput{
Marker: nt,
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
})
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion lister/cloudfront_publickey.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (l AWSCloudfrontPublicKey) List(ctx context.AWSetsCtx) (*resource.Group, er
listCloudfrontPublicKeyOnce.Do(func() {
err := Paginator(func(nt *string) (*string, error) {
res, err := svc.ListPublicKeys(ctx.Context, &cloudfront.ListPublicKeysInput{
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
Marker: nt,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lister/cloudfront_streamingdistribution.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (l AWSCloudfrontStreamingDistribution) List(ctx context.AWSetsCtx) (*resour
listCloudfrontStreamingDistributionsOnce.Do(func() {
outerErr = Paginator(func(nt *string) (*string, error) {
res, err := svc.ListStreamingDistributions(ctx.Context, &cloudfront.ListStreamingDistributionsInput{
MaxItems: aws.String("100"),
MaxItems: aws.Int32(100),
Marker: nt,
})
if err != nil {
Expand Down
5 changes: 2 additions & 3 deletions lister/s3_bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ func (l AWSS3Bucket) List(ctx context.AWSetsCtx) (*resource.Group, error) {
ctx.SendStatus(context.StatusLogError, fmt.Sprintf("failed to get bucket location for %s from %s: %v\n", *bucket.Name, ctx.Region(), err))
continue
}
// TODO: debugging https://github.com/aws/aws-sdk-go-v2/issues/908
//fmt.Printf("bucket: %s - %v\n", *bucket.Name, bucketLocation.LocationConstraint)

reg := string(bucketLocation.LocationConstraint)
if len(reg) == 0 {
reg = "us-east-1"
Expand All @@ -67,7 +66,7 @@ func (l AWSS3Bucket) List(ctx context.AWSetsCtx) (*resource.Group, error) {
Bucket: bucket.Name,
})
if err == nil {
buck["Lifecycle"] = structs.Map(lifecycleRes.Rules)
buck["Lifecycle"] = lifecycleRes.Rules
} else {
buck["Lifecycle"] = nil
}
Expand Down
2 changes: 1 addition & 1 deletion options.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (c *config) close() {
func (c *config) validate() error {

if c.AWSCfg == nil {
awsCfg, err := cfg.LoadDefaultConfig()
awsCfg, err := cfg.LoadDefaultConfig(ctx2.Background())
if err != nil {
return fmt.Errorf("failed to load AWS config: %w", err)
}
Expand Down

0 comments on commit 01b4a67

Please sign in to comment.