- Added deployment branch to GitHUb webhook filters.

- Preping for EventPattern in EventsRules
waterbear-cloud · Feb 12, 2022 · fbd453d · fbd453d
1 parent 3f3af4f
commit fbd453d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/src/paco/application/reseng_deploymentpipeline.py b/src/paco/application/reseng_deploymentpipeline.py
@@ -1241,10 +1241,15 @@ def stack_hook_codebuild_github_access_token(self, hook, config):
 
         if config.trigger_on_push == True:
             project_name = hook['stack'].template.get_project_name()
+            deployment_branch_name = config.deployment_branch_name.replace('/', '\/')
             filter_groups = [[
                     {
                         'type': 'EVENT',
-                        'pattern': 'PUSH'
+                        'pattern': 'PUSH',
+                    },
+                    {
+                        'type': 'HEAD_REF',
+                        'pattern': f'^refs/heads/{deployment_branch_name}$'
                     }
                 ]]
 

diff --git a/src/paco/cftemplates/eventsrule.py b/src/paco/cftemplates/eventsrule.py
@@ -47,12 +47,14 @@ def __init__(
             return
 
         # Parameters
-        schedule_expression_param = self.create_cfn_parameter(
-            param_type = 'String',
-            name = 'ScheduleExpression',
-            description = 'ScheduleExpression for the Event Rule.',
-            value = eventsrule.schedule_expression,
-        )
+        schedule_expression_param = None
+        if eventsrule.schedule_expression:
+            schedule_expression_param = self.create_cfn_parameter(
+                param_type = 'String',
+                name = 'ScheduleExpression',
+                description = 'ScheduleExpression for the Event Rule.',
+                value = eventsrule.schedule_expression,
+            )
         description_param = self.create_cfn_parameter(
             param_type = 'String',
             name = 'EventDescription',
@@ -157,14 +159,22 @@ def __init__(
             enabled_state = 'ENABLED'
         else:
             enabled_state = 'DISABLED'
-        event_rule_resource = troposphere.events.Rule(
+
+
+        events_rule_dict = {
+            'Name': name,
+            'Description': troposphere.Ref(description_param),
+            'RoleArn': troposphere.GetAtt(target_invocation_role_resource, 'Arn'),
+            'Targets': targets,
+            'State': enabled_state
+        }
+
+        if schedule_expression_param != None:
+            events_rule_dict['ScheduleExpression'] = troposphere.Ref(schedule_expression_param)
+
+        event_rule_resource = troposphere.events.Rule.from_dict(
             'EventRule',
-            Name=name,
-            Description=troposphere.Ref(description_param),
-            ScheduleExpression=troposphere.Ref(schedule_expression_param),
-            RoleArn=troposphere.GetAtt(target_invocation_role_resource, 'Arn'),
-            Targets=targets,
-            State=enabled_state
+            evens_rule_dict
         )
         event_rule_resource.DependsOn = target_invocation_role_resource
         self.template.add_resource(event_rule_resource)