changing tests implementation and fixing makefile?

Author: rafaelherik

makefile

@@ -1,38 +1,72 @@
-.PHONY: help test clean build release run-sample debug-sample
+.PHONY: help install dev-install clean build test lint check release run-sample debug-sample venv
 
 VERSION ?= $(error Please set VERSION variable to create a release: make release VERSION=0.1.0)
+VENV = .venv
+PYTHON = $(VENV)/bin/python3
+PIP = $(VENV)/bin/pip
 
 help:
 	@echo "Available commands:"
-	@echo "  make test      - Run tests"
-	@echo "  make clean     - Remove build artifacts"
-	@echo "  make build     - Build the package"
-	@echo "  make release   - Create a new release (requires VERSION=X.Y.Z)"
-	@echo "  make run-sample - Run tfsumpy with sample1.json plan file"
+	@echo "  make venv         - Create virtual environment"
+	@echo "  make install      - Install package in production mode"
+	@echo "  make dev-install  - Install package in development mode with test dependencies"
+	@echo "  make test         - Run tests"
+	@echo "  make lint         - Run linting checks"
+	@echo "  make check        - Run all checks (lint + test)"
+	@echo "  make clean        - Remove build artifacts"
+	@echo "  make build        - Build the package"
+	@echo "  make release      - Create a new release (requires VERSION=X.Y.Z)"
+	@echo "  make run-sample   - Run tfsumpy with sample1.json plan file"
 	@echo "  make debug-sample - Run tfsumpy with sample1.json plan file and custom config"
 
-test:
-	pytest
+# Virtual environment
+venv:
+	python3 -m venv $(VENV)
+	$(PIP) install --upgrade pip
 
-run-sample: build
-	@echo "Running tfsumpy with sample1.json plan file..."
-	python -m tfsumpy samples/sample1.json --debug
+# Installation targets
+install: venv
+	$(PIP) install .
 
-debug-sample: build
-	@echo "Running tfsumpy with sample1.json plan file and custom config..."
-	python -m tfsumpy samples/sample1.json --debug --config tfsumpy/rules_config.json
+dev-install: venv
+	$(PIP) install -e ".[dev]"
+	$(PIP) install pytest pylint mypy
 
+# Development commands
+test: dev-install
+	$(PYTHON) -m pytest tfsumpy/tests/
+
+
+
+lint: dev-install
+	$(PYTHON) -m pylint tfsumpy
+	$(PYTHON) -m mypy tfsumpy
+
+check: lint test
+
+# Build commands
 clean:
 	rm -rf build/
 	rm -rf dist/
 	rm -rf *.egg-info
+	rm -rf .pytest_cache
+	rm -rf .mypy_cache
+	rm -rf .coverage
 	find . -type d -name __pycache__ -exec rm -rf {} +
 	find . -type f -name "*.pyc" -delete
 
 build: clean
-	python -m build
+	$(PYTHON) -m build
+
+# Sample commands
+run-sample: install
+	$(PYTHON) -m tfsumpy samples/sample1.json --debug
+
+debug-sample: install
+	$(PYTHON) -m tfsumpy samples/sample1.json --debug --config tfsumpy/rules_config.json
 
-release: test clean
+# Release command (unchanged)
+release: check clean
 	@echo "Creating release for version $(VERSION)"
 	@# Update version in __init__.py (works on both Linux and macOS)
 	@sed -i.bak "s/__version__ = .*/__version__ = '$(VERSION)'/" tfsumpy/__init__.py && rm -f tfsumpy/__init__.py.bak

tfsumpy/tests/plan_analyzer_test.py

@@ -1,16 +1,25 @@
 import pytest
 from pathlib import Path
 from tfsumpy.plan_analyzer import LocalPlanAnalyzer
+from tfsumpy.context import Context
+import json
 
 @pytest.fixture
 def sample_plan_path():
     return str(Path(__file__).parent / 'sample1.json')
 
 @pytest.fixture
-def plan_analyzer():
-    return LocalPlanAnalyzer()
+def context():
+    """Create a test context with default configuration"""
+    return Context(debug=True)
+
+@pytest.fixture
+def plan_analyzer(context):
+    """Create a plan analyzer with test context"""
+    return LocalPlanAnalyzer(context=context)
 
 def test_generate_report(plan_analyzer, sample_plan_path):
+    """Test report generation with sample plan"""
     report = plan_analyzer.generate_report(sample_plan_path)
 
     # Test summary statistics
@@ -29,19 +38,22 @@ def test_generate_report(plan_analyzer, sample_plan_path):
     s3_resource = next(r for r in resources if r['resource_type'] == 'aws_s3_bucket')
     assert s3_resource['action'] == 'create'
     assert 'example' in s3_resource['identifier']
+    assert s3_resource['module'] == 'root'  # Test module information
 
     # Verify EC2 instance update
     ec2_resource = next(r for r in resources if r['resource_type'] == 'aws_instance')
     assert ec2_resource['action'] == 'update'
     assert 'web_server' in ec2_resource['identifier']
+    assert ec2_resource['module'] == 'root'
 
     # Verify security group deletion
     sg_resource = next(r for r in resources if r['resource_type'] == 'aws_security_group')
     assert sg_resource['action'] == 'delete'
     assert 'obsolete' in sg_resource['identifier']
-
+    assert sg_resource['module'] == 'root'
 
 def test_sanitization(plan_analyzer):
+    """Test text sanitization with sensitive data"""
     sensitive_text = """
     {
         "access_key": "AKIAXXXXXXXXXXXXXXXX",
@@ -57,3 +69,30 @@ def test_sanitization(plan_analyzer):
     assert '[SECRET-REDACTED]' in sanitized
     assert '192.168.1.1' not in sanitized
     assert '[IP-REDACTED]' in sanitized
+
+def test_module_handling(plan_analyzer, tmp_path):
+    """Test handling of module-based resources"""
+    # Create a sample plan with module resources
+    module_plan = {
+        "resource_changes": [
+            {
+                "address": "module.network.aws_vpc.main",
+                "type": "aws_vpc",
+                "change": {"actions": ["create"]},
+                "module": "network"
+            }
+        ]
+    }
+    
+    plan_path = tmp_path / "module_plan.json"
+    with open(plan_path, "w") as f:
+        json.dump(module_plan, f)
+    
+    report = plan_analyzer.generate_report(str(plan_path))
+    resources = report['summary']['resources']
+    
+    assert len(resources) == 1
+    vpc_resource = resources[0]
+    assert vpc_resource['module'] == 'network'
+    assert vpc_resource['resource_type'] == 'aws_vpc'
+    assert vpc_resource['action'] == 'create'