From a686243eab4657729be0c5a02c1d43e5c7fbffe3 Mon Sep 17 00:00:00 2001 From: Sanath Kumar Ramesh Date: Tue, 15 Aug 2017 22:49:01 -0700 Subject: [PATCH] Don't set region if not configured in CLI. Fixes #48 --- runtime.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime.go b/runtime.go index 76a857593b..f55f4c6e84 100644 --- a/runtime.go +++ b/runtime.go @@ -331,7 +331,10 @@ func getSessionOrDefaultCreds() map[string]string { // Obtain AWS credentials and pass them through to the container runtime via env variables if sess, err := session.NewSession(); err == nil { if creds, err := sess.Config.Credentials.Get(); err == nil { - result["region"] = *sess.Config.Region + if *sess.Config.Region != "" { + result["region"] = *sess.Config.Region + } + result["key"] = creds.AccessKeyID result["secret"] = creds.SecretAccessKey result["sessiontoken"] = creds.SessionToken @@ -454,6 +457,7 @@ func getEnvironmentVariables(function resources.AWSServerlessFunction, overrides // Variables available in Lambda execution environment for all functions (AWS_* variables) env := map[string]string{ "AWS_SAM_LOCAL": "true", + "AWS_REGION": creds["region"], "AWS_DEFAULT_REGION": creds["region"], "AWS_ACCESS_KEY_ID": creds["key"], "AWS_SECRET_ACCESS_KEY": creds["secret"],