Skip to content
Open
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
23 changes: 18 additions & 5 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,26 @@ var rootCmd = &cobra.Command{
os.Exit(1)
}

if ok := s3.IsBucket(*session, bucketName); !ok {
region, err := s3.GetBucketRegion(bucketName)
if err != nil {
fmt.Println(err)
os.Exit(1)
}

session.Session.Config.Region = &region

ok, err := s3.IsBucket(*session, bucketName)
if err != nil {
fmt.Println(err)
os.Exit(1)
}

if !ok {
fmt.Printf("The bucket name `%s` was not found in profile `%s`\n", bucketName, profile)
return
} else {
cli.Grep(session, bucketName, prefix, args[0], ignoreCase)
return
os.Exit(1)
}

cli.Grep(session, bucketName, prefix, args[0], ignoreCase)
},
}

Expand Down
11 changes: 9 additions & 2 deletions config/aws.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package config

import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
)

Expand All @@ -11,12 +12,18 @@ type AWSSession struct {

// NewAWSParams creates a new AWSSession object
func NewAWSSession(awsProfile string) (*AWSSession, error) {
sess := session.Must(session.NewSessionWithOptions(session.Options{
sess, err := session.NewSessionWithOptions(session.Options{
Config: aws.Config{Region: aws.String("us-east-2")},
Profile: awsProfile,
SharedConfigState: session.SharedConfigEnable,
}))
})

if err != nil {
return nil, err
}

return &AWSSession{
Session: sess,
}, nil

}
45 changes: 10 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,42 +1,17 @@
module github.com/dabdada/s3-grep

go 1.19

require (
cloud.google.com/go v0.41.0 // indirect
github.com/aws/aws-sdk-go v1.20.14
github.com/coreos/bbolt v1.3.3 // indirect
github.com/coreos/etcd v3.3.13+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.9.3 // indirect
github.com/kisielk/errcheck v1.2.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/pelletier/go-toml v1.4.0 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/prometheus/common v0.6.0 // indirect
github.com/prometheus/procfs v0.0.3 // indirect
github.com/rogpeppe/fastuuid v1.1.0 // indirect
github.com/russross/blackfriday v2.0.0+incompatible // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cobra v0.0.5
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.4.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/ugorji/go v1.1.7 // indirect
go.etcd.io/bbolt v1.3.3 // indirect
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f // indirect
golang.org/x/image v0.0.0-20190622003408-7e034cad6442 // indirect
golang.org/x/mobile v0.0.0-20190607214518-6fa95d984e88 // indirect
golang.org/x/mod v0.1.0 // indirect
)

require (
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/stretchr/testify v1.3.0 // indirect
golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
golang.org/x/tools v0.0.0-20190702201734-44aeb8b7c377 // indirect
google.golang.org/genproto v0.0.0-20190701230453-710ae3a149df // indirect
google.golang.org/grpc v1.22.0 // indirect
honnef.co/go/tools v0.0.0-20190614002413-cb51c254f01b // indirect
golang.org/x/text v0.3.2 // indirect
)
Loading