100% coverage, simplify deployment models

aws · Jun 4, 2019 · 52b993f · 52b993f
1 parent 87080f0
commit 52b993f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/chalice/awsclient.py b/chalice/awsclient.py
@@ -717,6 +717,9 @@ def get_or_create_rule_arn(
             params['ScheduleExpression'] = schedule_expression
         elif event_pattern:
             params['EventPattern'] = event_pattern
+        else:
+            raise ValueError(
+                "schedule_expression or event_pattern required")
         rule_arn = events.put_rule(**params)
         return rule_arn['RuleArn']
 

diff --git a/chalice/deploy/models.py b/chalice/deploy/models.py
@@ -165,10 +165,7 @@ def dependencies(self):
 
 
 @attrs
-class CloudWatchEvent(ManagedModel):
-    resource_type = 'cw_event'
-    rule_name = attrib()        # type: str
-    event_pattern = attrib()    # type: str
+class FunctionEventSubscriber(ManagedModel):
     lambda_function = attrib()  # type: LambdaFunction
 
     def dependencies(self):
@@ -177,15 +174,17 @@ def dependencies(self):
 
 
 @attrs
-class ScheduledEvent(ManagedModel):
+class CloudWatchEvent(FunctionEventSubscriber):
+    resource_type = 'cw_event'
+    rule_name = attrib()        # type: str
+    event_pattern = attrib()    # type: str
+
+
+@attrs
+class ScheduledEvent(FunctionEventSubscriber):
     resource_type = 'scheduled_event'
     rule_name = attrib()            # type: str
     schedule_expression = attrib()  # type: str
-    lambda_function = attrib()      # type: LambdaFunction
-
-    def dependencies(self):
-        # type: () -> List[Model]
-        return [self.lambda_function]
 
 
 @attrs
@@ -202,37 +201,22 @@ def dependencies(self):
 
 
 @attrs
-class S3BucketNotification(ManagedModel):
+class S3BucketNotification(FunctionEventSubscriber):
     resource_type = 's3_event'
     bucket = attrib()           # type: str
     events = attrib()           # type: List[str]
     prefix = attrib()           # type: Optional[str]
     suffix = attrib()           # type: Optional[str]
-    lambda_function = attrib()  # type: LambdaFunction
-
-    def dependencies(self):
-        # type: () -> List[Model]
-        return [self.lambda_function]
 
 
 @attrs
-class SNSLambdaSubscription(ManagedModel):
+class SNSLambdaSubscription(FunctionEventSubscriber):
     resource_type = 'sns_event'
     topic = attrib()            # type: str
-    lambda_function = attrib()  # type: LambdaFunction
-
-    def dependencies(self):
-        # type: () -> List[Model]
-        return [self.lambda_function]
 
 
 @attrs
-class SQSEventSource(ManagedModel):
+class SQSEventSource(FunctionEventSubscriber):
     resource_type = 'sqs_event'
     queue = attrib()            # type: str
     batch_size = attrib()       # type: int
-    lambda_function = attrib()  # type: LambdaFunction
-
-    def dependencies(self):
-        # type: () -> List[Model]
-        return [self.lambda_function]
diff --git a/tests/functional/test_awsclient.py b/tests/functional/test_awsclient.py
@@ -131,6 +131,12 @@ def test_can_iterate_logs(stubbed_session):
     stubbed_session.verify_stubs()
 
 
+def test_rule_arn_requires_expression_or_pattern(stubbed_session):
+    client = TypedAWSClient(stubbed_session)
+    with pytest.raises(ValueError):
+        client.get_or_create_rule_arn("foo")
+
+
 class TestLambdaFunctionExists(object):
 
     def test_can_query_lambda_function_exists(self, stubbed_session):