fix issues for isort linting

cyphronix · cyphronix · commit f905c8903fb0 · 2024-12-12T15:30:23.000-07:00
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
@@ -7,11 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
-import os
 import logging
+import os
+from typing import Any
+
+import boto3
 
 # Setup Default Logger
 LOGGER = logging.getLogger(__name__)
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_eval_job_bucket/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/rules/sra_bedrock_check_eval_job_bucket/app.py
@@ -7,13 +7,14 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
+import ast
+import logging
+import os
+from datetime import datetime
 from typing import Any
+
 import boto3
 from botocore.exceptions import ClientError
-from datetime import datetime
-import logging
-import os
-import ast
 
 # Set to True to get the lambda to assume the Role attached on the Config Service (useful for cross-account).
 ASSUME_ROLE_MODE = False
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
@@ -7,11 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
-import os
 import logging
+import os
+from typing import Any
+
+import boto3
 
 # Setup Default Logger
 LOGGER = logging.getLogger(__name__)
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
@@ -7,13 +7,14 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
-import json
-from datetime import datetime
 import ast
+import json
 import logging
 import os
+from datetime import datetime
+from typing import Any
+
+import boto3
 
 # Setup Default Logger
 LOGGER = logging.getLogger(__name__)
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
@@ -7,11 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
 import logging
 import os
+from typing import Any
+
+import boto3
 
 # Set to True to get the lambda to assume the Role attached on the Config Service (useful for cross-account).
 ASSUME_ROLE_MODE = False
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
@@ -7,11 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
-import os
 import logging
+import os
+from typing import Any
+
+import boto3
 
 # Setup Default Logger
 LOGGER = logging.getLogger(__name__)
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
@@ -7,11 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
-import os
 import logging
+import os
+from typing import Any
+
+import boto3
 import botocore
 import botocore.exceptions
 
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
@@ -8,11 +8,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
-import os
 import logging
+import os
+from typing import Any
+
+import boto3
 
 # Setup Default Logger
 LOGGER = logging.getLogger(__name__)
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
@@ -7,11 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from typing import Any
-import boto3
 import json
-import os
 import logging
+import os
+from typing import Any
+
+import boto3
 
 # Setup Default Logger
 LOGGER = logging.getLogger(__name__)
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/app.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/app.py
@@ -9,28 +9,27 @@
 SPDX-License-Identifier: MIT-0
 """
 import copy
-from datetime import datetime
 import json
-import os
 import logging
-from pathlib import Path
+import os
 import re
+from datetime import datetime
+from pathlib import Path
+from typing import Any, Dict, List, Literal, Optional
+
 import boto3
 import cfnresponse
-
-import sra_s3
-import sra_repo
-import sra_ssm_params
-import sra_iam
+import sra_cloudwatch
+import sra_config
 import sra_dynamodb
-import sra_sts
+import sra_iam
+import sra_kms
 import sra_lambda
+import sra_repo
+import sra_s3
 import sra_sns
-import sra_config
-import sra_cloudwatch
-import sra_kms
-
-from typing import Dict, Any, List, Literal, Optional
+import sra_ssm_params
+import sra_sts
 
 # TODO(liamschn): deploy example bedrock guardrail
 # TODO(liamschn): deploy example iam role(s) and policy(ies) - lower priority/not necessary?
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/cfnresponse.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/cfnresponse.py
@@ -3,9 +3,11 @@
 # SPDX-License-Identifier: MIT-0
 
 from __future__ import print_function
-import urllib3
+
 import json
 
+import urllib3
+
 SUCCESS = "SUCCESS"
 FAILED = "FAILED"
 
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_cloudwatch.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_cloudwatch.py
@@ -10,17 +10,15 @@
 
 from __future__ import annotations
 
+import json
 import logging
 import os
-
 from typing import TYPE_CHECKING, Literal
 
 import boto3
 from botocore.config import Config
 from botocore.exceptions import ClientError
 
-import json
-
 if TYPE_CHECKING:
     from mypy_boto3_cloudwatch import CloudWatchClient
     from mypy_boto3_logs import CloudWatchLogsClient
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_config.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_config.py
@@ -10,22 +10,19 @@
 
 from __future__ import annotations
 
+import json
 import logging
 import os
-
 from typing import TYPE_CHECKING, Literal
 
 import boto3
 from botocore.config import Config
 from botocore.exceptions import ClientError
 
-import json
-
-
 if TYPE_CHECKING:
-    from mypy_boto3_organizations import OrganizationsClient
     from mypy_boto3_config import ConfigServiceClient
     from mypy_boto3_config.type_defs import DescribeConfigRulesResponseTypeDef
+    from mypy_boto3_organizations import OrganizationsClient
 
 
 class SRAConfig:
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_dynamodb.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_dynamodb.py
@@ -9,14 +9,16 @@
 """
 
 import logging
-import boto3
 import os
 import random
 import string
 from datetime import datetime
 from time import sleep
-from boto3.session import Session
 from typing import TYPE_CHECKING, Any, Dict, Sequence
+
+import boto3
+from boto3.session import Session
+
 if TYPE_CHECKING:
     from mypy_boto3_dynamodb.client import DynamoDBClient
     from mypy_boto3_dynamodb.service_resource import DynamoDBServiceResource
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_iam.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_iam.py
@@ -7,27 +7,24 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-
 from __future__ import annotations
 
+import json
 import logging
 import os
+import urllib.parse
 from time import sleep
-
 from typing import TYPE_CHECKING
 
 import boto3
 from botocore.config import Config
 from botocore.exceptions import ClientError
 
-import urllib.parse
-import json
-
 if TYPE_CHECKING:
     from mypy_boto3_cloudformation import CloudFormationClient
-    from mypy_boto3_organizations import OrganizationsClient
     from mypy_boto3_iam.client import IAMClient
     from mypy_boto3_iam.type_defs import CreatePolicyResponseTypeDef, CreateRoleResponseTypeDef, EmptyResponseMetadataTypeDef
+    from mypy_boto3_organizations import OrganizationsClient
 
 
 class SRAIAM:
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_kms.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_kms.py
@@ -7,27 +7,23 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-
 from __future__ import annotations
 
 import logging
 import os
-
-from typing import TYPE_CHECKING
-from typing import cast
-from typing import Literal
+from typing import TYPE_CHECKING, Literal, cast
 
 if TYPE_CHECKING:
     from mypy_boto3_kms.client import KMSClient
     from mypy_boto3_kms.type_defs import DescribeKeyResponseTypeDef
     from boto3 import Session
 
+import json
+import urllib.parse
+
 import boto3
 from botocore.config import Config
 
-import urllib.parse
-import json
-
 
 class SRAKMS:
     """Class to represent SRA KMS resources."""
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
@@ -7,13 +7,11 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-
 from __future__ import annotations
 
 import logging
 import os
 from time import sleep
-
 from typing import TYPE_CHECKING
 
 import boto3
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_repo.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_repo.py
@@ -8,14 +8,14 @@
 SPDX-License-Identifier: MIT-0
 """
 import logging
-import urllib3
-from io import BytesIO
-from zipfile import ZipFile
-from zipfile import ZIP_DEFLATED
 import os
 import shutil
 import subprocess  # noqa S404 (best practice for calling pip from script)
 import sys
+from io import BytesIO
+from zipfile import ZIP_DEFLATED, ZipFile
+
+import urllib3
 
 # TODO(liamschn): need to exclude "inline_" files from the staging process
 
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
@@ -7,12 +7,12 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
+import json
 import logging
 import os
 
 import boto3
 from botocore.client import ClientError
-import json
 
 
 class SRAS3:
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_sns.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_sns.py
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_ssm_params.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_ssm_params.py
diff --git a/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_sts.py b/aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_sts.py
