Merge pull request #967 from ian-whitestone/add-docker-support

mcrowson · web-flow · commit 1cdbd7f828b6 · 2021-06-19T10:42:14.000-04:00
Update/deploy a lambda using a Docker container image
diff --git a/tests/placebo/TestZappa.test_cli_aws/lambda.GetFunctionConfiguration_1.json b/tests/placebo/TestZappa.test_cli_aws/lambda.GetFunctionConfiguration_1.json
@@ -27,6 +27,7 @@
         "Version": "$LATEST",
         "Environment": {
             "Variables": {}
-        }
+        },
+        "PackageType": "Zip"
     }
 }
diff --git a/tests/placebo/TestZappa.test_cli_aws/lambda.ListVersionsByFunction_2.json b/tests/placebo/TestZappa.test_cli_aws/lambda.ListVersionsByFunction_2.json
@@ -18,7 +18,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-06-02T19:24:32.878+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "1", 
@@ -32,7 +33,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-06-02T19:23:48.902+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "2", 
@@ -46,7 +48,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-06-02T19:24:32.878+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }
         ]
     }
diff --git a/tests/placebo/TestZappa.test_cli_aws/lambda.ListVersionsByFunction_4.json b/tests/placebo/TestZappa.test_cli_aws/lambda.ListVersionsByFunction_4.json
@@ -25,7 +25,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-08-25T03:31:23.343+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "4", 
@@ -39,7 +40,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-08-25T03:29:40.612+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "5", 
@@ -53,7 +55,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-08-25T03:31:18.572+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }
         ]
     }
diff --git a/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.CreateAlias_1.json b/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.CreateAlias_1.json
@@ -0,0 +1,9 @@
+{
+    "status_code": 201,
+    "data": {
+        "AliasArn": "arn:aws:lambda:us-east-1:12345:function:test_lmbda_function55:current-alb-version",
+        "Description": "Zappa Deployment",
+        "FunctionVersion": "1",
+        "Name": "current-alb-version"
+    }
+}
diff --git a/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.CreateFunction_1.json b/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.CreateFunction_1.json
@@ -0,0 +1,20 @@
+{
+    "status_code": 201, 
+    "data": {
+        "CodeSha256": "q4duEOI611sqtkU+YbdNkjH5qGRlgmvc9+FhpdykYuk=", 
+        "FunctionName": "test_lmbda_function55", 
+        "ResponseMetadata": {
+            "HTTPStatusCode": 201, 
+            "RequestId": "12b75ef1-e226-11e5-84a2-ad7ddc64ad40"
+        }, 
+        "CodeSize": 26585626, 
+        "MemorySize": 512, 
+        "FunctionArn": "arn:aws:lambda:us-east-1:12345:function:test_lmbda_function55", 
+        "Version": "1", 
+        "Role": "arn:aws:iam::12345:role/ZappaLambdaExecution", 
+        "Timeout": 30, 
+        "LastModified": "2016-03-04T16:28:06.633+0000", 
+        "Description": "Zappa Deployment",
+        "PackageType": "Image"
+    }
+}
diff --git a/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.DeleteFunctionConcurrency_1.json b/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.DeleteFunctionConcurrency_1.json
@@ -0,0 +1,9 @@
+{
+    "status_code": 200, 
+    "data": {
+        "ResponseMetadata": {
+            "HTTPStatusCode": 200, 
+            "RequestId": "aff3a3f9-28f4-11e6-9dbb-5dd116b9ddf1"
+        }
+    }
+}
diff --git a/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.GetAlias_1.json b/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.GetAlias_1.json
@@ -0,0 +1,9 @@
+{
+    "status_code": 200,
+    "data": {
+        "AliasArn": "arn:aws:lambda:us-east-1:12345:function:test_lmbda_function55:current-alb-version",
+        "Description": "Zappa Deployment",
+        "FunctionVersion": "1",
+        "Name": "current-alb-version"
+    }
+}
diff --git a/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.UpdateAlias_1.json b/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.UpdateAlias_1.json
@@ -0,0 +1,9 @@
+{
+    "status_code": 201,
+    "data": {
+        "AliasArn": "arn:aws:lambda:us-east-1:12345:function:test_lmbda_function55:current-alb-version",
+        "Description": "Zappa Deployment",
+        "FunctionVersion": "1",
+        "Name": "current-alb-version"
+    }
+}
diff --git a/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.UpdateFunctionCode_1.json b/tests/placebo/TestZappa.test_create_lambda_function_docker/lambda.UpdateFunctionCode_1.json
@@ -0,0 +1,20 @@
+{
+    "status_code": 200, 
+    "data": {
+        "CodeSha256": "q4duEOI611sqtkU+YbdNkjH5qGRlgmvc9+FhpdykYuk=", 
+        "FunctionName": "test_lmbda_function55", 
+        "ResponseMetadata": {
+            "HTTPStatusCode": 200, 
+            "RequestId": "153e09be-e226-11e5-a3b8-7b263f053e5a"
+        }, 
+        "CodeSize": 26585626, 
+        "MemorySize": 512, 
+        "FunctionArn": "arn:aws:lambda:us-east-1:12345:function:test_lmbda_function55:1", 
+        "Version": "1", 
+        "Role": "arn:aws:iam::12345:role/ZappaLambdaExecution", 
+        "Timeout": 30, 
+        "LastModified": "2016-03-04T16:28:06.633+0000", 
+        "Description": "Zappa Deployment",
+        "PackageType": "Image"
+    }
+}
diff --git a/tests/placebo/TestZappa.test_is_lambda_function_ready/lambda.GetFunction_1.json b/tests/placebo/TestZappa.test_is_lambda_function_ready/lambda.GetFunction_1.json
@@ -0,0 +1,29 @@
+{
+    "status_code": 200, 
+    "data": {
+        "Code": {
+            "RepositoryType": "S3", 
+            "Location": "https://prod-04-2014-tasks.s3.amazonaws.com/snapshots/724336686645/django-helloworld-unicode-a0d56d69-de7c-421b-9527-f49e100a8613?x-amz-security-token=AQoDYXdzEEka4AOil22HD1z9lkxZ7yiced%2FbYEWzXJHbMHexq2zxzMQ7%2Fj2a06AP9z3nK0QgGPUADK2A6FUpFFl%2BjO7gBmP%2FKifl9jTvvaf72YhPbZDJTIrFvZZ%2B5NjhkDrfRgyK%2BhBROGNH85L46iJSShwZ5lmKgADTnnVMT9pZ2JXF3uNLUzrWoJTpf%2F7lDBMEoFO%2BNLer7MsLsuCiemzKV4Kcvo0Mu3qhkk1u2BfoRTj4xmiaWE7UfqD%2FeQkINdwkUgXeQ9SA1T2l70omZ1ss2l1y18xeUvCQde5OrE7ue5cVpENyjYr9dEwPYwm1wG9%2B%2FJE%2BMQZ8Lz6CNex%2BTVuBvY09JL8vTV7WpRxGhr96a7OIn5YCCQ7cJfNVIWpdBUrWmqnE8Jh9oL558TVA0e5RFP9YU%2BFYxJcA6fH%2B0DZBAAK9797XPltzhSXrUcB8JuHfa%2FC1n2w8X7HbsMTI8m1OAIkQQtppYHtl4T5o3012VcSTLRSv945sCodMOmueKsEwAZlc1gFflcwGXE4v4hB6YJjvcRj2SQiK7Yzw7ShODOroOsWT18te8p9Qjs2mL6akLt1%2Fo8tddWskKzqrfYfBTvfFL5Y0nU4sI96JUXM0KXmJotPRmCdFEktGk4Fre0wm%2FyAau0NdaDQg7NzmtgU%3D&AWSAccessKeyId=ASIAIQFLXUK7E7GUTQ2A&Expires=1457113092&Signature=%2FH0RMGKWk1tEGnK9R6CCPXQ6Y04%3D"
+        }, 
+        "Configuration": {
+            "Version": "7", 
+            "CodeSha256": "t3pcqjdrLOqd2p0bRsCEOhgvLJ9sLJrVazpGqhDybsc=", 
+            "FunctionName": "django-helloworld-unicode", 
+            "MemorySize": 512, 
+            "CodeSize": 12154784, 
+            "FunctionArn": "arn:aws:lambda:us-east-1:724336686645:function:django-helloworld-unicode:7", 
+            "Handler": "handler.lambda_handler", 
+            "Role": "arn:aws:iam::724336686645:role/ZappaLambdaExecution", 
+            "Timeout": 30, 
+            "LastModified": "2016-03-01T00:24:01.446+0000", 
+            "Runtime": "python2.7", 
+            "Description": "Zappa Deployment",
+            "State": "Active",
+            "LastUpdateStatus": "Successful"
+        }, 
+        "ResponseMetadata": {
+            "HTTPStatusCode": 200, 
+            "RequestId": "78da1863-e22e-11e5-a5ae-01cbfdebdc8f"
+        }
+    }
+}
diff --git a/tests/placebo/TestZappa.test_rollback_lambda_function_version/lambda.ListVersionsByFunction_1.json b/tests/placebo/TestZappa.test_rollback_lambda_function_version/lambda.ListVersionsByFunction_1.json
@@ -18,7 +18,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:55:35.845+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "1", 
@@ -32,7 +33,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T14:39:31.557+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "2", 
@@ -46,7 +48,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T14:47:04.499+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "3", 
@@ -60,7 +63,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T14:58:08.443+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "4", 
@@ -74,7 +78,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T16:25:49.425+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "5", 
@@ -88,7 +93,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T16:34:47.988+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "6", 
@@ -102,7 +108,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:12:28.708+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "7", 
@@ -116,7 +123,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:24:01.446+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "8", 
@@ -130,7 +138,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:55:35.845+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }
         ]
     }
diff --git a/tests/placebo/TestZappa.test_rollback_lambda_function_version/lambda.ListVersionsByFunction_2.json b/tests/placebo/TestZappa.test_rollback_lambda_function_version/lambda.ListVersionsByFunction_2.json
@@ -18,7 +18,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:55:35.845+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "1", 
@@ -32,7 +33,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T14:39:31.557+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "2", 
@@ -46,7 +48,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T14:47:04.499+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "3", 
@@ -60,7 +63,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T14:58:08.443+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "4", 
@@ -74,7 +78,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T16:25:49.425+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "5", 
@@ -88,7 +93,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-02-29T16:34:47.988+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "6", 
@@ -102,7 +108,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:12:28.708+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "7", 
@@ -116,7 +123,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:24:01.446+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }, 
             {
                 "Version": "8", 
@@ -130,7 +138,8 @@
                 "Timeout": 30, 
                 "LastModified": "2016-03-01T00:55:35.845+0000", 
                 "Runtime": "python2.7", 
-                "Description": "Zappa Deployment"
+                "Description": "Zappa Deployment",
+                "PackageType": "Zip"
             }
         ]
     }
diff --git a/tests/placebo/TestZappa.test_rollback_lambda_function_version_docker/lambda.ListVersionsByFunction_1.json b/tests/placebo/TestZappa.test_rollback_lambda_function_version_docker/lambda.ListVersionsByFunction_1.json
diff --git a/tests/placebo/TestZappa.test_rollback_lambda_function_version_docker/lambda.ListVersionsByFunction_2.json b/tests/placebo/TestZappa.test_rollback_lambda_function_version_docker/lambda.ListVersionsByFunction_2.json
diff --git a/tests/tests.py b/tests/tests.py
diff --git a/tests/tests_placebo.py b/tests/tests_placebo.py
diff --git a/zappa/cli.py b/zappa/cli.py
diff --git a/zappa/core.py b/zappa/core.py

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`"Version": "$LATEST",`
`28`	`28`	`"Environment": {`
`29`	`29`	`"Variables": {}`
`30`		`- }`
	`30`	`+ },`
	`31`	`+ "PackageType": "Zip"`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@`
`18`	`18`	`"Timeout": 30,`
`19`	`19`	`"LastModified": "2016-06-02T19:24:32.878+0000",`
`20`	`20`	`"Runtime": "python2.7",`
`21`		`- "Description": "Zappa Deployment"`
	`21`	`+ "Description": "Zappa Deployment",`
	`22`	`+ "PackageType": "Zip"`
`22`	`23`	`},`
`23`	`24`	`{`
`24`	`25`	`"Version": "1",`
`@@ -32,7 +33,8 @@`
`32`	`33`	`"Timeout": 30,`
`33`	`34`	`"LastModified": "2016-06-02T19:23:48.902+0000",`
`34`	`35`	`"Runtime": "python2.7",`
`35`		`- "Description": "Zappa Deployment"`
	`36`	`+ "Description": "Zappa Deployment",`
	`37`	`+ "PackageType": "Zip"`
`36`	`38`	`},`
`37`	`39`	`{`
`38`	`40`	`"Version": "2",`
`@@ -46,7 +48,8 @@`
`46`	`48`	`"Timeout": 30,`
`47`	`49`	`"LastModified": "2016-06-02T19:24:32.878+0000",`
`48`	`50`	`"Runtime": "python2.7",`
`49`		`- "Description": "Zappa Deployment"`
	`51`	`+ "Description": "Zappa Deployment",`
	`52`	`+ "PackageType": "Zip"`
`50`	`53`	`}`
`51`	`54`	`]`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`"Timeout": 30,`
`26`	`26`	`"LastModified": "2016-08-25T03:31:23.343+0000",`
`27`	`27`	`"Runtime": "python2.7",`
`28`		`- "Description": "Zappa Deployment"`
	`28`	`+ "Description": "Zappa Deployment",`
	`29`	`+ "PackageType": "Zip"`
`29`	`30`	`},`
`30`	`31`	`{`
`31`	`32`	`"Version": "4",`
`@@ -39,7 +40,8 @@`
`39`	`40`	`"Timeout": 30,`
`40`	`41`	`"LastModified": "2016-08-25T03:29:40.612+0000",`
`41`	`42`	`"Runtime": "python2.7",`
`42`		`- "Description": "Zappa Deployment"`
	`43`	`+ "Description": "Zappa Deployment",`
	`44`	`+ "PackageType": "Zip"`
`43`	`45`	`},`
`44`	`46`	`{`
`45`	`47`	`"Version": "5",`
`@@ -53,7 +55,8 @@`
`53`	`55`	`"Timeout": 30,`
`54`	`56`	`"LastModified": "2016-08-25T03:31:18.572+0000",`
`55`	`57`	`"Runtime": "python2.7",`
`56`		`- "Description": "Zappa Deployment"`
	`58`	`+ "Description": "Zappa Deployment",`
	`59`	`+ "PackageType": "Zip"`
`57`	`60`	`}`
`58`	`61`	`]`
`59`	`62`	`}`