Consistent naming

antonpirker · antonpirker · commit 3f2fee0249a0 · 2022-04-05T14:25:49.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -116,15 +116,14 @@ jobs:
 
       - run: |
           pip install virtualenv
-          make aws-lambda-layer-build
-          # TODO: xxx !!! rename to make aws-lambda-layer
+          make aws-lambda-layer
 
       - uses: actions/upload-artifact@v3
         with:
           name: prepared-lambda-layer-${{ github.sha }}
           path: |
             dist/*
-            # TODO: xxx !!! MAKE SURE TO PICK UP DIST FOLDER FROM make aws-lambda-layer-build
+            # TODO: xxx !!! MAKE SURE TO PICK UP DIST FOLDER FROM make aws-lambda-layer
 
       - uses: getsentry/action-build-aws-lambda-extension@v1
         with:
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ help:
 	@echo "make test: Run basic tests (not testing most integrations)"
 	@echo "make test-all: Run ALL tests (slow, closest to CI)"
 	@echo "make format: Run code formatters (destructive)"
-	@echo "make aws-lambda-layer-build: Build serverless ZIP dist package"
+	@echo "make aws-lambda-layer: Build AWS Lambda layer directorzy for serverless integration"
 	@echo
 	@echo "Also make sure to read ./CONTRIBUTING.md"
 	@false
@@ -60,8 +60,8 @@ apidocs-hotfix: apidocs
 	@$(VENV_PATH)/bin/ghp-import -pf docs/_build
 .PHONY: apidocs-hotfix
 
-aws-lambda-layer-build: dist
+aws-lambda-layer: dist
 	$(VENV_PATH)/bin/pip install urllib3
 	$(VENV_PATH)/bin/pip install certifi
-	$(VENV_PATH)/bin/python -m scripts.build_awslambda_layer
-.PHONY: aws-lambda-layer-build
+	$(VENV_PATH)/bin/python -m scripts.build_aws_lambda_layer
+.PHONY: aws-lambda-layer
diff --git a/scripts/build_aws_lambda_layer.py b/scripts/build_aws_lambda_layer.py
@@ -5,9 +5,7 @@
 
 from sentry_sdk.consts import VERSION as SDK_VERSION
 
-DIST_PATH = (
-    "dist"  # created by "make dist, that is called by make aws-lambda-layer-build"
-)
+DIST_PATH = "dist"  # created by "make dist" that is called by "make aws-lambda-layer"
 PYTHON_SITE_PACKAGES = "python"  # see https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
 
 
@@ -68,7 +66,6 @@ def build_layer_dir():
         layer_builder.create_init_serverless_sdk_package()
 
     # TODO: move whole directory to a dist folder somewhere.
-    # TODO: rename file to build_aws_lambda_layer.py
 
 
 if __name__ == "__main__":
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
@@ -25,7 +25,7 @@ def build_no_code_serverless_function_and_layer(
     sdk by creating a layer containing the Python-sdk, and then creating a func
     that uses that layer
     """
-    from scripts.build_awslambda_layer import build_layer_dir
+    from scripts.build_aws_lambda_layer import build_layer_dir
 
     build_layer_dir(dest_abs_path=tmpdir)
 
