Merge branch 'stage' into 52-betechtix-add-multi-usage-discount-codes-feature

Author: ASPactores

.github/workflows/deploy_backend.yml

@@ -64,6 +64,6 @@ jobs:
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
           sls deploy --stage prod --verbose
           elif [[ "${{ github.ref }}" == "refs/heads/stage" ]]; then
-          sls deploy --stage dev --verbose
+          sls deploy --stage staging --verbose
           fi
         working-directory: backend

backend/model/pycon_registrations/pycon_registration.py

@@ -41,11 +41,9 @@ class PyconRegistration(BaseModel):
     contactNumber: str = Field(..., title='Contact Number')
     organization: str = Field(..., title='Affiliated Company or Organization')
     jobTitle: str = Field(..., title='Job Title', description='Your current job title or role in tech')
-
     socials: Optional[SocialMedia] = Field(
         None, title='Social Media Profiles', description='Links to your social media profiles'
     )
-
     ticketType: TicketTypes = Field(title='Ticket Type', description='Type of ticket you are registering for')
     sprintDay: bool = Field(
         ..., title='Sprint Day Participation', description='Will you be participating in the sprint day?'
@@ -155,3 +153,6 @@ class PyconRegistrationIn(PyconRegistration):
     referenceNumber = UnicodeAttribute(null=True)
     amountPaid = NumberAttribute(null=True)
     transactionId = UnicodeAttribute(null=True)
+
+    class Config:
+        arbitrary_types_allowed = True

backend/serverless.yaml

@@ -71,13 +71,46 @@ provider:
       !ImportValue AppClientId-${self:custom.stage}
     SPARCS_GMAIL: sparcsup@gmail.com
   logs:
-    restApi: true
+    restApi:
+      role: !GetAtt ApiGatewayCloudWatchRole.Arn
+
 
 resources:
   - ${file(resources/dynamodb.yml)}
   - ${file(resources/api_gateway.yml)}
   - ${file(resources/s3.yml)}
   - ${file(resources/sqs.yml)}
+  - Resources:
+      ApiGatewayCloudWatchRole:
+        Type: AWS::IAM::Role
+        Properties:
+          RoleName: serverlessApiGatewayCloudWatchRole-${self:custom.serviceName}-${self:custom.stage}
+          AssumeRolePolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+            - Effect: Allow
+              Principal:
+                Service: apigateway.amazonaws.com
+              Action: sts:AssumeRole
+          Policies:
+            - PolicyName: AllowCloudWatchLogs
+              PolicyDocument:
+                Version: "2012-10-17"
+                Statement:
+                - Effect: Allow
+                  Action:
+                    - logs:CreateLogGroup
+                    - logs:CreateLogStream
+                    - logs:DescribeLogGroups
+                    - logs:DescribeLogStreams
+                    - logs:PutLogEvents
+                  Resource: "*"
+    Outputs:
+      ApiGatewayCloudWatchRoleArn:
+        Value: !GetAtt ApiGatewayCloudWatchRole.Arn
+        Export:
+          Name: ApiGatewayCloudWatchRole-${self:custom.serviceName}-${self:custom.stage}
+
 
 functions:
   - ${file(resources/api.yml)}