fixing mypy errors

cyphronix · cyphronix · commit 79a0c295c775 · 2025-01-30T11:57:03.000-07:00
diff --git a/aws_sra_examples/solutions/ami_bakery/ami_bakery_org/lambda/src/codepipeline.py b/aws_sra_examples/solutions/ami_bakery/ami_bakery_org/lambda/src/codepipeline.py
@@ -90,7 +90,7 @@ def create_codepipeline(
         "roleArn": "arn:" + aws_partition + ":iam::" + account_id + ":role/" + codepipeline_role_name,
         "artifactStore": {"type": "S3", "location": bucket_name},
         "stages": [
-            {  # type: ignore
+            {
                 "name": pipeline_name + "-CodeCommitSource",
                 "actions": [
                     {
@@ -104,7 +104,7 @@ def create_codepipeline(
                     }
                 ],
             },
-            {  # type: ignore
+            {
                 "name": pipeline_name + "-DeployEC2ImageBuilder",
                 "actions": [
                     {
diff --git a/aws_sra_examples/solutions/config/config_org/lambda/src/config.py b/aws_sra_examples/solutions/config/config_org/lambda/src/config.py
@@ -92,7 +92,7 @@ def set_config_in_org(
     configuration_recorder: ConfigurationRecorderTypeDef = {
         "name": recorder_name,
         "roleARN": role_arn,
-        "recordingGroup": {  # type: ignore
+        "recordingGroup": {
             "allSupported": all_supported,
             "includeGlobalResourceTypes": include_global_resource_types,
             "resourceTypes": resource_types,
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_cloudwatch_endpoints/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_cloudwatch_endpoints/app.py
@@ -104,6 +104,6 @@ def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
 
     # Submit compliance evaluations
     if evaluations:
-        config_client.put_evaluations(Evaluations=evaluations, ResultToken=event["resultToken"])
+        config_client.put_evaluations(Evaluations=evaluations, ResultToken=event["resultToken"])  # type: ignore
 
     LOGGER.info(f"Compliance evaluation complete. Processed {len(evaluations)} evaluations.")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_guardrail_encryption/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_guardrail_encryption/app.py
@@ -61,7 +61,7 @@ def evaluate_compliance(rule_parameters: dict) -> tuple[str, str]:  # noqa: CFQ0
 
     except ClientError as e:
         if e.response['Error']['Code'] == 'AccessDeniedException':
-            LOGGER.info(f"Access denied. If guardrail uses KMS encryption, ensure Lambda's IAM role has permissions to the KMS key.")
+            LOGGER.info("Access denied. If guardrail uses KMS encryption, ensure Lambda's IAM role has permissions to the KMS key.")
             return "NON_COMPLIANT", (
                 "Access denied. If guardrail uses KMS encryption, ensure Lambda's IAM role has permissions to the KMS key."
             )
@@ -95,6 +95,6 @@ def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
     LOGGER.info(f"Compliance evaluation result: {compliance_type}")
     LOGGER.info(f"Annotation: {annotation}")
 
-    config_client.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])
+    config_client.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])  # type: ignore
 
     LOGGER.info("Compliance evaluation complete.")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_guardrails/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_guardrails/app.py
@@ -130,7 +130,7 @@ def lambda_handler(event: dict, context: Any) -> dict:  # noqa: CCR001, C901, U1
     config = boto3.client("config")
 
     try:
-        response = config.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])
+        response = config.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])  # type: ignore
         LOGGER.info(f"Evaluation sent successfully: {response}")
     except Exception as e:
         LOGGER.error(f"Error sending evaluation: {str(e)}")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_iam_user_access/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_iam_user_access/app.py
@@ -161,7 +161,7 @@ def lambda_handler(event: dict, context: Any) -> dict:
                 "OrderingTimestamp": invoking_event["notificationCreationTime"],
             }
         ],
-        ResultToken=result_token,
+        ResultToken=result_token,  # type: ignore
     )
 
     # Return the evaluation result
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_invocation_log_cloudwatch/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_invocation_log_cloudwatch/app.py
@@ -103,6 +103,6 @@ def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
     LOGGER.info(f"Compliance evaluation result: {compliance_type}")
     LOGGER.info(f"Annotation: {annotation}")
 
-    config_client.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])
+    config_client.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])  # type: ignore
 
     LOGGER.info("Compliance evaluation complete.")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_invocation_log_s3/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_invocation_log_s3/app.py
@@ -33,6 +33,7 @@
 # Global variables
 BUCKET_NAME = ""
 
+
 def evaluate_compliance(rule_parameters: dict) -> tuple[str, str]:  # noqa: CFQ004, CCR001, C901
     """Evaluate if Bedrock Model Invocation Logging is properly configured for S3.
 
@@ -139,6 +140,6 @@ def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
     LOGGER.info(f"Compliance evaluation result: {compliance_type}")
     LOGGER.info(f"Annotation: {annotation}")
 
-    config_client.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])
+    config_client.put_evaluations(Evaluations=[evaluation], ResultToken=event["resultToken"])  # type: ignore
 
     LOGGER.info("Compliance evaluation complete.")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_s3_endpoints/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_s3_endpoints/app.py
@@ -108,6 +108,6 @@ def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
 
     # Submit compliance evaluations
     if evaluations:
-        config_client.put_evaluations(Evaluations=evaluations, ResultToken=event["resultToken"])
+        config_client.put_evaluations(Evaluations=evaluations, ResultToken=event["resultToken"])  # type: ignore
 
     LOGGER.info(f"Compliance evaluation complete. Processed {len(evaluations)} evaluations.")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_vpc_endpoints/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_vpc_endpoints/app.py
@@ -120,6 +120,6 @@ def lambda_handler(event: dict, context: Any) -> None:  # noqa: U100
 
     # Submit compliance evaluations
     if evaluations:
-        config_client.put_evaluations(Evaluations=evaluations, ResultToken=event["resultToken"])
+        config_client.put_evaluations(Evaluations=evaluations, ResultToken=event["resultToken"])  # type: ignore
 
     LOGGER.info(f"Compliance evaluation complete. Processed {len(evaluations)} evaluations.")
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_lambda.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_lambda.py
@@ -96,7 +96,7 @@ def create_lambda_function(  # noqa: CFQ002, CCR001
             try:
                 create_response = self.LAMBDA_CLIENT.create_function(
                     FunctionName=function_name,
-                    Runtime=runtime,
+                    Runtime=runtime,  # type: ignore
                     Handler=handler,
                     Role=role_arn,
                     Code={"ZipFile": open(code_zip_file, "rb").read()},  # noqa: SIM115
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_s3.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_s3.py
@@ -89,7 +89,10 @@ def create_s3_bucket(self, bucket: str) -> None:
         """
         if self.REGION != "us-east-1":
             create_bucket = self.S3_CLIENT.create_bucket(
-                ACL="private", Bucket=bucket, CreateBucketConfiguration={"LocationConstraint": self.REGION}, ObjectOwnership="BucketOwnerPreferred"
+                ACL="private",
+                Bucket=bucket,
+                CreateBucketConfiguration={"LocationConstraint": self.REGION},  # type: ignore
+                ObjectOwnership="BucketOwnerPreferred"
             )
         else:
             create_bucket = self.S3_CLIENT.create_bucket(ACL="private", Bucket=bucket, ObjectOwnership="BucketOwnerPreferred")
diff --git a/aws_sra_examples/solutions/patch_mgmt/patch_mgmt_org/lambda/src/app.py b/aws_sra_examples/solutions/patch_mgmt/patch_mgmt_org/lambda/src/app.py
@@ -369,7 +369,7 @@ def manage_task_params(
     """
     if task_operation is None and task_reboot_option is None:
         no_param_response: MaintenanceWindowTaskInvocationParametersTypeDef = {
-            "RunCommand": {  # type: ignore
+            "RunCommand": {
                 "Parameters": {},
                 "DocumentVersion": "$DEFAULT",
                 "TimeoutSeconds": 3600,
@@ -382,7 +382,7 @@ def manage_task_params(
     task_operation_final: str = "INVALID_TASK_OPERATION_PROVIDED" if task_operation is None else task_operation
     task_reboot_option_final: str = "INVALID_TASK_REBOOT_OPTION_PROVIDED" if task_reboot_option is None else task_reboot_option
     with_params_response: MaintenanceWindowTaskInvocationParametersTypeDef = {
-        "RunCommand": {  # type: ignore
+        "RunCommand": {
             "Parameters": {
                 "Operation": [task_operation_final],
                 "RebootOption": [task_reboot_option_final],
diff --git a/aws_sra_examples/solutions/security_lake/security_lake_org/lambda/src/security_lake.py b/aws_sra_examples/solutions/security_lake/security_lake_org/lambda/src/security_lake.py
@@ -913,7 +913,7 @@ def set_lake_formation_permissions(lf_client: LakeFormationClient, account: str,
     try:
         resource: Union[ResourceTypeDef] = {
             "Database": {"CatalogId": account, "Name": db_name + "_subscriber"},
-            "Table": {"CatalogId": account, "DatabaseName": db_name + "_subscriber", "Name": "rl_*"},  # type: ignore
+            "Table": {"CatalogId": account, "DatabaseName": db_name + "_subscriber", "Name": "rl_*"},
         }
         lf_client.grant_permissions(
             CatalogId=account,

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def create_codepipeline(`
`90`	`90`	`"roleArn": "arn:" + aws_partition + ":iam::" + account_id + ":role/" + codepipeline_role_name,`
`91`	`91`	`"artifactStore": {"type": "S3", "location": bucket_name},`
`92`	`92`	`"stages": [`
`93`		`- { # type: ignore`
	`93`	`+ {`
`94`	`94`	`"name": pipeline_name + "-CodeCommitSource",`
`95`	`95`	`"actions": [`
`96`	`96`	`{`
`@@ -104,7 +104,7 @@ def create_codepipeline(`
`104`	`104`	`}`
`105`	`105`	`],`
`106`	`106`	`},`
`107`		`- { # type: ignore`
	`107`	`+ {`
`108`	`108`	`"name": pipeline_name + "-DeployEC2ImageBuilder",`
`109`	`109`	`"actions": [`
`110`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ def lambda_handler(event: dict, context: Any) -> dict:`
`161`	`161`	`"OrderingTimestamp": invoking_event["notificationCreationTime"],`
`162`	`162`	`}`
`163`	`163`	`],`
`164`		`- ResultToken=result_token,`
	`164`	`+ ResultToken=result_token, # type: ignore`
`165`	`165`	`)`
`166`	`166`
`167`	`167`	`# Return the evaluation result`