Skip to content

Empty default section is not an error anymore #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbueschel merged 2 commits into from
Feb 27, 2019
Merged

Empty default section is not an error anymore #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37570c9
Empty default section is not an error anymore
Feb 27, 2019
60aa834
Merge branch 'master' into feature/empty-default-section
peterbueschel Feb 27, 2019
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
29 changes: 9 additions & 20 deletions filehandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type (
// Profile stored in the AWS shared credentials file consisting of an
// AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
Profile struct {
Name string
Name string `ini:"name"`
AccessKeyID string `ini:"aws_access_key_id"`
SecretAccessKey string `ini:"aws_secret_access_key"`
SessionToken string `ini:"aws_session_token"`
Expand Down Expand Up @@ -84,20 +84,18 @@ func (f *CredentialsFile) GetUsedProfileNameAndIndex() (string, int, error) {
if err != nil {
return "no default", -2, err
}
if len(d.AccessKeyID) == 0 || len(d.SecretAccessKey) == 0 {
return "no default set", -2, nil
}
for i, n := range f.GetProfilesNames() {
p, err := f.GetProfileBy(n)
if err != nil {
return "", -1, err
}
if p.AccessKeyID == d.AccessKeyID && p.SecretAccessKey == d.SecretAccessKey {
if n == d.Name {
return n, i, nil
}
}
return "", -1,
fmt.Errorf(
"No profile in %s matches the current default-profile. "+
"The AWS keys in the default profile are different to all "+
"other keys in the other profiles.", f.Path,
"No profile in %s matches the current configured default-profile '%s'.",
f.Path, d.Name,
)

}
Expand All @@ -114,23 +112,15 @@ func (f *CredentialsFile) GetUsedKey() (string, error) {
return d.SecretAccessKey, err
}

// GetProfileBy returns the profile by a given name and verifies also if the
// AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY are existing for this profile
// GetProfileBy returns the profile by a given name
func (f *CredentialsFile) GetProfileBy(name string) (*Profile, error) {
p := &Profile{Name: name}
s, err := f.Content.GetSection(name)
if err != nil {
return p, err
}
_ = s.MapTo(p) // error cannot happen; p is always a pointer
if len(p.AccessKeyID) == 0 || len(p.SecretAccessKey) == 0 {
return p,
fmt.Errorf(
"found no aws_access_key_id or aws_secret_access_key for the profile '%s'",
p.Name,
)
}
return p, err
return p, nil
}

// SetDefaultTo overwrites/creates the default section inside the AWS credentials file.
Expand All @@ -140,7 +130,6 @@ func (f *CredentialsFile) SetDefaultTo(profileName string) error {
if err != nil {
return err
}
//f.Content.Section("default").Comment = commentPrefix + profileName
_ = f.Content.Section("default").ReflectFrom(p) // error cannot happen; p is always a pointer
return f.Content.SaveTo(f.Path)
}
Expand Down