From 1f2ffd896e11f79f3fe948a9cef869c2a614d5a2 Mon Sep 17 00:00:00 2001 From: Brett Swift Date: Tue, 25 Sep 2018 09:46:09 -0600 Subject: [PATCH] Fix flake8 errors from PR #11 Add flake8 to the ci build --- .travis.yml | 1 + cumulus/__init__.py | 1 - cumulus/steps/ec2/alb.py | 4 ++-- cumulus/steps/ec2/alb_port.py | 4 ++-- cumulus/steps/ec2/block_device_data.py | 3 +-- cumulus/steps/ec2/dns.py | 5 +++-- cumulus/steps/ec2/ingress_rule.py | 8 ++++---- cumulus/steps/ec2/instance_profile_role.py | 3 +-- cumulus/steps/ec2/launch_config.py | 6 +++--- cumulus/steps/ec2/scaling_group.py | 3 ++- cumulus/steps/ec2/target_group.py | 6 ++---- tests/stacker_test/blueprints/alb.py | 17 ++++------------- .../blueprints/scaling_group_simple.py | 4 ++-- tests/stacker_test/blueprints/website_simple.py | 4 ++-- 14 files changed, 29 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce30f55..013e7e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ install: - pip install .[test] script: - py.test -s tests/unit --color=yes -v +- flake8 cumulus tests #after_success: #- coveralls deploy: diff --git a/cumulus/__init__.py b/cumulus/__init__.py index 3648f27..88d3c95 100644 --- a/cumulus/__init__.py +++ b/cumulus/__init__.py @@ -3,4 +3,3 @@ __author__ = """Brett Swift""" __email__ = 'brettswift@gmail.com' __version__ = '0.1.5' - diff --git a/cumulus/steps/ec2/alb.py b/cumulus/steps/ec2/alb.py index 631d8e6..8405dc6 100644 --- a/cumulus/steps/ec2/alb.py +++ b/cumulus/steps/ec2/alb.py @@ -28,13 +28,13 @@ def handle(self, chain_context): def create_conditions(self, template): template.add_condition( "UseSSL", - Not(Equals(Ref("ALBCertName"), ""))) + Not(Equals(Ref("ALBCertName"), "")) + ) template.add_condition( "UseIAMCert", Not(Equals(Ref("ALBCertType"), "acm"))) def create_security_groups(self, template, instance_name): - asg_sg = CLUSTER_SG_NAME % instance_name alb_sg = ALB_SG_NAME % instance_name # ALB Security group diff --git a/cumulus/steps/ec2/alb_port.py b/cumulus/steps/ec2/alb_port.py index 5185b25..6b2755e 100644 --- a/cumulus/steps/ec2/alb_port.py +++ b/cumulus/steps/ec2/alb_port.py @@ -1,5 +1,6 @@ from troposphere import ( - Ref, ec2, Join) + Ref, ec2) + from cumulus.chain import step from cumulus.steps.ec2 import META_SECURITY_GROUP_REF @@ -28,4 +29,3 @@ def handle(self, chain_context): SourceSecurityGroupId=Ref(self.alb_sg_name), GroupId=chain_context.metadata[META_SECURITY_GROUP_REF] )) - diff --git a/cumulus/steps/ec2/block_device_data.py b/cumulus/steps/ec2/block_device_data.py index 876664e..f770027 100644 --- a/cumulus/steps/ec2/block_device_data.py +++ b/cumulus/steps/ec2/block_device_data.py @@ -1,9 +1,8 @@ from cumulus.chain import step -from cumulus.util.tropo import TemplateQuery +from cumulus.util.template_query import TemplateQuery from troposphere import autoscaling - class BlockDeviceData(step.Step): def __init__(self, diff --git a/cumulus/steps/ec2/dns.py b/cumulus/steps/ec2/dns.py index e4ec1de..8fe8bf9 100644 --- a/cumulus/steps/ec2/dns.py +++ b/cumulus/steps/ec2/dns.py @@ -1,6 +1,7 @@ -from troposphere import route53 from troposphere import ( - Ref, Join, ec2) + Ref, Join) +from troposphere import route53 + from cumulus.chain import step diff --git a/cumulus/steps/ec2/ingress_rule.py b/cumulus/steps/ec2/ingress_rule.py index 35992ac..b1aca40 100644 --- a/cumulus/steps/ec2/ingress_rule.py +++ b/cumulus/steps/ec2/ingress_rule.py @@ -1,7 +1,8 @@ -from troposphere import elasticloadbalancingv2 as alb -from troposphere import ( - Ref, ec2) import re + +from troposphere import ( + ec2) + from cumulus.chain import step from cumulus.steps.ec2 import META_SECURITY_GROUP_REF @@ -30,4 +31,3 @@ def handle(self, chain_context): CidrIp=self.cidr, GroupId=chain_context.metadata[META_SECURITY_GROUP_REF] )) - diff --git a/cumulus/steps/ec2/instance_profile_role.py b/cumulus/steps/ec2/instance_profile_role.py index 38a593a..a49ad4b 100644 --- a/cumulus/steps/ec2/instance_profile_role.py +++ b/cumulus/steps/ec2/instance_profile_role.py @@ -3,7 +3,7 @@ from cumulus.chain import step from troposphere.iam import InstanceProfile -from cumulus.util.tropo import TemplateQuery +from cumulus.util.template_query import TemplateQuery class InstanceProfileRole(step.Step): @@ -29,4 +29,3 @@ def handle(self, chain_context): self.instance_profile_name, Roles=[Ref(self.role)] )) - diff --git a/cumulus/steps/ec2/launch_config.py b/cumulus/steps/ec2/launch_config.py index c085309..9be7e78 100644 --- a/cumulus/steps/ec2/launch_config.py +++ b/cumulus/steps/ec2/launch_config.py @@ -37,6 +37,8 @@ def handle(self, chain_context): asg_name="Asg%s" % chain_context.instance_name, configsets='default', # TODO: Fix this ) + else: + user_data = self.user_data launch_config = autoscaling.LaunchConfiguration( lc_name, @@ -49,8 +51,7 @@ def handle(self, chain_context): template.add_resource(launch_config) def _get_security_group_parameters(self): - config = { - } + config = {} if self.vpc_id: config['VpcId'] = self.vpc_id @@ -71,4 +72,3 @@ def _get_launch_configuration_parameters(self, chain_context): } return parameters - diff --git a/cumulus/steps/ec2/scaling_group.py b/cumulus/steps/ec2/scaling_group.py index 357f6e3..df28040 100644 --- a/cumulus/steps/ec2/scaling_group.py +++ b/cumulus/steps/ec2/scaling_group.py @@ -1,6 +1,7 @@ -from troposphere import Ref, autoscaling, FindInMap, Base64, ec2 +from troposphere import Ref, autoscaling from troposphere.autoscaling import Tag as ASTag from troposphere.policies import UpdatePolicy, AutoScalingReplacingUpdate, AutoScalingRollingUpdate + from cumulus.chain import step from cumulus.steps.ec2 import META_TARGET_GROUP_NAME diff --git a/cumulus/steps/ec2/target_group.py b/cumulus/steps/ec2/target_group.py index ab5df34..5adfa83 100644 --- a/cumulus/steps/ec2/target_group.py +++ b/cumulus/steps/ec2/target_group.py @@ -1,6 +1,5 @@ -from troposphere import elasticloadbalancingv2 as alb, route53 -from troposphere import ( - Ref, Join, ec2) +from troposphere import elasticloadbalancingv2 as alb + from cumulus.chain import step from cumulus.steps.ec2 import META_TARGET_GROUP_NAME @@ -39,4 +38,3 @@ def handle(self, chain_context): UnhealthyThresholdCount="3", VpcId=self.vpc_id )) - diff --git a/tests/stacker_test/blueprints/alb.py b/tests/stacker_test/blueprints/alb.py index a64bba5..4fc9085 100644 --- a/tests/stacker_test/blueprints/alb.py +++ b/tests/stacker_test/blueprints/alb.py @@ -1,13 +1,8 @@ -from awacs.aws import Allow, Principal, Policy, Statement -from awacs.sts import AssumeRole from stacker.blueprints.base import Blueprint -from stacker.blueprints.variables.types import EC2VPCId, EC2SubnetIdList, CFNCommaDelimitedList, CFNString, CFNNumber, \ - EC2KeyPairKeyName -from troposphere import cloudformation, ec2, iam, Ref -from troposphere.iam import Role +from stacker.blueprints.variables.types import EC2VPCId, EC2SubnetIdList, CFNCommaDelimitedList, CFNString, CFNNumber + from cumulus.chain import chain, chaincontext -from cumulus.steps.ec2 import scaling_group, launch_config, block_device_data, ingress_rule, target_group, dns, alb -from cumulus.steps.ec2.instance_profile_role import InstanceProfileRole +from cumulus.steps.ec2 import alb class Alb(Blueprint): @@ -46,8 +41,6 @@ class Alb(Blueprint): def create_template(self): - instance_profile_name = "InstanceProfile" + self.name - t = self.template t.add_description("Acceptance Tests for cumulus scaling groups") @@ -55,9 +48,7 @@ def create_template(self): the_chain = chain.Chain() - - the_chain.add(alb.Alb( - )) + the_chain.add(alb.Alb()) chain_context = chaincontext.ChainContext( template=t, diff --git a/tests/stacker_test/blueprints/scaling_group_simple.py b/tests/stacker_test/blueprints/scaling_group_simple.py index 40dd044..a18e22f 100644 --- a/tests/stacker_test/blueprints/scaling_group_simple.py +++ b/tests/stacker_test/blueprints/scaling_group_simple.py @@ -4,9 +4,9 @@ from stacker.blueprints.variables.types import EC2VPCId, EC2SubnetIdList, CFNCommaDelimitedList, CFNString, CFNNumber, \ EC2KeyPairKeyName from troposphere import cloudformation, ec2, iam -from troposphere.iam import Role + from cumulus.chain import chain, chaincontext -from cumulus.steps.ec2 import scaling_group, launch_config, security_group, block_device_data, ingress_rule +from cumulus.steps.ec2 import scaling_group, launch_config, block_device_data, ingress_rule from cumulus.steps.ec2.instance_profile_role import InstanceProfileRole diff --git a/tests/stacker_test/blueprints/website_simple.py b/tests/stacker_test/blueprints/website_simple.py index 61deadd..c40a289 100644 --- a/tests/stacker_test/blueprints/website_simple.py +++ b/tests/stacker_test/blueprints/website_simple.py @@ -1,10 +1,10 @@ from awacs.aws import Allow, Principal, Policy, Statement from awacs.sts import AssumeRole from stacker.blueprints.base import Blueprint -from stacker.blueprints.variables.types import EC2VPCId, EC2SubnetIdList, CFNCommaDelimitedList, CFNString, CFNNumber, \ +from stacker.blueprints.variables.types import EC2SubnetIdList, CFNCommaDelimitedList, CFNString, CFNNumber, \ EC2KeyPairKeyName from troposphere import cloudformation, ec2, iam, Ref -from troposphere.iam import Role + from cumulus.chain import chain, chaincontext from cumulus.steps.ec2 import scaling_group, launch_config, block_device_data, ingress_rule, target_group, dns, \ alb_port, listener_rule