Skip to content
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

Added code to save the managed instance's region to the stored cred profile #97

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Added code to save the managed instance's region to the stored cred profile #97

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6a3723
Added code to save the managed instance's region to the stored profil…
thedevopsmachine Apr 17, 2018
ec8b4e4
Added code to save the managed instance's region to the stored profil…
thedevopsmachine Apr 17, 2018
15c7548
Added code to save the managed instance's region to the stored creden…
thedevopsmachine Apr 17, 2018
37aa0fa
Updating tests to include a region value
thedevopsmachine Apr 17, 2018
318a702
Added cleanup function to delete shared credentials file after tests …
thedevopsmachine Apr 17, 2018
77dd587
altered the s3util so that if it fails to retrieve the instance regio…
thedevopsmachine Apr 17, 2018
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
2 changes: 2 additions & 0 deletions agent/managedInstances/rolecreds/managedInstances_role_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var (
accessKeyID = "accessKeyID"
secretAccessKey = "secretAccessKey"
sessionToken = "sessionToken"
region = "us-east-1"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable is not used

)

func TestRetrieve_ShouldReturnValidToken(t *testing.T) {
Expand Down Expand Up @@ -60,6 +61,7 @@ func TestRetrieve_ShouldUpdateKeyPair(t *testing.T) {
publicKey: "publicKey",
privateKey: "privateKey",
keyType: "Rsa",
region: "us-east-1",
}
client := &RsaSignedServiceStub{
roleResponse: ssm.RequestManagedInstanceRoleTokenOutput{
Expand Down
14 changes: 14 additions & 0 deletions agent/managedInstances/sharedCredentials/shared_Credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"path/filepath"

"github.com/aws/amazon-ssm-agent/agent/fileutil"
"github.com/aws/amazon-ssm-agent/agent/managedInstances/registration"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/go-ini/ini"
)
Expand All @@ -29,6 +30,7 @@ const (
awsAccessKeyID = "aws_access_key_id"
awsSecretAccessKey = "aws_secret_access_key"
awsSessionToken = "aws_session_token"
awsRegion = "region"
)

// filename returns the filename to use to read AWS shared credentials.
Expand Down Expand Up @@ -98,6 +100,18 @@ func Store(accessKeyID, secretAccessKey, sessionToken, profile string) error {

iniProfile.Key(awsSessionToken).SetValue(sessionToken)

// Save the instance's region to the profile so that the FallbackRegionFactory can find it.
// Scripts that use the .NET Cmdlets and aws command line tools will automatically detect
// the AWS Region from the EC2 instance profile, however, this is not the case for on-prem
// servers, since they don't have the EC2 Metadata service. By adding the Region to the
// shared credentials file, the SDK will be able to discover the region automatically.
// This will ensure that scripts that run on on-prem servers will run the same way as
// they would on EC2 instances, without any modification.
region := registration.Region()
if region != "" {
iniProfile.Key(awsRegion).SetValue(region)
}

err = config.SaveTo(credPath)
if err != nil {
return awserr.New("SharedCredentialsStore", "failed to save profile", err)
Expand Down
1 change: 1 addition & 0 deletions agent/managedInstances/sharedCredentials/shared_credentials_integ_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (
accessKey = "DummyAccessKey"
accessSecretKey = "DummyAccessSecretKey"
token = "DummyToken"
region = "us-east-1"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable is not used

profile = "DummyProfile"
testFilePath = "example.ini"
)
Expand Down