Skip to content

Commit e0ede2f

Browse files
bepbep
committed
Revert "Use default credentials chain when access key / secret are not provided (#510)"
This reverts commit 8d51b73. Sadly, the integration tests (that I forgot do not run on forked PRs) is failing.
1 parent 8d51b73 commit e0ede2f

File tree

7 files changed

+19
-45
lines changed

7 files changed

+19
-45
lines changed

‎go.mod‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,13 @@ require (
2121

2222
require (
2323
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
24-
github.com/aws/aws-sdk-go-v2/config v1.32.2 // indirect
25-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
2624
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
2725
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
2926
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
3027
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
3128
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
3229
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
3330
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
3831
github.com/aws/smithy-go v1.23.2 // indirect
3932
github.com/google/go-cmp v0.6.0 // indirect
4033
github.com/kr/pretty v0.3.1 // indirect

‎go.sum‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrK
22
github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
33
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 h1:DHctwEM8P8iTXFxC/QK0MRjwEpWQeM9yzidCRjldUz0=
44
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3/go.mod h1:xdCzcZEtnSTKVDOmUZs4l/j3pSV6rpo1WXl5ugNsL8Y=
5-
github.com/aws/aws-sdk-go-v2/config v1.32.2 h1:4liUsdEpUUPZs5WVapsJLx5NPmQhQdez7nYFcovrytk=
6-
github.com/aws/aws-sdk-go-v2/config v1.32.2/go.mod h1:l0hs06IFz1eCT+jTacU/qZtC33nvcnLADAPL/XyrkZI=
75
github.com/aws/aws-sdk-go-v2/credentials v1.19.2 h1:qZry8VUyTK4VIo5aEdUcBjPZHL2v4FyQ3QEOaWcFLu4=
86
github.com/aws/aws-sdk-go-v2/credentials v1.19.2/go.mod h1:YUqm5a1/kBnoK+/NY5WEiMocZihKSo15/tJdmdXnM5g=
9-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 h1:WZVR5DbDgxzA0BJeudId89Kmgy6DIU4ORpxwsVHz0qA=
10-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14/go.mod h1:Dadl9QO0kHgbrH1GRqGiZdYtW5w+IXXaBNCHTIaheM4=
117
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
128
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
139
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
1410
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
15-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
16-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
1711
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 h1:ITi7qiDSv/mSGDSWNpZ4k4Ve0DQR6Ug2SJQ8zEHoDXg=
1812
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14/go.mod h1:k1xtME53H1b6YpZt74YmwlONMWf4ecM+lut1WQLAF/U=
1913
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.58.1 h1:oZkhZ/qcgJqlitFX+rqzBcd/YSSylkboZb9wFEVx7nc=
@@ -28,14 +22,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 h1:FzQE21lNtUor0
2822
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14/go.mod h1:s1ydyWG9pm3ZwmmYN21HKyG9WzAZhYVW85wMHs5FV6w=
2923
github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1 h1:OgQy/+0+Kc3khtqiEOk23xQAglXi3Tj0y5doOxbi5tg=
3024
github.com/aws/aws-sdk-go-v2/service/s3 v1.92.1/go.mod h1:wYNqY3L02Z3IgRYxOBPH9I1zD9Cjh9hI5QOy/eOjQvw=
31-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 h1:MxMBdKTYBjPQChlJhi4qlEueqB1p1KcbTEa7tD5aqPs=
32-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2/go.mod h1:iS6EPmNeqCsGo+xQmXv0jIMjyYtQfnwg36zl2FwEouk=
33-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 h1:ksUT5KtgpZd3SAiFJNJ0AFEJVva3gjBmN7eXUZjzUwQ=
34-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5/go.mod h1:av+ArJpoYf3pgyrj6tcehSFW+y9/QvAY8kMooR9bZCw=
35-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 h1:GtsxyiF3Nd3JahRBJbxLCCdYW9ltGQYrFWg8XdkGDd8=
36-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10/go.mod h1:/j67Z5XBVDx8nZVp9EuFM9/BS5dvBznbqILGuu73hug=
37-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 h1:a5UTtD4mHBU3t0o6aHQZFJTNKVfxFWfPX7J0Lr7G+uY=
38-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2/go.mod h1:6TxbXoDSgBQ225Qd8Q+MbxUxUh6TtNKwbRt/EPS9xso=
3925
github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
4026
github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
4127
github.com/bep/helpers v0.6.0 h1:qtqMCK8XPFNM9hp5Ztu9piPjxNNkk8PIyUVjg6v8Bsw=

‎lib/deployer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func Deploy(cfg *Config) (DeployStats, error) {
8181
baseStore := d.cfg.baseStore
8282
if baseStore == nil {
8383
var err error
84-
baseStore, err = newRemoteStore(ctx, d.cfg, d)
84+
baseStore, err = newRemoteStore(d.cfg, d)
8585
if err != nil {
8686
return *d.stats, err
8787
}

‎lib/s3.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func (f *s3File) Size() int64 {
5151
return *f.o.Size
5252
}
5353

54-
func newRemoteStore(ctx context.Context, cfg *Config, logger printer) (*s3Store, error) {
54+
func newRemoteStore(cfg *Config, logger printer) (*s3Store, error) {
5555
var s *s3Store
5656
var cfc *cloudFrontClient
5757

58-
awsConfig, err := newAWSConfig(ctx, cfg)
58+
awsConfig, err := newAWSConfig(cfg)
5959
if err != nil {
6060
return nil, err
6161
}

‎lib/s3_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package lib
22

33
import (
4-
"context"
54
"io"
65
"testing"
76

@@ -18,7 +17,7 @@ func TestNewRemoteStoreNoAclProvided(t *testing.T) {
1817
Silent: true,
1918
}
2019

21-
s, err := newRemoteStore(context.Background(), cfg, newPrinter(io.Discard))
20+
s, err := newRemoteStore(cfg, newPrinter(io.Discard))
2221
c.Assert(err, qt.IsNil)
2322

2423
c.Assert("private", qt.Equals, s.acl)
@@ -34,7 +33,7 @@ func TestNewRemoteStoreAclProvided(t *testing.T) {
3433
Silent: true,
3534
}
3635

37-
s, err := newRemoteStore(context.Background(), cfg, newPrinter(io.Discard))
36+
s, err := newRemoteStore(cfg, newPrinter(io.Discard))
3837
c.Assert(err, qt.IsNil)
3938

4039
c.Assert("public-read", qt.Equals, s.acl)
@@ -50,7 +49,7 @@ func TestNewRemoteStoreOtherCannedAclProvided(t *testing.T) {
5049
Silent: true,
5150
}
5251

53-
s, err := newRemoteStore(context.Background(), cfg, newPrinter(io.Discard))
52+
s, err := newRemoteStore(cfg, newPrinter(io.Discard))
5453
c.Assert(err, qt.IsNil)
5554

5655
c.Assert("bucket-owner-full-control", qt.Equals, s.acl)
@@ -67,7 +66,7 @@ func TestNewRemoteStoreDeprecatedPublicReadACLFlaglProvided(t *testing.T) {
6766
Silent: true,
6867
}
6968

70-
s, err := newRemoteStore(context.Background(), cfg, newPrinter(io.Discard))
69+
s, err := newRemoteStore(cfg, newPrinter(io.Discard))
7170
c.Assert(err, qt.IsNil)
7271

7372
c.Assert("public-read", qt.Equals, s.acl)

‎lib/session.go‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,26 @@
66
package lib
77

88
import (
9-
"context"
109
"os"
1110

1211
"github.com/aws/aws-sdk-go-v2/aws"
13-
"github.com/aws/aws-sdk-go-v2/config"
1412
"github.com/aws/aws-sdk-go-v2/credentials"
1513
)
1614

17-
func newAWSConfig(ctx context.Context, cfg *Config) (aws.Config, error) {
18-
// Build options for LoadDefaultConfig
19-
var opts []func(*config.LoadOptions) error
20-
21-
if cfg.RegionName != "" {
22-
opts = append(opts, config.WithRegion(cfg.RegionName))
15+
func newAWSConfig(cfg *Config) (aws.Config, error) {
16+
config := aws.Config{
17+
Region: cfg.RegionName,
18+
Credentials: createCredentials(cfg),
2319
}
2420

21+
return config, nil
22+
}
23+
24+
func createCredentials(cfg *Config) aws.CredentialsProvider {
2525
if cfg.AccessKey != "" {
26-
// If static creds are provided, inject them while still loading other defaults.
27-
opts = append(opts, config.WithCredentialsProvider(
28-
credentials.NewStaticCredentialsProvider(cfg.AccessKey, cfg.SecretKey, os.Getenv("AWS_SESSION_TOKEN")),
29-
))
26+
return credentials.NewStaticCredentialsProvider(cfg.AccessKey, cfg.SecretKey, os.Getenv("AWS_SESSION_TOKEN"))
3027
}
3128

32-
// Load the SDK default config (credentials chain, profiles, SSO, shared config, etc.)
33-
return config.LoadDefaultConfig(ctx, opts...)
29+
// Use AWS default
30+
return nil
3431
}

‎lib/session_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package lib
22

33
import (
4-
"context"
54
"io"
65
"testing"
76

@@ -17,7 +16,7 @@ func TestNewAWSConfigWithCustomEndpoint(t *testing.T) {
1716
EndpointURL: "http://localhost:9000",
1817
Silent: true,
1918
}
20-
store, err := newRemoteStore(context.Background(), cfg, newPrinter(io.Discard))
19+
store, err := newRemoteStore(cfg, newPrinter(io.Discard))
2120
c.Assert(err, qt.IsNil)
2221
c.Assert(store, qt.Not(qt.IsNil))
2322

0 commit comments

Comments
 (0)