chore: update directory layout to match for release asset to start br…

…eaking up into smaller files
terraform-aws-modules · Dec 11, 2021 · 84f6a3c · 84f6a3c
1 parent 8e57742
commit 84f6a3c
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 6 deletions.
diff --git a/functions/Pipfile b/functions/Pipfile
@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 
 [dev-packages]
+aws_lambda_powertools = "~=1.22"
 boto3 = "~=1.20"
 botocore = "~=1.23"
 black = "*"
@@ -24,8 +25,8 @@ python_version = "3.8"
 test = "python3 -m pytest --cov --cov-report=term"
 'test:updatesnapshots' = "python3 -m pytest --snapshot-update"
 cover = "python3 -m coverage html"
-complexity = "python3 -m radon cc notify_slack.py -a"
-halstead = "python3 -m radon hal notify_slack.py"
+complexity = "python3 -m radon cc  -i 'docs,tests' ."
+halstead = "python3 -m radon hal -i 'docs,tests' ."
 typecheck = "python3 -m mypy . --ignore-missing-imports"
 lint = "python3 -m flake8 . --count --statistics --benchmark --exit-zero --config=.flake8"
 'lint:ci' = "python3 -m flake8 . --config=.flake8"

diff --git a/functions/notify_slack.py b/functions/notify_slack.py
@@ -310,7 +310,7 @@ def send_slack_notification(payload: Dict[str, Any]) -> str:
 
 @logger.inject_lambda_context(log_event=LOG_EVENTS)
 @event_source(data_class=SNSEvent)
-def lambda_handler(event: Dict[str, Any], context: Dict[str, Any]) -> str:
+def lambda_handler(event: SNSEvent, context: Dict[str, Any]) -> str:
     """
     Lambda function to parse notification events and forward to Slack
 

diff --git a/functions/events/cloudwatch_alarm.json → functions/tests/events/cloudwatch_alarm.json b/functions/events/cloudwatch_alarm.json → functions/tests/events/cloudwatch_alarm.json
diff --git a/functions/events/guardduty_finding_high.json → .../tests/events/guardduty_finding_high.json b/functions/events/guardduty_finding_high.json → .../tests/events/guardduty_finding_high.json
diff --git a/functions/events/guardduty_finding_low.json → ...s/tests/events/guardduty_finding_low.json b/functions/events/guardduty_finding_low.json → ...s/tests/events/guardduty_finding_low.json
diff --git a/...ions/events/guardduty_finding_medium.json → ...ests/events/guardduty_finding_medium.json b/...ions/events/guardduty_finding_medium.json → ...ests/events/guardduty_finding_medium.json
diff --git a/functions/integration_test.py → functions/tests/integration_test.py b/functions/integration_test.py → functions/tests/integration_test.py
diff --git a/functions/messages/cloudwatch_alarm.json → ...ions/tests/messages/cloudwatch_alarm.json b/functions/messages/cloudwatch_alarm.json → ...ions/tests/messages/cloudwatch_alarm.json
diff --git a/functions/messages/dms_notification.json → ...ions/tests/messages/dms_notification.json b/functions/messages/dms_notification.json → ...ions/tests/messages/dms_notification.json
diff --git a/functions/messages/glue_notification.json → ...ons/tests/messages/glue_notification.json b/functions/messages/glue_notification.json → ...ons/tests/messages/glue_notification.json
diff --git a/functions/messages/guardduty_finding.json → ...ons/tests/messages/guardduty_finding.json b/functions/messages/guardduty_finding.json → ...ons/tests/messages/guardduty_finding.json
diff --git a/functions/messages/text_message.json → functions/tests/messages/text_message.json b/functions/messages/text_message.json → functions/tests/messages/text_message.json
diff --git a/functions/notify_slack_test.py → functions/tests/notify_slack_test.py b/functions/notify_slack_test.py → functions/tests/notify_slack_test.py
@@ -13,6 +13,8 @@
 import notify_slack
 import pytest
 
+DIRNAME = os.path.dirname(__file__)
+
 
 def test_sns_get_slack_message_payload_snapshots(snapshot, monkeypatch):
     """
@@ -27,7 +29,7 @@ def test_sns_get_slack_message_payload_snapshots(snapshot, monkeypatch):
 
     # These are SNS messages that invoke the lambda handler; the event payload is in the
     # `message` field
-    _dir = "./messages"
+    _dir = os.path.join(DIRNAME, "./messages")
     messages = [f for f in os.listdir(_dir) if os.path.isfile(os.path.join(_dir, f))]
 
     for file in messages:
@@ -64,7 +66,7 @@ def test_event_get_slack_message_payload_snapshots(snapshot, monkeypatch):
 
     # These are just the raw events that will be converted to JSON string and
     # sent via SNS message
-    _dir = "./events"
+    _dir = os.path.join(DIRNAME, "./events")
     events = [f for f in os.listdir(_dir) if os.path.isfile(os.path.join(_dir, f))]
 
     for file in events:
@@ -92,7 +94,8 @@ def test_environment_variables_set(monkeypatch):
         "SLACK_WEBHOOK_URL", "https://hooks.slack.com/services/YOUR/WEBOOK/URL"
     )
 
-    with open(os.path.join("./messages/text_message.json"), "r") as efile:
+    text_message = os.path.join(os.path.join(DIRNAME, "./messages/text_message.json"))
+    with open(text_message, "r") as efile:
         event = ast.literal_eval(efile.read())
 
         for record in event["Records"]:

diff --git a/functions/snapshots/__init__.py → functions/tests/snapshots/__init__.py b/functions/snapshots/__init__.py → functions/tests/snapshots/__init__.py
diff --git a/...tions/snapshots/snap_notify_slack_test.py → ...tests/snapshots/snap_notify_slack_test.py b/...tions/snapshots/snap_notify_slack_test.py → ...tests/snapshots/snap_notify_slack_test.py