change deploy style from zip to raw.

Makefile

@@ -2,19 +2,24 @@ SHELL = /usr/bin/env bash -xeuo pipefail
 
 include Makevars
 
-TEST_INTEG_TARGETS := $(shell find test -name '*.bats')
-
 GIT_COMMIT := $(shell git log -n 1 --format=%h)
 ZIP_FILE := $(GIT_COMMIT).zip
 UPLOAD_FILE := deploy/$(ZIP_FILE)
-BASE := src/functions
-DIR := $(sort $(dir $(wildcard $(BASE)/*/)))
-TARGETS := $(patsubst $(BASE)/%/, %, $(DIR))
+BASE := src/functions/handlers
+TEMPLATES := $(sort $(notdir $(wildcard templates/template_*.yaml)))
+TARGETS := $(patsubst template_%.yaml, %, $(TEMPLATES))
+
 UPLOAD_TASK := $(addprefix upload-, $(TARGETS))
 DEPLOY_TASK := $(addprefix deploy-, $(TARGETS))
 
 
-all: guard-env clean test-unit test-integ dist $(UPLOAD_TASK) $(DEPLOY_TASK)
+
+all: guard-env clean format test-unit dist $(UPLOAD_TASK) $(DEPLOY_TASK)
+	@echo $(UPLOAD_TASK)
+	@echo $(DEPLOY_TASK)
+
+display:
+	@echo $(TARGETS)
 	@echo $(UPLOAD_TASK)
 	@echo $(DEPLOY_TASK)
 
@@ -27,19 +32,19 @@ localstack-up:
 localstack-stop:
 	@docker-compose stop localstack
 
-test-unit:
-	python -m pytest
+format:
+	-yapf -ir src/
+	-yapf -ir test/
 
-test-integ: localstack-up
-	@echo $(TEST_INTEG_TARGETS)
-	@echo $(DOCKER_NAME)
-	@DOCKER_NAME=$(DOCKER_NAME) bats $(TEST_INTEG_TARGETS)
+test-unit:
+	@python -m pytest test/
 
 clean:
 	-rm -rf deploy/
 	-rm packaged-*.yaml
+	-rm template_*.yaml
 
-dist:
+dist: format
 	@pip install -r requirements.txt -t deploy
 	@cp -R src deploy
 	@find deploy -type f -name \*.pyc -o -name \*.pyo | xargs rm
@@ -57,7 +62,7 @@ deploy: guard-env $(DEPLOY_TASK)
 	@echo $(UPLOAD_TASK)
 	@echo $(DEPLOY_TASK)
 
-upload-%: $(UPLOAD_FILE)
+upload-%: guard-env $(UPLOAD_FILE)
 	@ if [ "${*}" = "" ]; then \
 		echo "Target is not set"; \
 		exit 1; \
@@ -67,28 +72,33 @@ upload-%: $(UPLOAD_FILE)
 	else \
 		s3_keyname="${*}/$(ZIP_FILE)" && \
 		echo $${s3_keyname} && \
-		aws s3 cp $(UPLOAD_FILE) $(S3_BUCKET_URL)/$${s3_keyname} ; \
+		aws s3 cp $(UPLOAD_FILE) s3://$${env}-$(S3_BUCKET)/$${s3_keyname} ; \
 	fi
 
-deploy-%: template_%.yaml guard-env
+deploy-%: templates/template_%.yaml guard-env guard-account_id
 	@ if [ "${*}" = "" ]; then \
 		echo "Target is not set"; \
 		exit 1; \
 	elif [ ! -d "$(BASE)/${*}" ]; then \
 		echo "Target directory $(BASE)/$* does not exists."; \
 		exit 1; \
 	else \
+		cat templates/template_${*}.yaml templates/lambda_common_parameters.yaml > template_${*}.yaml && \
+		stack_name_hyphen=$(subst _,-,$(*)) && \
 		s3_keyname="${*}/$(ZIP_FILE)" && \
 		aws cloudformation package \
 			--template-file template_${*}.yaml \
-			--s3-bucket $(S3_BUCKET_URL) \
+			--s3-bucket $${env}-$(S3_BUCKET) \
 			--output-template-file packaged-${*}.yaml && \
 		aws cloudformation deploy \
 			--template-file packaged-${*}.yaml \
-			--stack-name $${env}-${*}-lambda  \
+			--stack-name $${env}-$${stack_name_hyphen}-lambda  \
 			--capabilities CAPABILITY_IAM \
+			--no-fail-on-empty-changeset \
 			--parameter-overrides \
 				Env=$${env} \
+				AccountId=$${account_id} \
+				Region=ap-northeast-1 \
 				CodeKey=$${s3_keyname} ; \
 	fi
 
@@ -103,7 +113,7 @@ guard-%:
 	localstack-up \
 	localstack-stop \
 	test-unit \
-	test-integ \
 	dist \
 	upload \
 	clean \
+	format

Makevars

@@ -1,4 +1,4 @@
 # enter your own environment values.
 
-S3_BUCKET_URL := s3://hero-lambda-deploy
+S3_BUCKET := hero-lambda-deploy
 DOCKER_NAME := pythonlambdatemplate_default

src/functions/heroes/index.py → src/functions/handlers/heroes/index.py

@@ -5,7 +5,7 @@
 import uuid
 from builtins import Exception
 import os
-from src.functions.heroes.utils import *
+from src.functions.handlers.heroes.utils import *
 
 DYNAMODB_ENDPOINT = os.getenv('DYNAMODB_ENDPOINT')
 HERO_TABLE_NAME = os.getenv('HERO_TABLE_NAME')

src/functions/heroes/utils.py → src/functions/handlers/heroes/utils.py

@@ -8,11 +8,12 @@
 def epoc_by_second_precision(time: datetime):
     return decimal.Decimal(time.replace(microsecond=0).timestamp())
 
+
 class DecimalEncoder(json.JSONEncoder):
     def default(self, o):
         if isinstance(o, decimal.Decimal):
             if o % 1 > 0:
                 return float(o)
             else:
                 return int(o)
-        return super(DecimalEncoder, self).default(o)
+        return super(DecimalEncoder, self).default(o)

src/functions/offices/index.py → src/functions/handlers/offices/index.py

@@ -5,7 +5,7 @@
 import uuid
 from builtins import Exception
 import os
-from src.functions.heroes.utils import *
+from src.functions.handlers.heroes.utils import *
 
 ENV = os.getenv('ENV')
 DYNAMODB_ENDPOINT = os.getenv('DYNAMODB_ENDPOINT')

src/functions/handlers/sponsors/index.py

@@ -0,0 +1,62 @@
+"""This is python3.6 program."""
+
+import boto3
+import datetime
+import uuid
+from builtins import Exception
+import os
+from src.functions.handlers.heroes.utils import *
+
+ENV = os.getenv('ENV')
+DYNAMODB_ENDPOINT = os.getenv('DYNAMODB_ENDPOINT')
+SPONSOR_TABLE_NAME = os.getenv('SPONSOR_TABLE_NAME')
+
+print(DYNAMODB_ENDPOINT)
+print(SPONSOR_TABLE_NAME)
+
+DYNAMO = boto3.resource(
+    'dynamodb',
+    endpoint_url=DYNAMODB_ENDPOINT
+)
+
+DYNAMODB_TABLE = DYNAMO.Table(SPONSOR_TABLE_NAME)
+
+
+
+def get(event, context):
+    try:
+        sponsor_id = event['id']
+
+        dynamo_response = DYNAMODB_TABLE.get_item(
+            Key={
+                'id': sponsor_id
+            }
+        )
+
+        response = json.dumps(dynamo_response['Item'], cls=DecimalEncoder, ensure_ascii=False)
+
+        return response
+
+    except Exception as error:
+        raise error
+
+def put(event, context):
+    try:
+        sponsor_id = str(uuid.uuid4())
+
+        name = event.get('name')
+        address = event.get('address')
+        updated_at = epoc_by_second_precision(datetime.now())
+
+        response = DYNAMODB_TABLE.put_item(
+            Item={
+                'id': sponsor_id,
+                'name': name,
+                'address': address,
+                'updated_at': updated_at,
+                'created_at': updated_at,
+            }
+        )
+        return response
+    except Exception as error:
+        raise error

templates/lambda_common_parameters.yaml

@@ -0,0 +1,43 @@
+Parameters:
+  Env:
+    Type: String
+    Default: local
+  DynamoDBEndpoint:
+    Type: String
+    Default: https://dynamodb.ap-northeast-1.amazonaws.com/
+  HeroTableName:
+    Type: String
+    Default: CM-Heroes
+  OfficeTableName:
+    Type: String
+    Default: CM-Offices
+  SponsorTableName:
+    Type: String
+    Default: CM-Sponsors
+  AccountId:
+    Type: String
+    Default: 99999999999
+  BucketName:
+    Type: String
+    Default: hero-lambda-deploy
+  CodeKey:
+    Type: String
+    Default: heroes/0000.zip
+  GetHeroesFunctionName:
+    Type: String
+    Default: heroes-get_heroes
+  PutHeroesFunctionName:
+    Type: String
+    Default: heroes-put_heroes
+  GetOfficesFunctionName:
+    Type: String
+    Default: heroes-get_offices
+  PutOfficesFunctionName:
+    Type: String
+    Default: heroes-put_offices
+  GetSponsorsFunctionName:
+    Type: String
+    Default: heroes-get_sponsores
+  PutSponsorsFunctionName:
+    Type: String
+    Default: heroes-put_sponsores

template_heroes.yaml → templates/template_heroes.yaml

@@ -1,34 +1,17 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: AWS::Serverless-2016-10-31
 Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
-Parameters:
-  Env:
-    Type: String
-    Default: local
-  DynamoDBEndpoint:
-    Type: String
-    Default: https://dynamodb.ap-northeast-1.amazonaws.com/
-  HeroTableName:
-    Type: String
-    Default: CM-Heroes
-  BucketName:
-    Type: String
-    Default: hero-lambda-deploy
-  CodeKey:
-    Type: String
-    Default: heroes/0000.zip
 Resources:
   GetHeroes:
     Type: AWS::Serverless::Function
     Properties:
       FunctionName:
-        Fn::Sub: ${Env}-heroes-GetHeroes
-      Handler: src/functions/heroes/index.get
+        Fn::Sub: ${Env}-${GetHeroesFunctionName}
+      Role:
+        Fn::Sub: arn:aws:iam::${AccountId}:role/${Env}-heroes-lambda
+      Handler: src/functions/handlers/heroes/index.get
       Runtime: python3.6
-      CodeUri:
-          Bucket: !Ref BucketName
-          Key: !Ref CodeKey
-      Policies: AmazonDynamoDBReadOnlyAccess
+      CodeUri: src/functions
       Environment:
         Variables:
           ENV: !Ref Env
@@ -39,13 +22,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       FunctionName:
-        Fn::Sub: ${Env}-heroes-PutHeroes
+        Fn::Sub: ${Env}-${PutHeroesFunctionName}
+      Role:
+        Fn::Sub: arn:aws:iam::${AccountId}:role/${Env}-heroes-lambda
       Handler: src/functions/heroes/index.put
       Runtime: python3.6
-      CodeUri:
-          Bucket: !Ref BucketName
-          Key: !Ref CodeKey
-      Policies: AmazonDynamoDBFullAccess
+      CodeUri: src/functions
       Environment:
         Variables:
           ENV: !Ref Env