Rename lambda folder to thin_egress_app

asfadmin · Mar 3, 2023 · ee6989e · ee6989e
1 parent a532520
commit ee6989e
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
 
     - run: pip install pytest-github-actions-annotate-failures
 
-    - run: pytest --cov=lambda --cov-report=term-missing --cov-report=xml --cov-branch tests
+    - run: pytest --cov=thin_egress_app --cov-report=term-missing --cov-report=xml --cov-branch tests
 
     - name: Report coverage
       uses: codecov/codecov-action@v2

diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@
 /terraform/providers.tf
 terraform.tfstate*
 *.tfvars
-/lambda/.chalice
+/thin_egress_app/.chalice
 .coverage
 
 # Config

diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 SOURCES := \
-	lambda/var/otel-config/collector.yaml \
-	lambda/app.py \
-	lambda/tea_bumper.py \
-	lambda/update_lambda.py
+	thin_egress_app/var/otel-config/collector.yaml \
+	thin_egress_app/app.py \
+	thin_egress_app/tea_bumper.py \
+	thin_egress_app/update_lambda.py
 
 HTML_TEMPLATES := $(wildcard templates/*.html)
 MD_TEMPLATES := $(wildcard templates/*.md)
@@ -15,7 +15,7 @@ REQUIREMENTS_TXT := $(REQUIREMENTS_IN:.in=.txt)
 DIR := dist
 EMPTY := $(DIR)/empty
 # Temporary artifacts
-DIST_SOURCES := $(SOURCES:lambda/%=$(DIR)/code/%)
+DIST_SOURCES := $(SOURCES:thin_egress_app/%=$(DIR)/code/%)
 DIST_MD_RESOURCES := $(MD_TEMPLATES:%.md=$(DIR)/code/%.html)
 DIST_HTML_RESOURCES := $(HTML_TEMPLATES:%=$(DIR)/code/%)
 DIST_RESOURCES := $(DIST_HTML_RESOURCES) $(DIST_MD_RESOURCES)
@@ -119,7 +119,7 @@ $(DIST_HTML_RESOURCES): $(DIR)/code/%: %
 	cp $< $@
 
 .SECONDARY: $(DIST_SOURCES)
-$(DIST_SOURCES): $(DIR)/code/%: lambda/%
+$(DIST_SOURCES): $(DIR)/code/%: thin_egress_app/%
 	@mkdir -p $(@D)
 	cp $< $@
 	$(PYTHON) scripts/sed.py -i $@ "<BUILD_ID>" "${BUILD_ID}"
@@ -286,4 +286,4 @@ lock: $(REQUIREMENTS_TXT)
 
 .PHONY: test
 test:
-	pytest --cov=lambda --cov-report=term-missing --cov-branch tests
+	pytest --cov=thin_egress_app --cov-report=term-missing --cov-branch tests
diff --git a/docs/technical.md b/docs/technical.md
@@ -19,7 +19,7 @@ file, parses out the IP CIDRs for the deploy region, and automatically
 updates the In-Region IAM Role's Policy Document `condition` block.
 
 This lambda is defined in
-[update_lambda.py](https://github.com/asfadmin/thin-egress-app/blob/master/lambda/update_lambda.py)
+[update_lambda.py](https://github.com/asfadmin/thin-egress-app/blob/master/thin_egress_app/update_lambda.py)
 
 ## Build Process
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -12,10 +12,9 @@
 mock_boto3 = mock.create_autospec(real_boto3)
 sys.modules["boto3"] = mock_boto3
 
-# Can't import normally because 'lambda' is a reserved word
 # Need to import these modules first because they will override the log level at import time
-_ = importlib.import_module("lambda.app")
-_ = importlib.import_module("lambda.tea_bumper")
+import thin_egress_app.app  # noqa: E402
+import thin_egress_app.tea_bumper  # noqa: E401,E402
 
 root_logger = logging.getLogger()
 for handler in root_logger.handlers:

diff --git a/tests/test_app.py b/tests/test_app.py
@@ -1,6 +1,5 @@
 import base64
 import contextlib
-import importlib
 import io
 from unittest import mock
 from urllib.error import HTTPError
@@ -12,9 +11,9 @@
 from chalice.test import Client
 from rain_api_core.auth import UserProfile
 
-MODULE = "lambda.app"
-# Can't import normally because 'lambda' is a reserved word
-app = importlib.import_module(MODULE)
+from thin_egress_app import app
+
+MODULE = "thin_egress_app.app"
 
 
 @pytest.fixture
@@ -476,7 +475,7 @@ def test_make_redirect(current_request):
 
 def test_make_html_response(monkeypatch):
     mock_render = mock.Mock(return_value="<html></html>")
-    monkeypatch.setattr("lambda.app.TEMPLATE_MANAGER.render", mock_render)
+    monkeypatch.setattr(f"{MODULE}.TEMPLATE_MANAGER.render", mock_render)
 
     response = app.make_html_response({"foo": "bar"}, {"baz": "qux"})
     assert response.body == "<html></html>"

diff --git a/tests/test_tea_bumper.py b/tests/test_tea_bumper.py
@@ -1,10 +1,10 @@
-import importlib
 from unittest import mock
 
 import pytest
 
-MODULE = "lambda.tea_bumper"
-tea_bumper = importlib.import_module(MODULE)
+from thin_egress_app import tea_bumper
+
+MODULE = "thin_egress_app.tea_bumper"
 
 
 @pytest.fixture

diff --git a/tests/test_update_lambda.py b/tests/test_update_lambda.py
@@ -1,12 +1,12 @@
-import importlib
 import io
 import json
 from unittest import mock
 
 import pytest
 
-MODULE = "lambda.update_lambda"
-update_lambda = importlib.import_module(MODULE)
+from thin_egress_app import update_lambda
+
+MODULE = "thin_egress_app.update_lambda"
 
 
 @pytest.fixture

diff --git a/lambda/__init__.py → thin_egress_app/__init__.py b/lambda/__init__.py → thin_egress_app/__init__.py
diff --git a/lambda/app.py → thin_egress_app/app.py b/lambda/app.py → thin_egress_app/app.py
diff --git a/lambda/tea_bumper.py → thin_egress_app/tea_bumper.py b/lambda/tea_bumper.py → thin_egress_app/tea_bumper.py
diff --git a/lambda/update_lambda.py → thin_egress_app/update_lambda.py b/lambda/update_lambda.py → thin_egress_app/update_lambda.py
diff --git a/lambda/var/otel-config/collector.yaml → ...egress_app/var/otel-config/collector.yaml b/lambda/var/otel-config/collector.yaml → ...egress_app/var/otel-config/collector.yaml