Skip to content

Commit c86c3de

Browse files
nshalabhnshalabh
committed
fix: linting errors across the solution (D202 and U100)
1 parent b12dea4 commit c86c3de

File tree

21 files changed

+80
-88
lines changed
  • aws_sra_examples/solutions
    • account/account_alternate_contacts/lambda/src
    • ami_bakery/ami_bakery_org/lambda/src
    • cloudtrail/cloudtrail_org/lambda/src
    • common
      • common_prerequisites/lambda/src
      • common_register_delegated_administrator/lambda/src
    • config
      • config_management_account/lambda/src
      • config_org/lambda/src
    • detective/detective_org/lambda/src
    • ec2/ec2_default_ebs_encryption/lambda/src
    • genai
      • bedrock_guardrails/lambda/src
      • bedrock_org/lambda
    • guardduty/guardduty_org/lambda/src
    • iam/iam_password_policy/lambda/src
    • inspector/inspector_org/lambda/src
    • macie/macie_org/lambda/src
    • patch_mgmt/patch_mgmt_org/lambda/src
    • s3/s3_block_account_public_access/lambda/src
    • security_lake/security_lake_org/lambda/src
    • securityhub/securityhub_org/lambda/src
    • shield_advanced/shield_advanced/lambda/src

21 files changed

+80
-88
lines changed

‎aws_sra_examples/solutions/account/account_alternate_contacts/lambda/src/app.py‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def local_testing(aws_account: AccountTypeDef, params: dict) -> None:
316316
process_alternate_contacts(account_client, aws_account, params)
317317

318318

319-
def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], params: dict) -> None:
319+
def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], params: dict) -> None: # noqa: U100
320320
"""Process Accounts and Create SNS Messages for each account for solution deployment.
321321
322322
Args:
@@ -339,7 +339,7 @@ def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], para
339339
process_sns_message_batches(sns_messages, params["SNS_TOPIC_ARN"])
340340

341341

342-
def process_account(event: dict, aws_account_id: str, params: dict) -> None:
342+
def process_account(event: dict, aws_account_id: str, params: dict) -> None: # noqa: U100
343343
"""Process Account and Create SNS Message for account for solution deployment.
344344
345345
Args:
@@ -359,7 +359,7 @@ def process_account(event: dict, aws_account_id: str, params: dict) -> None:
359359
publish_sns_message(sns_message, "Account Alternate Contacts", params["SNS_TOPIC_ARN"])
360360

361361

362-
def process_event(event: dict) -> None:
362+
def process_event(event: dict) -> None: # noqa: U100
363363
"""Process Event.
364364
365365
Args:
@@ -370,7 +370,7 @@ def process_event(event: dict) -> None:
370370
process_accounts(event, params)
371371

372372

373-
def process_event_sns(event: dict) -> None:
373+
def process_event_sns(event: dict) -> None: # noqa: U100
374374
"""Process SNS event.
375375
376376
Args:
@@ -390,7 +390,7 @@ def process_event_sns(event: dict) -> None:
390390
process_alternate_contacts(account_client, aws_account, params)
391391

392392

393-
def process_event_organizations(event: dict) -> None:
393+
def process_event_organizations(event: dict) -> None: # noqa: U100
394394
"""Process Event from AWS Organizations.
395395
396396
Args:
@@ -414,7 +414,7 @@ def process_event_organizations(event: dict) -> None:
414414
LOGGER.info("Organization event does not match expected values.")
415415

416416

417-
def process_event_lifecycle(event: dict) -> None:
417+
def process_event_lifecycle(event: dict) -> None: # noqa: U100
418418
"""Process Lifecycle Event from AWS Control Tower.
419419
420420
Args:
@@ -449,7 +449,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
449449
Returns:
450450
AWS CloudFormation physical resource id
451451
"""
452-
453452
if event["RequestType"] in ["Create", "Update"]:
454453
params = get_validated_parameters({"RequestType": event["RequestType"]})
455454
process_accounts(event, params)
@@ -580,7 +579,7 @@ def get_validated_parameters(event: dict) -> dict:
580579
return params
581580

582581

583-
def orchestrator(event: dict, context: Any) -> None:
582+
def orchestrator(event: dict, context: Any) -> None: # noqa: U100
584583
"""Orchestration of Events.
585584
586585
Args:
@@ -599,7 +598,7 @@ def orchestrator(event: dict, context: Any) -> None:
599598
process_event(event)
600599

601600

602-
def lambda_handler(event: dict, context: Any) -> None:
601+
def lambda_handler(event: dict, context: Any) -> None: # noqa: U100
603602
"""Lambda Handler.
604603
605604
Args:

‎aws_sra_examples/solutions/ami_bakery/ami_bakery_org/lambda/src/app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def delete(event: Dict[str, Any], context: Context) -> None: # noqa: U100
299299
iam.delete_role(session, params["CODEPIPELINE_ROLE_NAME"])
300300

301301

302-
def lambda_handler(event: Dict[str, Any], context: Context) -> None:
302+
def lambda_handler(event: Dict[str, Any], context: Context) -> None: # noqa: U100
303303
"""Lambda Handler.
304304
305305
Args:

‎aws_sra_examples/solutions/cloudtrail/cloudtrail_org/lambda/src/app.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def process_create_update(params: dict) -> None:
313313
@helper.create
314314
@helper.update
315315
@helper.delete
316-
def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str:
316+
def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str: # noqa: U100
317317
"""Process CloudFormation Event. Creates, updates, and deletes a CloudTrail with the provided parameters.
318318
319319
Args:
@@ -340,7 +340,7 @@ def process_event(event: CloudFormationCustomResourceEvent, context: Context) ->
340340
return f"{params['CLOUDTRAIL_NAME']}-CloudTrail"
341341

342342

343-
def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
343+
def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None: # noqa: U100
344344
"""Lambda Handler.
345345
346346
Args:
@@ -358,7 +358,7 @@ def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -
358358
raise ValueError(f"Unexpected error executing Lambda function. Review CloudWatch logs '{context.log_group_name}' for details.") from None
359359

360360

361-
def terraform_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
361+
def terraform_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None: # noqa: U100
362362
"""Lambda Handler.
363363
364364
Args:

‎aws_sra_examples/solutions/common/common_prerequisites/lambda/src/app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ def delete_event(event: CloudFormationCustomResourceEvent, context: Context) ->
475475
# delete_ssm_parameters_in_regions(get_enabled_regions()) # noqa: E800
476476

477477

478-
def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
478+
def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None: # noqa: U100
479479
"""Lambda Handler.
480480
481481
Args:

‎aws_sra_examples/solutions/common/common_register_delegated_administrator/lambda/src/app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def lambda_handler(
265265
raise ValueError(f"Unexpected error executing Lambda function. Review CloudWatch logs '{context.log_group_name}' for details.") from None
266266

267267

268-
def terraform_handler(event: dict, context: Context) -> None:
268+
def terraform_handler(event: dict, context: Context) -> None: # noqa: U100
269269
"""Lambda Handler.
270270
271271
Args:

‎aws_sra_examples/solutions/config/config_management_account/lambda/src/app.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def get_validated_parameters(event: CloudFormationCustomResourceEvent) -> dict:
161161
@helper.create
162162
@helper.update
163163
@helper.delete
164-
def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str:
164+
def process_event(event: CloudFormationCustomResourceEvent, context: Context) -> str: # noqa: U100
165165
"""Process Event from AWS CloudFormation.
166166
167167
Args:
@@ -187,7 +187,7 @@ def process_event(event: CloudFormationCustomResourceEvent, context: Context) ->
187187
return f"{params['AUDIT_ACCOUNT_ID']}-{params['AGGREGATOR_NAME']}"
188188

189189

190-
def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None:
190+
def lambda_handler(event: CloudFormationCustomResourceEvent, context: Context) -> None: # noqa: U100
191191
"""Lambda Handler.
192192
193193
Args:

‎aws_sra_examples/solutions/config/config_org/lambda/src/app.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def process_add_update_event(params: dict, regions: list, accounts: list) -> Non
6868
LOGGER.info("...ADD_UPDATE_NO_EVENT")
6969

7070

71-
def process_event(event: dict) -> None:
71+
def process_event(event: dict) -> None: # noqa: U100
7272
"""Process Event.
7373
7474
Args:
@@ -109,7 +109,7 @@ def process_account(aws_account_id: str, params: dict) -> None:
109109
config.set_delivery_channel(aws_account_id, region, params["CONFIGURATION_ROLE_NAME"], delivery_channel)
110110

111111

112-
def process_event_organizations(event: dict) -> None:
112+
def process_event_organizations(event: dict) -> None: # noqa: U100
113113
"""Process Event from AWS Organizations.
114114
115115
Args:
@@ -428,7 +428,7 @@ def process_sns_message_batches(sns_messages: list, sns_topic_arn_fanout: str) -
428428
publish_sns_message_batch(batch, sns_topic_arn_fanout)
429429

430430

431-
def process_event_sns(event: dict) -> None:
431+
def process_event_sns(event: dict) -> None: # noqa: U100
432432
"""Process SNS event to complete the setup process.
433433
434434
Args:
@@ -477,7 +477,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
477477
Returns:
478478
AWS CloudFormation physical resource id
479479
"""
480-
481480
params = get_validated_parameters({"RequestType": event["RequestType"]})
482481
accounts = common.get_active_organization_accounts()
483482
regions = common.get_enabled_regions(params["ENABLED_REGIONS"], params["CONTROL_TOWER_REGIONS_ONLY"] == "true")
@@ -496,7 +495,7 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
496495
return "SRA-CONFIG-ORG"
497496

498497

499-
def orchestrator(event: Dict[str, Any], context: Any) -> None:
498+
def orchestrator(event: Dict[str, Any], context: Any) -> None: # noqa: U100
500499
"""Orchestration.
501500
502501
Args:
@@ -514,7 +513,7 @@ def orchestrator(event: Dict[str, Any], context: Any) -> None:
514513
process_event(event)
515514

516515

517-
def lambda_handler(event: Dict[str, Any], context: Any) -> None:
516+
def lambda_handler(event: Dict[str, Any], context: Any) -> None: # noqa: U100
518517
"""Lambda Handler.
519518
520519
Args:

‎aws_sra_examples/solutions/detective/detective_org/lambda/src/app.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def process_add_update_event(params: dict, regions: list, accounts: list) -> Non
6666
LOGGER.info("...ADD_UPDATE_NO_EVENT")
6767

6868

69-
def process_event(event: dict) -> None:
69+
def process_event(event: dict) -> None: # noqa: U100
7070
"""Process Event.
7171
7272
Args:
@@ -364,7 +364,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
364364
Returns:
365365
AWS CloudFormation physical resource id
366366
"""
367-
368367
params = get_validated_parameters({"RequestType": event["RequestType"]})
369368
excluded_accounts: list = [params["DELEGATED_ADMIN_ACCOUNT_ID"]]
370369
accounts = common.get_active_organization_accounts(excluded_accounts)
@@ -380,7 +379,7 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
380379
return f"sra-detective-org-{params['DELEGATED_ADMIN_ACCOUNT_ID']}"
381380

382381

383-
def orchestrator(event: Dict[str, Any], context: Any) -> None:
382+
def orchestrator(event: Dict[str, Any], context: Any) -> None: # noqa: U100
384383
"""Orchestration.
385384
386385
Args:
@@ -395,7 +394,7 @@ def orchestrator(event: Dict[str, Any], context: Any) -> None:
395394
process_event(event)
396395

397396

398-
def lambda_handler(event: Dict[str, Any], context: Any) -> None:
397+
def lambda_handler(event: Dict[str, Any], context: Any) -> None: # noqa: U100
399398
"""Lambda Handler.
400399
401400
Args:

‎aws_sra_examples/solutions/ec2/ec2_default_ebs_encryption/lambda/src/app.py‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def local_testing(aws_account: AccountTypeDef, params: dict) -> None:
297297
process_enable_ebs_encryption_by_default(account_session, aws_account["Id"], regions)
298298

299299

300-
def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], params: dict) -> None:
300+
def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], params: dict) -> None: # noqa: U100
301301
"""Process Accounts and Create SNS Messages for each account for solution deployment.
302302
303303
Args:
@@ -319,7 +319,7 @@ def process_accounts(event: Union[CloudFormationCustomResourceEvent, dict], para
319319
process_sns_message_batches(sns_messages, params["SNS_TOPIC_ARN"])
320320

321321

322-
def process_account(event: dict, aws_account_id: str, params: dict) -> None:
322+
def process_account(event: dict, aws_account_id: str, params: dict) -> None: # noqa: U100
323323
"""Process Account and Create SNS Message for solution deployment.
324324
325325
Args:
@@ -339,7 +339,7 @@ def process_account(event: dict, aws_account_id: str, params: dict) -> None:
339339
publish_sns_message(sns_message, "EC2 Default EBS Encryption", params["SNS_TOPIC_ARN"])
340340

341341

342-
def process_event(event: dict) -> None:
342+
def process_event(event: dict) -> None: # noqa: U100
343343
"""Process Event.
344344
345345
Args:
@@ -350,7 +350,7 @@ def process_event(event: dict) -> None:
350350
process_accounts(event, params)
351351

352352

353-
def process_event_sns(event: dict) -> None:
353+
def process_event_sns(event: dict) -> None: # noqa: U100
354354
"""Process SNS event.
355355
356356
Args:
@@ -371,7 +371,7 @@ def process_event_sns(event: dict) -> None:
371371
process_enable_ebs_encryption_by_default(account_session, aws_account["Id"], regions)
372372

373373

374-
def process_event_organizations(event: dict) -> None:
374+
def process_event_organizations(event: dict) -> None: # noqa: U100
375375
"""Process Event from AWS Organizations.
376376
377377
Args:
@@ -395,7 +395,7 @@ def process_event_organizations(event: dict) -> None:
395395
LOGGER.info("Organization event does not match expected values.")
396396

397397

398-
def process_event_lifecycle(event: dict) -> None:
398+
def process_event_lifecycle(event: dict) -> None: # noqa: U100
399399
"""Process Lifecycle Event from AWS Control Tower.
400400
401401
Args:
@@ -430,7 +430,6 @@ def process_event_cloudformation(event: CloudFormationCustomResourceEvent, conte
430430
Returns:
431431
AWS CloudFormation physical resource id
432432
"""
433-
434433
if event["RequestType"] in ["Create", "Update"]:
435434
params = get_validated_parameters({"RequestType": event["RequestType"]})
436435
process_accounts(event, params)
@@ -543,7 +542,7 @@ def get_validated_parameters(event: dict) -> dict:
543542
return params
544543

545544

546-
def orchestrator(event: dict, context: Any) -> None:
545+
def orchestrator(event: dict, context: Any) -> None: # noqa: U100
547546
"""Orchestration of Events.
548547
549548
Args:
@@ -562,7 +561,7 @@ def orchestrator(event: dict, context: Any) -> None:
562561
process_event(event)
563562

564563

565-
def lambda_handler(event: dict, context: Any) -> None:
564+
def lambda_handler(event: dict, context: Any) -> None: # noqa: U100
566565
"""Lambda Handler.
567566
568567
Args:

‎aws_sra_examples/solutions/genai/bedrock_guardrails/lambda/src/app.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def load_kms_key_policies() -> dict:
169169
sqs = sra_sqs.SRASQS()
170170

171171

172-
def get_resource_parameters(event: dict) -> None:
172+
def get_resource_parameters(event: dict) -> None: # noqa: U100
173173
"""Get resource parameters from event.
174174
175175
Args:
@@ -820,7 +820,7 @@ def delete_guardrails(account: str, region: str, guardrail_name: str) -> None:
820820
DRY_RUN_DATA[f"Bedrock-guardrail-{account}_{region}"] = f"DRY_RUN: Delete Bedrock guardrail {guardrail_name}"
821821

822822

823-
def create_event(event: dict, context: Any) -> str:
823+
def create_event(event: dict, context: Any) -> str: # noqa: U100
824824
"""Create event.
825825
826826
Args:
@@ -902,7 +902,7 @@ def create_event(event: dict, context: Any) -> str:
902902
return CFN_RESOURCE_ID
903903

904904

905-
def update_event(event: dict, context: Any) -> str:
905+
def update_event(event: dict, context: Any) -> str: # noqa: U100
906906
"""Update event.
907907
908908
Args:

0 commit comments

Comments
 (0)