Skip to content

Commit 92900aa

Browse files
authored
Merge pull request #56 from sanathkr/develop
Don't set region if not configured in CLI. Fixes #48
2 parents a07d167 + a686243 commit 92900aa

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

runtime.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,10 @@ func getSessionOrDefaultCreds() map[string]string {
331331
// Obtain AWS credentials and pass them through to the container runtime via env variables
332332
if sess, err := session.NewSession(); err == nil {
333333
if creds, err := sess.Config.Credentials.Get(); err == nil {
334-
result["region"] = *sess.Config.Region
334+
if *sess.Config.Region != "" {
335+
result["region"] = *sess.Config.Region
336+
}
337+
335338
result["key"] = creds.AccessKeyID
336339
result["secret"] = creds.SecretAccessKey
337340
result["sessiontoken"] = creds.SessionToken
@@ -454,6 +457,7 @@ func getEnvironmentVariables(function resources.AWSServerlessFunction, overrides
454457
// Variables available in Lambda execution environment for all functions (AWS_* variables)
455458
env := map[string]string{
456459
"AWS_SAM_LOCAL": "true",
460+
"AWS_REGION": creds["region"],
457461
"AWS_DEFAULT_REGION": creds["region"],
458462
"AWS_ACCESS_KEY_ID": creds["key"],
459463
"AWS_SECRET_ACCESS_KEY": creds["secret"],

0 commit comments

Comments
 (0)