Skip to content

Commit 95259ed

Browse files
authored
Merge pull request #3 from kddejong/FixLicensing
Release 0.0.7
2 parents 3c18379 + e6f0126 commit 95259ed

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
MIT No Attribution
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this
44
software and associated documentation files (the "Software"), to deal in the Software

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
'cfn-lint = cfnlint.__main__:main'
5656
]
5757
},
58-
license='MIT',
58+
license='MIT no attribution',
5959
test_suite="unittest"
6060
)

src/cfnlint/rules/resources/ectwo/SecurityGroupIngress.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,23 @@ def check_sgid_value(self, value, path):
3939
def check_sgid_ref(self, value, path, parameters, resources):
4040
"""Check ref for VPC"""
4141
matches = list()
42+
43+
allowed_types = [
44+
'AWS::SSM::Parameter::Value<AWS::EC2::SecurityGroup::Id>',
45+
'AWS::EC2::SecurityGroup::Id'
46+
]
4247
if value in parameters:
4348
parameter_properties = parameters.get(value)
4449
parameter_type = parameter_properties.get('Type')
45-
if parameter_type != 'AWS::EC2::SecurityGroup::Id':
50+
if parameter_type not in allowed_types:
4651
path_error = ['Parameters', value, 'Type']
47-
message = "Security Group Id Parameter should be of type AWS::EC2::SecurityGroup::Id for {0}"
52+
message = "Security Group Id Parameter should be of type [{0}] for {1}"
4853
matches.append(
49-
RuleMatch(path_error, message.format('/'.join(map(str, path_error)))))
54+
RuleMatch(
55+
path_error,
56+
message.format(
57+
', '.join(map(str, allowed_types)),
58+
'/'.join(map(str, path_error)))))
5059
if value in resources:
5160
resource = resources.get(value, {})
5261
resource_type = resource.get('Type', "")

src/cfnlint/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
"""
1717

18-
__version__ = '0.0.6'
18+
__version__ = '0.0.7'

0 commit comments

Comments
 (0)