Merge branch 'develop' into tuning-local-test

Author: keillera

.circleci/config.yml

@@ -27,8 +27,8 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "requirements.txt" }}
-          - v1-dependencies-
+          - v2-dependencies-{{ checksum "requirements.txt" }}
+          - v2-dependencies-
 
       - run:
           name: install dependencies
@@ -41,7 +41,7 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: v1-dependencies-{{ checksum "requirements.txt" }}
+          key: v2-dependencies-{{ checksum "requirements.txt" }}
 
       - run:
           name: run checkstyle for python code

.envrc.sample

@@ -4,6 +4,13 @@
 ## すべてのサブシステムで同じ値を使う必要がある
 export ALIS_APP_ID=foobar
 
+# CloudFormationで生成されたAPI GatewayのAPI ID
+# スクリプトから各APIに事後処理を行うために使用する
+# 現状、SAMがIAM認証をサポートしていないため
+# TODO: SAMがIAM認証をサポートしたらteplate.yamlに集約してこの値とスクリプトを除却する
+#   - see: https://github.com/awslabs/serverless-application-model/issues/248
+export SERVERLESS_REST_API_ID=pe6odilrre
+
 # --- AWS ---
 
 ## aws-cli

README.md

@@ -111,3 +111,12 @@ Specify generated Cognito User Pool ARN to SSM.
 ./deploy.sh api
 python elasticsearch-setup.py YourGlobalIP
 ```
+
+### Fix API settings via a script
+
+```bash
+# Set SERVERLESS_REST_API_ID to .envrc
+direnv edit
+
+./fix_api.sh
+```

exec_test.py

@@ -26,7 +26,7 @@ def copy_required_files(path):
     test_dir = path[:path.rfind('/')]
 
     # テスト対象ソースを複製（対象ソースは tests 配下と同一構造の src ディレクトリ配下が対象）
-    copy_tree(re.sub('^\./tmp_tests', './src', test_dir), test_dir)
+    copy_tree(re.sub(r'^\./tmp_tests', './src', test_dir), test_dir)
 
     # 共通ライブラリを複製
     copy_tree('./src/common', test_dir)

fix_api.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Delete unnecessary Stage "Stage"
+# SAM's bug? https://github.com/awslabs/serverless-application-model/issues/168
+aws apigateway delete-stage --rest-api-id ${SERVERLESS_REST_API_ID} --stage-name Stage
+
+# ---
+
+# Enable logs
+aws apigateway update-stage --rest-api-id ${SERVERLESS_REST_API_ID} --stage-name 'api' --patch-operations op=replace,path=/*/*/logging/dataTrace,value=true
+aws apigateway update-stage --rest-api-id ${SERVERLESS_REST_API_ID} --stage-name 'api' --patch-operations op=replace,path=/*/*/logging/loglevel,value=INFO
+aws apigateway update-stage --rest-api-id ${SERVERLESS_REST_API_ID} --stage-name 'api' --patch-operations op=replace,path=/*/*/metrics/enabled,value=true

src/common/settings.py

@@ -13,13 +13,13 @@
         'type': 'string',
         'minLength': 3,
         'maxLength': 30,
-        'pattern': '^(?!.*--)[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]$'
+        'pattern': r'^(?!.*--)[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]$'
     },
     'phone_number': {
         'type': 'string',
         'minLength': 13,
         'maxLength': 13,
-        'pattern': '^\+81[6-9]0\d{8}$'
+        'pattern': r'^\+81[6-9]0\d{8}$'
     },
     'icon_image': {
         'type': 'string',

tests/handlers/me/articles/comments/create/test_me_articles_comments_create.py

@@ -13,6 +13,8 @@ def setUp(self):
         TestsUtil.set_all_tables_name_to_env()
         TestsUtil.delete_all_tables(self.dynamodb)
 
+        os.environ['SALT_FOR_ARTICLE_ID'] = 'test_salt'
+
         self.article_info_table = self.dynamodb.Table(os.environ['ARTICLE_INFO_TABLE_NAME'])
         self.article_info_table_items = [
             {