diff --git a/LICENSE b/LICENSE index 14aabc346a..fc06cc4fe4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +MIT No Attribution Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/setup.py b/setup.py index 86f8ab2d24..9295f5865e 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,6 @@ 'cfn-lint = cfnlint.__main__:main' ] }, - license='MIT', + license='MIT no attribution', test_suite="unittest" ) diff --git a/src/cfnlint/rules/resources/ectwo/SecurityGroupIngress.py b/src/cfnlint/rules/resources/ectwo/SecurityGroupIngress.py index 9cd91975f1..96623da384 100644 --- a/src/cfnlint/rules/resources/ectwo/SecurityGroupIngress.py +++ b/src/cfnlint/rules/resources/ectwo/SecurityGroupIngress.py @@ -39,12 +39,18 @@ def check_sgid_value(self, value, path): def check_sgid_ref(self, value, path, parameters, resources): """Check ref for VPC""" matches = list() + + allowed_types = [ + 'AWS::SSM::Parameter::Value', + 'AWS::EC2::SecurityGroup::Id' + ] if value in parameters: parameter_properties = parameters.get(value) parameter_type = parameter_properties.get('Type') - if parameter_type != 'AWS::EC2::SecurityGroup::Id': + if parameter_type not in allowed_types: path_error = ['Parameters', value, 'Type'] - message = "Security Group Id Parameter should be of type AWS::EC2::SecurityGroup::Id for {0}" + message = "Security Group Id Parameter should be of type AWS::EC2::SecurityGroup::Id " \ + "or AWS::SSM::Parameter::Value for {0}" matches.append( RuleMatch(path_error, message.format('/'.join(map(str, path_error))))) if value in resources: diff --git a/src/cfnlint/version.py b/src/cfnlint/version.py index 1e13e5702f..2767dc98a9 100644 --- a/src/cfnlint/version.py +++ b/src/cfnlint/version.py @@ -15,4 +15,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = '0.0.6' +__version__ = '0.0.7'