Skip to content

Commit

Permalink
Merge pull request aws-cloudformation#214 from ravinaik1312/master
Browse files Browse the repository at this point in the history
fix typo, enfoced -> enforced.
  • Loading branch information
kddejong authored Jul 14, 2018
2 parents 9e04507 + 3208ff5 commit 4f9d0bd
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/cfnlint/rules/resources/DependsOnObsolete.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def check_depends_on(self, cfn, resource, key, path):

for tree in trees:
if tree[-1] == key:
message = 'Obsolete DependsOn on resource ({0}), dependency already enfoced by a "Ref" at {1}'
message = 'Obsolete DependsOn on resource ({0}), dependency already enforced by a "Ref" at {1}'
matches.append(RuleMatch(path, message.format(key, '/'.join(map(str, tree)))))

# Get the GetAtt
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/results/quickstart/cis_benchmark.json
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (SnsTopicForCloudWatchEvents), dependency already enfoced by \"!Ref\" at Resources/RoleForCloudWatchEvents/Properties/Policies/0/PolicyDocument/Statement/0/Resource/Ref/SnsTopicForCloudWatchEvents",
"Message": "Obsolete DependsOn on resource (SnsTopicForCloudWatchEvents), dependency already enforced by \"!Ref\" at Resources/RoleForCloudWatchEvents/Properties/Policies/0/PolicyDocument/Statement/0/Resource/Ref/SnsTopicForCloudWatchEvents",
"Filename": "test/templates/quickstart/cis_benchmark.yaml"
},
{
Expand Down
24 changes: 12 additions & 12 deletions test/fixtures/results/quickstart/nist_application.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rAutoScalingConfigApp), dependency already enfoced by \"!Ref\" at Resources/rAutoScalingGroupApp/Properties/LaunchConfigurationName/Ref/rAutoScalingConfigApp",
"Message": "Obsolete DependsOn on resource (rAutoScalingConfigApp), dependency already enforced by \"!Ref\" at Resources/rAutoScalingGroupApp/Properties/LaunchConfigurationName/Ref/rAutoScalingConfigApp",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand Down Expand Up @@ -276,7 +276,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rAutoScalingConfigWeb), dependency already enfoced by \"!Ref\" at Resources/rAutoScalingGroupWeb/Properties/LaunchConfigurationName/Ref/rAutoScalingConfigWeb",
"Message": "Obsolete DependsOn on resource (rAutoScalingConfigWeb), dependency already enforced by \"!Ref\" at Resources/rAutoScalingGroupWeb/Properties/LaunchConfigurationName/Ref/rAutoScalingConfigWeb",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand Down Expand Up @@ -576,7 +576,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rAutoScalingGroupWeb), dependency already enfoced by \"!Ref\" at Resources/rCWAlarmLowCPUWeb/Properties/Dimensions/0/Value/Ref/rAutoScalingGroupWeb",
"Message": "Obsolete DependsOn on resource (rAutoScalingGroupWeb), dependency already enforced by \"!Ref\" at Resources/rCWAlarmLowCPUWeb/Properties/Dimensions/0/Value/Ref/rAutoScalingGroupWeb",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand Down Expand Up @@ -656,7 +656,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rS3ELBAccessLogs), dependency already enfoced by \"!Ref\" at Resources/rELBApp/Properties/AccessLoggingPolicy/S3BucketName/Ref/rS3ELBAccessLogs",
"Message": "Obsolete DependsOn on resource (rS3ELBAccessLogs), dependency already enforced by \"!Ref\" at Resources/rELBApp/Properties/AccessLoggingPolicy/S3BucketName/Ref/rS3ELBAccessLogs",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand All @@ -676,7 +676,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rSecurityGroupApp), dependency already enfoced by \"!Ref\" at Resources/rELBApp/Properties/SecurityGroups/0/Ref/rSecurityGroupApp",
"Message": "Obsolete DependsOn on resource (rSecurityGroupApp), dependency already enforced by \"!Ref\" at Resources/rELBApp/Properties/SecurityGroups/0/Ref/rSecurityGroupApp",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand Down Expand Up @@ -736,7 +736,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rS3ELBAccessLogs), dependency already enfoced by \"!Ref\" at Resources/rELBWeb/Properties/AccessLoggingPolicy/S3BucketName/Ref/rS3ELBAccessLogs",
"Message": "Obsolete DependsOn on resource (rS3ELBAccessLogs), dependency already enforced by \"!Ref\" at Resources/rELBWeb/Properties/AccessLoggingPolicy/S3BucketName/Ref/rS3ELBAccessLogs",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand All @@ -756,7 +756,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rSecurityGroupWeb), dependency already enfoced by \"!Ref\" at Resources/rELBWeb/Properties/SecurityGroups/0/Ref/rSecurityGroupWeb",
"Message": "Obsolete DependsOn on resource (rSecurityGroupWeb), dependency already enforced by \"!Ref\" at Resources/rELBWeb/Properties/SecurityGroups/0/Ref/rSecurityGroupWeb",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand Down Expand Up @@ -816,7 +816,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rDBSubnetGroup), dependency already enfoced by \"!Ref\" at Resources/rRDSInstanceMySQL/Properties/DBSubnetGroupName/Ref/rDBSubnetGroup",
"Message": "Obsolete DependsOn on resource (rDBSubnetGroup), dependency already enforced by \"!Ref\" at Resources/rRDSInstanceMySQL/Properties/DBSubnetGroupName/Ref/rDBSubnetGroup",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand All @@ -836,7 +836,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rSecurityGroupRDS), dependency already enfoced by \"!Ref\" at Resources/rRDSInstanceMySQL/Properties/VPCSecurityGroups/0/Ref/rSecurityGroupRDS",
"Message": "Obsolete DependsOn on resource (rSecurityGroupRDS), dependency already enforced by \"!Ref\" at Resources/rRDSInstanceMySQL/Properties/VPCSecurityGroups/0/Ref/rSecurityGroupRDS",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand Down Expand Up @@ -1376,7 +1376,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rWebContentBucket), dependency already enfoced by \"!Ref\" at Resources/rWebContentS3Policy/Properties/Bucket/Ref/rWebContentBucket",
"Message": "Obsolete DependsOn on resource (rWebContentBucket), dependency already enforced by \"!Ref\" at Resources/rWebContentS3Policy/Properties/Bucket/Ref/rWebContentBucket",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand All @@ -1396,7 +1396,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rWebContentBucket), dependency already enfoced by \"!Ref\" at Resources/rWebContentS3Policy/Properties/PolicyDocument/Statement/0/Resource/Fn::Join/1/3/Ref/rWebContentBucket",
"Message": "Obsolete DependsOn on resource (rWebContentBucket), dependency already enforced by \"!Ref\" at Resources/rWebContentS3Policy/Properties/PolicyDocument/Statement/0/Resource/Fn::Join/1/3/Ref/rWebContentBucket",
"Filename": "test/templates/quickstart/nist_application.yaml"
},
{
Expand All @@ -1416,7 +1416,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rWebContentBucket), dependency already enfoced by \"!Ref\" at Resources/rWebContentS3Policy/Properties/PolicyDocument/Statement/1/Resource/Fn::Join/1/3/Ref/rWebContentBucket",
"Message": "Obsolete DependsOn on resource (rWebContentBucket), dependency already enforced by \"!Ref\" at Resources/rWebContentS3Policy/Properties/PolicyDocument/Statement/1/Resource/Fn::Join/1/3/Ref/rWebContentBucket",
"Filename": "test/templates/quickstart/nist_application.yaml"
}
]
8 changes: 4 additions & 4 deletions test/fixtures/results/quickstart/nist_iam.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rIAMAdminRole), dependency already enfoced by \"!Ref\" at Resources/rIAMAdminProfile/Properties/Roles/0/Ref/rIAMAdminRole",
"Message": "Obsolete DependsOn on resource (rIAMAdminRole), dependency already enforced by \"!Ref\" at Resources/rIAMAdminProfile/Properties/Roles/0/Ref/rIAMAdminRole",
"Filename": "test/templates/quickstart/nist_iam.yaml"
},
{
Expand All @@ -36,7 +36,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rInstanceOpsRole), dependency already enfoced by \"!Ref\" at Resources/rInstanceOpsProfile/Properties/Roles/0/Ref/rInstanceOpsRole",
"Message": "Obsolete DependsOn on resource (rInstanceOpsRole), dependency already enforced by \"!Ref\" at Resources/rInstanceOpsProfile/Properties/Roles/0/Ref/rInstanceOpsRole",
"Filename": "test/templates/quickstart/nist_iam.yaml"
},
{
Expand All @@ -56,7 +56,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rReadOnlyAdminRole), dependency already enfoced by \"!Ref\" at Resources/rReadOnlyAdminProfile/Properties/Roles/0/Ref/rReadOnlyAdminRole",
"Message": "Obsolete DependsOn on resource (rReadOnlyAdminRole), dependency already enforced by \"!Ref\" at Resources/rReadOnlyAdminProfile/Properties/Roles/0/Ref/rReadOnlyAdminRole",
"Filename": "test/templates/quickstart/nist_iam.yaml"
},
{
Expand All @@ -76,7 +76,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rSysAdminRole), dependency already enfoced by \"!Ref\" at Resources/rSysAdminProfile/Properties/Roles/0/Ref/rSysAdminRole",
"Message": "Obsolete DependsOn on resource (rSysAdminRole), dependency already enforced by \"!Ref\" at Resources/rSysAdminProfile/Properties/Roles/0/Ref/rSysAdminRole",
"Filename": "test/templates/quickstart/nist_iam.yaml"
}
]
22 changes: 11 additions & 11 deletions test/fixtures/results/quickstart/nist_logging.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enfoced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/Bucket/Ref/rArchiveLogsBucket",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enforced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/Bucket/Ref/rArchiveLogsBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -76,7 +76,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enfoced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/PolicyDocument/Statement/0/Resource/0/Fn::Join/1/3/Ref/rArchiveLogsBucket",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enforced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/PolicyDocument/Statement/0/Resource/0/Fn::Join/1/3/Ref/rArchiveLogsBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -96,7 +96,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enfoced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/PolicyDocument/Statement/1/Resource/0/Fn::Join/1/3/Ref/rArchiveLogsBucket",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enforced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/PolicyDocument/Statement/1/Resource/0/Fn::Join/1/3/Ref/rArchiveLogsBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -116,7 +116,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enfoced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/PolicyDocument/Statement/2/Resource/0/Fn::Join/1/3/Ref/rArchiveLogsBucket",
"Message": "Obsolete DependsOn on resource (rArchiveLogsBucket), dependency already enforced by \"!Ref\" at Resources/rArchiveLogsBucketPolicy/Properties/PolicyDocument/Statement/2/Resource/0/Fn::Join/1/3/Ref/rArchiveLogsBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand Down Expand Up @@ -216,7 +216,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailRole), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailProfile/Properties/Roles/0/Ref/rCloudTrailRole",
"Message": "Obsolete DependsOn on resource (rCloudTrailRole), dependency already enforced by \"!Ref\" at Resources/rCloudTrailProfile/Properties/Roles/0/Ref/rCloudTrailRole",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -236,7 +236,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/Bucket/Ref/rCloudTrailBucket",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enforced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/Bucket/Ref/rCloudTrailBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -256,7 +256,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/0/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enforced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/0/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -276,7 +276,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/1/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enforced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/1/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -296,7 +296,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/2/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enforced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/2/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -316,7 +316,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/3/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enforced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/3/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand All @@ -336,7 +336,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enfoced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/4/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Message": "Obsolete DependsOn on resource (rCloudTrailBucket), dependency already enforced by \"!Ref\" at Resources/rCloudTrailS3Policy/Properties/PolicyDocument/Statement/4/Resource/0/Fn::Join/1/3/Ref/rCloudTrailBucket",
"Filename": "test/templates/quickstart/nist_logging.yaml"
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/results/quickstart/nist_vpc_management.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rIGWManagement), dependency already enfoced by \"!Ref\" at Resources/rGWAttachmentMgmtIGW/Properties/InternetGatewayId/Ref/rIGWManagement",
"Message": "Obsolete DependsOn on resource (rIGWManagement), dependency already enforced by \"!Ref\" at Resources/rGWAttachmentMgmtIGW/Properties/InternetGatewayId/Ref/rIGWManagement",
"Filename": "test/templates/quickstart/nist_vpc_management.yaml"
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/results/quickstart/nist_vpc_production.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (rIGWProd), dependency already enfoced by \"!Ref\" at Resources/rGWAttachmentProdIGW/Properties/InternetGatewayId/Ref/rIGWProd",
"Message": "Obsolete DependsOn on resource (rIGWProd), dependency already enforced by \"!Ref\" at Resources/rGWAttachmentProdIGW/Properties/InternetGatewayId/Ref/rIGWProd",
"Filename": "test/templates/quickstart/nist_vpc_production.yaml"
},
{
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/results/quickstart/openshift.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (OpenShiftNodeASG), dependency already enfoced by \"!Ref\" at Resources/AnsibleConfigServer/Properties/UserData/Fn::Base64/Fn::Join/1/43/Ref/OpenShiftNodeASG",
"Message": "Obsolete DependsOn on resource (OpenShiftNodeASG), dependency already enforced by \"!Ref\" at Resources/AnsibleConfigServer/Properties/UserData/Fn::Base64/Fn::Join/1/43/Ref/OpenShiftNodeASG",
"Filename": "test/templates/quickstart/openshift.yaml"
},
{
Expand All @@ -56,7 +56,7 @@
}
},
"Level": "Warning",
"Message": "Obsolete DependsOn on resource (OpenShiftNodeASG), dependency already enfoced by \"!Ref\" at Resources/AnsibleConfigServer/Properties/UserData/Fn::Base64/Fn::Join/1/88/Ref/OpenShiftNodeASG",
"Message": "Obsolete DependsOn on resource (OpenShiftNodeASG), dependency already enforced by \"!Ref\" at Resources/AnsibleConfigServer/Properties/UserData/Fn::Base64/Fn::Join/1/88/Ref/OpenShiftNodeASG",
"Filename": "test/templates/quickstart/openshift.yaml"
},
{
Expand Down

0 comments on commit 4f9d0bd

Please sign in to comment.