update 7

Author: Dan Xie

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/china-support/china-forward-function/tests/conftest.py

@@ -1,3 +1,6 @@
+"""
+conftest file
+"""
 import pytest
 
 # Global variables for AWS configuration

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/china-support/china-forward-function/tests/test_handler.py

@@ -1,6 +1,10 @@
-import pytest
+"""
+Tests for the AWS Lambda handler that forwards events to Step Functions.
+"""
 import os
 from unittest.mock import patch, MagicMock
+
+import pytest
 import handler
 
 
@@ -11,8 +15,9 @@ def mock_env_variables(aws_settings):
     """
     region = aws_settings["region"]
     partition = aws_settings["partition"]
-    with patch.object(handler, "SFN_ARN", f"arn:{partition}:states:{region}:123456789012:stateMachine:test-sfn"):
-        yield
+    sfn_arn = f"arn:{partition}:states:{region}:123456789012:stateMachine:test-sfn"
+    with patch.object(handler, "SFN_ARN", sfn_arn):
+        yield sfn_arn
 
 
 @pytest.fixture
@@ -40,19 +45,25 @@ def mock_boto3_session():
 
 @pytest.fixture
 def mock_stepfunction():
+    """
+    Fixture to mock the Stepfunction class in the handler module.
+    """
     mock_sfn = MagicMock()
     mock_sfn.invoke_sfn_execution.return_value = ({"executionArn": "test-arn"}, "test-state-name")
     with patch("handler.Stepfunction", return_value=mock_sfn):
         yield mock_sfn
 
 
 class TestLambdaHandler:
+    """Tests for the lambda_handler function."""
+
     def test_lambda_handler_with_organizations_event(
-        self, mock_env_variables, mock_boto3_session, mock_stepfunction, aws_settings
+        self, mock_env_variables, mock_boto3_session, mock_stepfunction, aws_settings # pylint: disable=unused-argument
     ):
+        """Test handling of an AWS Organizations event."""
         region = aws_settings["region"]
         partition = aws_settings["partition"]
-        # Test with an AWS Organizations event
+
         event = {
             "source": "aws.organizations",
             "detail-type": "AWS API Call via CloudTrail",
@@ -68,24 +79,29 @@ def test_lambda_handler_with_organizations_event(
         handler.Stepfunction.assert_called_once()
 
         # Check that invoke_sfn_execution was called with correct parameters
+        expected_arn = f"arn:{partition}:states:{region}:123456789012:stateMachine:test-sfn"
         mock_stepfunction.invoke_sfn_execution.assert_called_once_with(
-            sfn_arn=f"arn:{partition}:states:{region}:123456789012:stateMachine:test-sfn", input_data=event
+            sfn_arn=expected_arn,
+            input_data=event
         )
 
     def test_lambda_handler_with_non_organizations_event(
-        self, mock_env_variables, mock_boto3_session, mock_stepfunction
+        self, mock_env_variables, mock_boto3_session, mock_stepfunction # pylint: disable=unused-argument
     ):
-        # Test with a non-AWS Organizations event
-        event = {"source": "aws.ec2", "detail-type": "EC2 Instance State-change Notification"}
+        """Test handling of a non-AWS Organizations event."""
+        event = {
+            "source": "aws.ec2", 
+            "detail-type": "EC2 Instance State-change Notification"
+        }
 
         handler.lambda_handler(event, {})
 
         # Check that Stepfunction was not instantiated
         handler.Stepfunction.assert_not_called()
         mock_stepfunction.invoke_sfn_execution.assert_not_called()
 
-    def test_lambda_handler_with_missing_source(self, mock_env_variables, mock_boto3_session, mock_stepfunction):
-        # Test with an event missing the source field
+    def test_lambda_handler_with_missing_source(self, mock_env_variables, mock_boto3_session, mock_stepfunction): # pylint: disable=unused-argument
+        """Test handling of an event missing the source field."""
         event = {"detail-type": "Some Event", "detail": {}}
 
         handler.lambda_handler(event, {})
@@ -96,11 +112,14 @@ def test_lambda_handler_with_missing_source(self, mock_env_variables, mock_boto3
 
 
 def test_sfn_name_extraction(aws_settings):
+    """Test extraction of Step Function name from ARN."""
     sfn_name = "test-sfn"
-    sfn_arn = f"arn:{aws_settings['partition']}:states:{aws_settings['region']}:123456789012:stateMachine:{sfn_name}"
+    region = aws_settings["region"]
+    partition = aws_settings["partition"]
+    sfn_arn = f"arn:{partition}:states:{region}:123456789012:stateMachine:{sfn_name}"
     with patch.dict(os.environ, {"SFN_ARN": sfn_arn}):
         # Re-import to get the updated SFN_ARN value
         import importlib
 
         importlib.reload(handler)
-        assert handler.sfn_name == sfn_name
+        assert handler.sfn_name == sfn_name

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/china-support/china-forward-function/tests/test_stepfunction_helper.py

@@ -1,7 +1,8 @@
 import json
-import pytest
 from decimal import Decimal
 from unittest.mock import MagicMock, patch
+
+import pytest
 from stepfunction_helper import Stepfunction, convert_decimals
 
 
@@ -20,15 +21,29 @@ def test_convert_dict_with_decimals(self):
 
     def test_convert_nested_structure(self):
         data = {
-            "items": [{"price": Decimal("10.5"), "quantity": 2}, {"price": Decimal("20.7"), "quantity": 1}],
+            "items": [
+                {"price": Decimal("10.5"), "quantity": 2},
+                {"price": Decimal("20.7"), "quantity": 1}
+            ],
             "total": Decimal("41.7"),
         }
         result = convert_decimals(data)
-        expected = {"items": [{"price": "10.5", "quantity": 2}, {"price": "20.7", "quantity": 1}], "total": "41.7"}
+        expected = {
+            "items": [
+                {"price": "10.5", "quantity": 2},
+                {"price": "20.7", "quantity": 1}
+            ],
+            "total": "41.7"
+        }
         assert result == expected
 
     def test_non_decimal_values_unchanged(self):
-        data = {"name": "Test", "active": True, "count": 5, "items": ["a", "b", "c"]}
+        data = {
+            "name": "Test",
+            "active": True,
+            "count": 5,
+            "items": ["a", "b", "c"]
+            }
         assert convert_decimals(data) == data
 
 
@@ -101,7 +116,8 @@ def test_invoke_sfn_execution_with_decimal_data(self, stepfunction, mock_session
 
         with patch("uuid.uuid4", return_value="mocked-uuid"):
             stepfunction.invoke_sfn_execution(
-                sfn_arn=f"arn:{partition}:states:{region}:123456789012:stateMachine:test-sfn", input_data=input_data
+                sfn_arn=f"arn:{partition}:states:{region}:123456789012:stateMachine:test-sfn",
+                input_data=input_data
             )
 
         mock_client.start_execution.assert_called_once_with(
@@ -123,4 +139,4 @@ def test_invoke_sfn_execution_exception(self, stepfunction, mock_session, aws_se
             )
 
         assert "Test exception" in str(excinfo.value)
-        stepfunction.logger.error.assert_called_once()
+        stepfunction.logger.error.assert_called_once()

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/china-support/tests/test_create_s3_cn.py

@@ -1,12 +1,14 @@
-# test_create_s3_cn.py
+"""
+s3 bucket creation script
+"""
 
-import os
 import pytest
 from unittest.mock import patch, MagicMock
 
 # Import the module to test
 import create_s3_cn
 
+
 @pytest.fixture
 def mock_env_vars():
     """
@@ -15,13 +17,13 @@ def mock_env_vars():
     # Save original values
     original_region = create_s3_cn.REGION_DEFAULT
     original_account_id = create_s3_cn.MANAGEMENT_ACCOUNT_ID
-    
+
     # Patch the module variables directly
     create_s3_cn.REGION_DEFAULT = "cn-northwest-1"
     create_s3_cn.MANAGEMENT_ACCOUNT_ID = "123456789012"
-    
+
     yield
-    
+
     # Restore original values
     create_s3_cn.REGION_DEFAULT = original_region
     create_s3_cn.MANAGEMENT_ACCOUNT_ID = original_account_id
@@ -43,7 +45,8 @@ def mock_logger():
     with patch("create_s3_cn.LOGGER") as mock_logger:
         yield mock_logger
 
-def test_create_s3_bucket_china(mock_env_vars, mock_cloudformation, mock_logger):
+
+def test_create_s3_bucket_china(mock_env_vars, mock_cloudformation, mock_logger): # pylint: disable=unused-argument
     """Test creating an S3 bucket in China region."""
     # Arrange
     bucket_name = "adf-china-bootstrap-cn-northwest-1-123456789012"
@@ -54,7 +57,7 @@ def test_create_s3_bucket_china(mock_env_vars, mock_cloudformation, mock_logger)
     # Assert
     # Remove this line as it's incorrect - we're not calling the mock directly
     # mock_cloudformation.assert_called_once()
-    
+
     # Instead, check that create_stack was called on the mock instance
     mock_cloudformation.create_stack.assert_called_once()
 
@@ -66,7 +69,7 @@ def test_create_s3_bucket_china(mock_env_vars, mock_cloudformation, mock_logger)
         assert kwargs["region"] == "cn-northwest-1"
         assert kwargs["deployment_account_region"] == "cn-northwest-1"
         assert kwargs["stack_name"] == "adf-regional-base-china-bucket"
-        assert kwargs["account_id"] == "123456789012" 
+        assert kwargs["account_id"] == "123456789012"
 
         # Verify parameters passed to CloudFormation
         parameters = kwargs["parameters"]
@@ -78,7 +81,7 @@ def test_create_s3_bucket_china(mock_env_vars, mock_cloudformation, mock_logger)
     mock_logger.info.assert_called_with("Deploy S3 bucket %s...", bucket_name)
 
 
-def test_create_s3_bucket_exception( mock_env_vars, mock_cloudformation, mock_logger):
+def test_create_s3_bucket_exception(mock_env_vars, mock_cloudformation, mock_logger): # pylint: disable=unused-argument
     """Test exception handling when creating an S3 bucket fails."""
     # Arrange
     bucket_name = "adf-china-bootstrap-cn-northwest-1-123456789012"
@@ -92,12 +95,13 @@ def test_create_s3_bucket_exception( mock_env_vars, mock_cloudformation, mock_lo
     mock_logger.error.assert_called_once()
     assert "Failed to process _create_s3_bucket" in mock_logger.error.call_args[0][0]
 
-def test_main_function(mock_env_vars, monkeypatch):
+
+def test_main_function(mock_env_vars, monkeypatch): # pylint: disable=unused-argument
     """Test the main function calls _create_s3_bucket with correct bucket name."""
     # Arrange
     mock_create_bucket = MagicMock()
     monkeypatch.setattr(create_s3_cn, "_create_s3_bucket", mock_create_bucket)
-    
+
     # Update expected bucket name to match actual implementation
     expected_bucket_name = "adf-china-bootstrap-cn-northwest-1-123456789012"
 
@@ -107,7 +111,8 @@ def test_main_function(mock_env_vars, monkeypatch):
     # Assert
     mock_create_bucket.assert_called_once_with(expected_bucket_name)
 
-def test_cloudformation_template_path(mock_env_vars, mock_cloudformation):
+
+def test_cloudformation_template_path(mock_env_vars, mock_cloudformation): # pylint: disable=unused-argument
     """Test the CloudFormation template path is correct."""
     # Arrange
     bucket_name = "test-bucket"