Fix env mappings

cinderellagarage · Feb 20, 2018 · a169689 · a169689
1 parent 6c200da
commit a169689
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs b/dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs
@@ -27,16 +27,12 @@ private MockLambdaContext()
         public MockLambdaContext(string eventBody, IDictionary environment) : this()
         {
             EventBody = eventBody;
-            foreach (var propertyInfo in this.GetType().GetProperties().ToList())
+            foreach (var propertyInfo in this.GetType().GetProperties())
             {
-                var attributes = propertyInfo.CustomAttributes.OfType<EnvMappingAttribute>();
-                foreach (var mappingAttribute in attributes.ToList())
+                var attributes = propertyInfo.GetCustomAttributes(typeof(EnvMappingAttribute), false);
+                foreach (var mappingAttribute in attributes.Cast<EnvMappingAttribute>())
                 {
-                    string value = mappingAttribute.DefaultValue;
-                    if (environment.Contains(mappingAttribute.Key))
-                    {
-                        value = environment[mappingAttribute.Key].ToString();
-                    }
+                    var value = environment[mappingAttribute.Key] ?? mappingAttribute.DefaultValue;
                     propertyInfo.SetValue(this, Convert.ChangeType(value, propertyInfo.PropertyType));
                 }
             }
@@ -105,10 +101,10 @@ public string OutputText
         [EnvMapping("AWS_LAMBDA_FUNCTION_VERSION")]
         public string FunctionVersion { get; set; }
 
-        [EnvMapping("AWS_LAMBDA_FUNCTION_TIMEOUT")]
+        [EnvMapping("AWS_LAMBDA_FUNCTION_TIMEOUT", "300")]
         public int Timeout { get; set; }
 
-        [EnvMapping("AWS_LAMBDA_FUNCTION_MEMORY_SIZE")]
+        [EnvMapping("AWS_LAMBDA_FUNCTION_MEMORY_SIZE", "1536")]
         public int MemorySize { get; set; }
     }
-}
+}