Skip to content

Commit 1b6cb51

Browse files
authored
Moved awsfed to pkg/awsfed (#168)
## Summary title says it ## How was it tested? envsec init envsec ls envsec set demo=value all above commands work as expected
1 parent 12aa457 commit 1b6cb51

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

envsec/internal/envcli/flags.go

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/pkg/errors"
1212
"github.com/spf13/cobra"
1313
"go.jetpack.io/envsec"
14-
"go.jetpack.io/envsec/internal/awsfed"
1514
"go.jetpack.io/envsec/internal/jetcloud"
1615
"go.jetpack.io/envsec/internal/typeids"
16+
"go.jetpack.io/envsec/pkg/awsfed"
1717
"go.jetpack.io/pkg/sandbox/auth/session"
1818
)
1919

@@ -99,7 +99,7 @@ func (f *configFlags) genConfig(ctx context.Context) (*cmdConfig, error) {
9999
}
100100
}
101101

102-
ssmConfig, err := genSSMConfigForUser(ctx, tok)
102+
ssmConfig, err := awsfed.GenSSMConfigForUser(ctx, tok)
103103
if err != nil {
104104
return nil, errors.WithStack(err)
105105
}
@@ -133,23 +133,3 @@ func (f *configFlags) genConfig(ctx context.Context) (*cmdConfig, error) {
133133
EnvID: envid,
134134
}, nil
135135
}
136-
137-
func genSSMConfigForUser(
138-
ctx context.Context,
139-
tok *session.Token,
140-
) (*envsec.SSMConfig, error) {
141-
if tok == nil {
142-
return &envsec.SSMConfig{}, nil
143-
}
144-
fed := awsfed.New()
145-
creds, err := fed.AWSCreds(ctx, tok)
146-
if err != nil {
147-
return nil, errors.WithStack(err)
148-
}
149-
return &envsec.SSMConfig{
150-
AccessKeyID: *creds.AccessKeyId,
151-
SecretAccessKey: *creds.SecretKey,
152-
SessionToken: *creds.SessionToken,
153-
Region: fed.Region,
154-
}, nil
155-
}

envsec/internal/awsfed/awsfed.go renamed to envsec/pkg/awsfed/awsfed.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88

99
"github.com/aws/aws-sdk-go-v2/service/cognitoidentity"
1010
"github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types"
11+
"github.com/pkg/errors"
12+
"go.jetpack.io/envsec"
1113
"go.jetpack.io/envsec/internal/envvar"
1214
"go.jetpack.io/envsec/internal/filecache"
1315
"go.jetpack.io/pkg/sandbox/auth/session"
@@ -107,3 +109,23 @@ func cacheKey(t *session.Token) string {
107109

108110
return fmt.Sprintf("%s-%s", cacheKeyPrefix, id)
109111
}
112+
113+
func GenSSMConfigForUser(
114+
ctx context.Context,
115+
tok *session.Token,
116+
) (*envsec.SSMConfig, error) {
117+
if tok == nil {
118+
return &envsec.SSMConfig{}, nil
119+
}
120+
fed := New()
121+
creds, err := fed.AWSCreds(ctx, tok)
122+
if err != nil {
123+
return nil, errors.WithStack(err)
124+
}
125+
return &envsec.SSMConfig{
126+
AccessKeyID: *creds.AccessKeyId,
127+
SecretAccessKey: *creds.SecretKey,
128+
SessionToken: *creds.SessionToken,
129+
Region: fed.Region,
130+
}, nil
131+
}

0 commit comments

Comments
 (0)