s3_key and bucket needs to have default values

so they're not considered mandatory even when  is

Author: Rafael Felix Correa

archive.tf

@@ -5,8 +5,8 @@ locals {
 # Generates a filename for the zip archive based on the contents of the files
 # in source_path. The filename will change when the source code changes.
 data "external" "archive" {
-  count = "${var.source_from_s3 ? 0 : 1}"
-  program = ["python", "${path.module}/hash.py"]
+  count   = "${var.source_from_s3 ? 0 : 1}"
+  program = ["${path.module}/hash.py"]
 
   query = {
     build_command  = "${var.build_command}"
@@ -36,12 +36,8 @@ resource "null_resource" "archive" {
 # deletes the Lambda function. If the file is rebuilt here, the build
 # output is unfortunately invisible.
 data "external" "built" {
-<<<<<<< HEAD
-  program = ["python", "${path.module}/built.py"]
-=======
-  count = "${var.source_from_s3 ? 0 : 1}"
+  count   = "${var.source_from_s3 ? 0 : 1}"
   program = ["${path.module}/built.py"]
->>>>>>> Support for lambda source from S3
 
   query = {
     build_command  = "${lookup(data.external.archive.result, "build_command")}"

lambda.tf

@@ -46,8 +46,8 @@ resource "aws_lambda_function" "lambda_s3" {
   timeout                        = "${var.timeout}"
   tags                           = "${var.tags}"
 
-  s3_bucket                      = "${var.s3_bucket}"
-  s3_key                         = "${var.s3_key}"
+  s3_bucket = "${var.s3_bucket}"
+  s3_key    = "${var.s3_key}"
 
   # The aws_lambda_function resource has a schema for the environment
   # variable, where the only acceptable values are:

variables.tf

@@ -94,11 +94,13 @@ variable "source_from_s3" {
 variable "s3_bucket" {
     description = "The S3 bucket location containing the function's deployment package. Required when `source_from_s3` = `true`. This bucket must reside in the same AWS region where you are creating the Lambda function."
     type        = "string"
+    default     = ""
 }
 
 variable "s3_key" {
     description = "The S3 key of an object containing the function's deployment package. Required when `source_from_s3` = `true`"
     type        = "string"
+    default     = ""
 }
 
 variable "tags" {