Merge pull request #11 from y-temp4/fix-template

ALIS-3187: Fix template

Author: keillera

README.md

@@ -108,5 +108,5 @@ $ aws cloudformation update-stack --stack-name <スタック名> --template-url
 APIをデプロイ後にdns-templateのスタックをデプロイすることでドメインが割り当てられます
 
 ```
-aws cloudformation deploy --stack-name <スタック名> --template /path/to/dns-template.yml --capabilities '["CAPABILITY_AUTO_EXPAND"]' --parameter-overrides Doamin=<ネイキッドドメイン> SubDomain=<サブドメイン> HostedZoneId=<Route53のゾーンID> RestApiId=<割り当てたいAPIのID> CertificateArn=<ACMで発行した証明書のARN>
+aws cloudformation deploy --stack-name <スタック名> --template /path/to/dns-template.yml --capabilities '["CAPABILITY_AUTO_EXPAND"]' --parameter-overrides AlisAppId=$ALIS_APP_ID Doamin=<ネイキッドドメイン> SubDomain=<サブドメイン> HostedZoneId=<Route53のゾーンID> RestApiId=<割り当てたいAPIのID> CertificateArn=<ACMで発行した証明書のARN>
 ```

dns-template.yml

@@ -2,6 +2,8 @@ AWSTemplateFormatVersion: '2010-09-09'
 Description: OAuth API Domain
 
 Parameters:
+  AlisAppId:
+    Type: String
   Doamin:
     Type: String
     Default: alis.to
@@ -27,18 +29,15 @@ Resources:
       TTL: 60
       Type: CNAME
       ResourceRecords:
-      - !GetAtt RestApiDomain.RegionalDomainName
+      - !GetAtt RestApiDomain.DistributionDomainName
   RestApiDomain:
     Type: AWS::ApiGateway::DomainName
     Properties:
       DomainName: !Sub
       - ${SubDomain}.${Domain}
       - SubDomain: !Ref SubDomain
         Domain: !Ref Doamin
-      EndpointConfiguration:
-        Types:
-        - REGIONAL
-      RegionalCertificateArn: !Ref CertificateArn
+      CertificateArn: !Ref CertificateArn
   ApiBasePathMapping:
     Type: AWS::ApiGateway::BasePathMapping
     Properties:
@@ -47,7 +46,7 @@ Resources:
       - SubDomain: !Ref SubDomain
         Domain: !Ref Doamin
       RestApiId: !Ref RestApiId
-      Stage: production
+      Stage: !Ref AlisAppId
     DependsOn:
       - RestApiRecordSet
       - RestApiDomain

serverless.yml

@@ -8,8 +8,8 @@ provider:
   endpointType: regional
   memorySize: 256
   environment:
-    AUTHLETE_API_KEY: ${ssm:${env:ALIS_APP_ID}ssmAutlteleApiKey}
-    AUTHLETE_API_SECRET: ${ssm:${env:ALIS_APP_ID}ssmAutlteleApiSecret}
+    AUTHLETE_API_KEY: ${ssm:${env:ALIS_APP_ID}ssmAuthleteApiKey}
+    AUTHLETE_API_SECRET: ${ssm:${env:ALIS_APP_ID}ssmAuthleteApiSecret}
     COGNITO_USER_POOL_ID: ${ssm:${env:ALIS_APP_ID}ssmCognitoUserPoolId}
   iamRoleStatements:
     - Effect: "Allow"

tests/integration/common.py

@@ -55,11 +55,11 @@ def __init__(self, client_id, client_secret=None):
 
         ssm = boto3.client('ssm')
         param = ssm.get_parameter(
-            Name=os.environ['ALIS_APP_ID'] + 'ssmAutlteleApiKey'
+            Name=os.environ['ALIS_APP_ID'] + 'ssmAuthleteApiKey'
         )
         self.authlete_api_key = param['Parameter']['Value']
         param = ssm.get_parameter(
-            Name=os.environ['ALIS_APP_ID'] + 'ssmAutlteleApiSecret'
+            Name=os.environ['ALIS_APP_ID'] + 'ssmAuthleteApiSecret'
         )
         self.authlete_api_secret = param['Parameter']['Value']