Fix rebase

Signed-off-by: Alina Buzachis <[email protected]>
mattclay · Feb 3, 2023 · eff6b5b · eff6b5b
1 parent 29e9112
commit eff6b5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/aws/policy/compute.yaml b/aws/policy/compute.yaml
@@ -115,13 +115,6 @@ Statement:
       - elasticloadbalancing:ModifyTargetGroupAttributes
       - elasticloadbalancing:ModifyRule
       - elasticloadbalancing:SetIpAddressType
-      - ecs:Describe*
-      - ecs:List*
-      - ecs:TagResource
-      - ecs:UntagResource
-      - ecs:PutAccountSetting
-      - ecs:RegisterTaskDefinition
-      - ecs:DeregisterTaskDefinition
     Resource:
       - "*"
 
@@ -132,19 +125,10 @@ Statement:
       - ec2:CreateVolume
       - elasticloadbalancing:CreateLoadBalancer
       - elasticloadbalancing:CreateRule
-      - ecs:RunTask
-      - ecs:StartTask
-      - ecs:StopTask
-      - ecs:DeleteCluster
-      - ecs:CreateService
-      - ecs:DeleteService
-      - ecs:UpdateService
-      - ecs:UpdateCluster
     Resource:
       - 'arn:aws:ec2:{{ aws_region }}:{{ aws_account_id }}:volume/*'
       - 'arn:aws:elasticloadbalancing:{{ aws_region }}:{{ aws_account_id }}:*'
       - 'arn:aws:autoscaling:{{ aws_region }}:{{ aws_account_id }}:autoScalingGroup*'
-      - 'arn:aws:ecs:{{ aws_region }}:{{ aws_account_id }}:*'
 
   - Sid: AllowGlobalResourceRestrictedActionsWhichIncurNoFees
     Effect: Allow

diff --git a/aws/terminator/paas.py b/aws/terminator/paas.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 from datetime import datetime
-=======
-import datetime
->>>>>>> ba35199 (Move ecs policies and terminator classes into paas files)
 
 from . import DbTerminator, Terminator
 
@@ -121,6 +117,8 @@ def terminate(self):
             else:
                 # delete streaming distribution
                 self.client.delete_streaming_distribution(Id=self.Id, IfMatch=ETag)
+
+
 class Ecs(DbTerminator):
     @property
     def age_limit(self):