chore(arn): improve resource ARNs in checks #3388
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ def execute(self): | |
| report = Check_Report_AWS(self.metadata()) | ||
| report.status = "PASS" | ||
| report.status_extended = "CloudWatch doesn't allow cross-account sharing." | ||
| report.resource_arn = f"arn:{iam_client.audited_partition}:iam:{iam_client.region}:{iam_client.audited_account}:role" | ||
| report.resource_id = iam_client.audited_account | ||
| report.region = iam_client.region | ||
| for role in iam_client.roles: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,8 +23,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,8 +23,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
|
|
||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,8 +21,8 @@ def execute(self): | |||||
| "No CloudWatch log groups found with metric filters or alarms associated." | ||||||
| ) | ||||||
| report.region = cloudwatch_client.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_id = logs_client.audited_account | ||||||
| report.resource_arn = f"arn:{logs_client.audited_partition}:logs:{logs_client.region}:{logs_client.audited_account}:log-group" | ||||||
| report = check_cloudwatch_log_metric_filter( | ||||||
| pattern, | ||||||
| cloudtrail_client.trails, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,9 +8,7 @@ def execute(self): | |||||
| for recorder in config_client.recorders: | ||||||
| report = Check_Report_AWS(self.metadata()) | ||||||
| report.region = recorder.region | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| report.resource_arn = f"arn:{config_client.audited_partition}:config:{config_client.region}:{config_client.audited_account}:recorder" # Config Recorders do not have ARNs | ||||||
| report.resource_id = ( | ||||||
| config_client.audited_account if not recorder.name else recorder.name | ||||||
| ) | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ def execute(self): | |
| report.status_extended = "No EBS Snapshot lifecycle policies found." | ||
| report.region = region | ||
|
|
||
| report.resource_id = dlm_client.audited_account | ||
| report.resource_arn = f"arn:{dlm_client.audited_partition}:dlm:{dlm_client.region}:{dlm_client.audited_account}:policy" | ||
| if dlm_client.lifecycle_policies[region]: | ||
| report.status = "PASS" | ||
| report.status_extended = "EBS snapshot lifecycle policies found." | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ def execute(self): | |
| report.status_extended = "DRS is not enabled for this region." | ||
| report.region = drs.region | ||
|
|
||
| report.resource_tags = [] | ||
| report.resource_arn = f"arn:{drs_client.audited_partition}:drs:{drs_client.region}:{drs_client.audited_account}:recovery-job" | ||
| report.resource_id = drs_client.audited_account | ||
| if drs.status == "ENABLED": | ||
| report.status_extended = "DRS is enabled for this region without jobs." | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ def execute(self): | |
| for ebs_encryption in ec2_client.ebs_encryption_by_default: | ||
| report = Check_Report_AWS(self.metadata()) | ||
| report.region = ebs_encryption.region | ||
|
|
||
| report.resource_arn = f"arn:{ec2_client.audited_partition}:ec2:{ec2_client.region}:{ec2_client.audited_account}:volume" | ||
| report.resource_id = ec2_client.audited_account | ||
| if ebs_encryption.status: | ||
| report.status = "PASS" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ def execute(self): | |
| report = Check_Report_AWS(self.metadata()) | ||
| report.region = region | ||
|
|
||
| report.resource_id = emr_client.audited_account | ||
| report.resource_arn = f"arn:{emr_client.audited_partition}:elasticmapreduce:{emr_client.region}:{emr_client.audited_account}:cluster" | ||
| if emr_client.block_public_access_configuration[ | ||
| region | ||
| ].block_public_security_group_rules: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ def execute(self): | |
| findings = [] | ||
| if fms_client.fms_admin_account: | ||
| report = Check_Report_AWS(self.metadata()) | ||
| report.resource_arn = f"arn:{fms_client.audited_partition}:fms:{fms_client.region}:{fms_client.audited_account}:policy" | ||
| report.resource_id = fms_client.audited_account | ||
| report.region = fms_client.region | ||
| report.status = "PASS" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ def execute(self): | |
| if encryption.tables or not glue_client.audit_info.ignore_unused_services: | ||
| report = Check_Report_AWS(self.metadata()) | ||
| report.resource_id = glue_client.audited_account | ||
| report.resource_arn = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" | ||
| report.region = encryption.region | ||
|
|
||
| report.status = "FAIL" | ||
| report.status_extended = ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ def execute(self): | |
| if encryption.tables or not glue_client.audit_info.ignore_unused_services: | ||
| report = Check_Report_AWS(self.metadata()) | ||
| report.resource_id = glue_client.audited_account | ||
| report.resource_arn = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" | ||
| report.region = encryption.region | ||
|
|
||
| report.status = "FAIL" | ||
| report.status_extended = ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ def execute(self) -> Check_Report_AWS: | |
| findings = [] | ||
| report = Check_Report_AWS(self.metadata()) | ||
| report.region = iam_client.region | ||
| report.resource_arn = f"arn:{iam_client.audited_partition}:iam:{iam_client.region}:{iam_client.audited_account}:password-policy" | ||
| report.resource_id = iam_client.audited_account | ||
| # Check if password policy exists | ||
| if iam_client.password_policy: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ def execute(self) -> Check_Report_AWS: | |
| findings = [] | ||
| report = Check_Report_AWS(self.metadata()) | ||
| report.region = iam_client.region | ||
| report.resource_arn = f"arn:{iam_client.audited_partition}:iam:{iam_client.region}:{iam_client.audited_account}:password-policy" | ||
| report.resource_id = iam_client.audited_account | ||
| # Check if password policy exists | ||
| if iam_client.password_policy: | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Name the result differently than
root, maybe Service ARN or Resource Type ARN