update events

enrollments-events/template.yaml

@@ -307,12 +307,10 @@ Resources:
                 keys:
                   sk: [SCHEDULE#REMINDER_CERT_EXPIRATION_BEFORE_30_DAYS]
 
-  # If there is no certificate and the access period has ended,
-  # the enrollment will be marked as expired
-  EventSetAsExpiredFunction:
+  EventSetAccessExpiredFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: events.set_as_expired.lambda_handler
+      Handler: events.set_access_expired.lambda_handler
       LoggingConfig:
         LogGroup: !Ref EventLog
       Policies:
@@ -327,13 +325,12 @@ Resources:
               detail-type: [EXPIRE]
               detail:
                 keys:
-                  sk: [SCHEDULE#SET_AS_EXPIRED]
+                  sk: [SCHEDULE#SET_ACCESS_EXPIRED, SCHEDULE#SET_AS_EXPIRED]
 
-  # After the certificate expires, the enrollment will be marked as archived
-  EventSetAsArchivedFunction:
+  EventSetCertExpiredFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: events.set_as_archived.lambda_handler
+      Handler: events.set_cert_expired.lambda_handler
       LoggingConfig:
         LogGroup: !Ref EventLog
       Policies:
@@ -348,7 +345,7 @@ Resources:
               detail-type: [EXPIRE]
               detail:
                 keys:
-                  sk: [SCHEDULE#SET_AS_ARCHIVED]
+                  sk: [SCHEDULE#SET_CERT_EXPIRED, SCHEDULE#SET_AS_ARCHIVED]
 
   EventScheduleRemindersFunction:
     Type: AWS::Serverless::Function