minor fix in build config

Author: whummer

aws-proxy/Makefile

@@ -10,6 +10,7 @@ usage:          ## Show this help
 
 install:        ## Install dependencies
 	test -d .venv || $(VENV_BIN) .venv
+	$(VENV_RUN); pip install -e .
 	$(VENV_RUN); pip install -e .[test]
 	touch $(VENV_DIR)/bin/activate
 
@@ -25,18 +26,18 @@ format:				## Run ruff to format the whole codebase
 lint:				## Run code linter to check code style
 	($(VENV_RUN); python -m ruff check --output-format=full . && python -m ruff format --check .)
 
-test: venv          ## Run tests
+test:               ## Run tests
 	$(VENV_RUN); python -m pytest $(PYTEST_ARGS) $(TEST_PATH)
 
-dist: venv          ## Create distribution package
-	$(VENV_RUN); python setup.py sdist bdist_wheel
+entrypoints:        ## Generate plugin entrypoints for Python package
+	$(VENV_RUN); python -m plux entrypoints
 
-build:              ## Build the extension
-	mkdir -p build
-	cp -r setup.py setup.cfg README.md aws_proxy build/
-	(cd build && python setup.py sdist)
+build: entrypoints  ## Build the extension
+	$(VENV_RUN); python -m build --no-isolation . --outdir build
+	@# make sure that the entrypoints are contained in the dist folder and are non-empty
+	@test -s localstack_extension_aws_proxy.egg-info/entry_points.txt || (echo "Entrypoints were not correctly created! Aborting!" && exit 1)
 
-enable: $(wildcard ./build/dist/localstack_extension_aws_proxy-*.tar.gz)  ## Enable the extension in LocalStack
+enable: $(wildcard ./build/localstack_extension_aws_proxy-*.tar.gz)  ## Enable the extension in LocalStack
 	$(VENV_RUN); \
 		pip uninstall --yes localstack-extension-aws-proxy; \
 		localstack extensions -v install file://$?

aws-proxy/aws_proxy/client/auth_proxy.py

@@ -46,8 +46,6 @@
 from aws_proxy.shared.constants import HEADER_HOST_ORIGINAL
 from aws_proxy.shared.models import AddProxyRequest, ProxyConfig
 
-from .http2_server import run_server
-
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.INFO)
 if localstack_config.DEBUG:
@@ -73,6 +71,9 @@ def __init__(self, config: ProxyConfig, port: int = None):
         super().__init__(port=port)
 
     def do_run(self):
+        # note: keep import here, to avoid runtime errors
+        from .http2_server import run_server
+
         self.register_in_instance()
         bind_host = self.config.get("bind_host") or DEFAULT_BIND_HOST
         proxy = run_server(

aws-proxy/aws_proxy/server/request_handler.py

@@ -6,7 +6,6 @@
 from typing import Dict, List
 
 import yaml
-from flask import redirect
 from localstack.constants import (
     APPLICATION_OCTET_STREAM,
     INTERNAL_RESOURCE_PATH,
@@ -77,10 +76,14 @@ def set_status(self, request: Request, **kwargs):
 
     @route("/", methods=["GET"], host=ROUTE_HOST)
     def forward_from_root(self, request: Request, **kwargs):
+        from flask import redirect
+
         return redirect(f"{INTERNAL_RESOURCE_PATH}/aws-proxy/index.html")
 
     @route(f"{INTERNAL_RESOURCE_PATH}/aws-proxy", methods=["GET"])
     def forward_from_extension_root(self, request: Request, **kwargs):
+        from flask import redirect
+
         return redirect(f"{INTERNAL_RESOURCE_PATH}/aws-proxy/index.html")
 
     @route("/favicon.png", methods=["GET"], host=ROUTE_HOST)

aws-proxy/pyproject.toml

@@ -13,14 +13,25 @@ authors = [
 ]
 
 dependencies = [
-    "localstack-ext"
+    "localstack"
 ]
 
 [project.optional-dependencies]
 test=[
+    # couple of dependencies required to import localstack test tools
+    "boto3",
+    "localstack-core[base-runtime]>4.9",
+    "moto-ext",
+    "rolo>=0.7",
+    # pytest and other test utils
+    "hypercorn",
     "pytest",
     "pytest-httpserver",
-    "ruff"
+    "ruff",
+    # build tools
+    "setuptools",
+    "setuptools_scm",
+    "wheel"
 ]
 
 

aws-proxy/tests/conftest.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 from localstack.testing.aws.util import (
     base_aws_client_factory,
@@ -15,6 +17,9 @@
 # binding proxy to 0.0.0.0 to enable testing in CI
 PROXY_BIND_HOST = "0.0.0.0"
 
+# run tests in us-east-1 region by default
+os.environ.setdefault("AWS_DEFAULT_REGION", "us-east-1")
+
 
 @pytest.fixture(scope="session")
 def aws_session():

aws-proxy/tests/proxy/test_secrets_manager.py

@@ -1,3 +1,33 @@
-def test_secretsmanager_requests(start_aws_proxy):
-    # TODO implement
-    pass
+import boto3
+from localstack.aws.connect import connect_to
+
+from aws_proxy.shared.models import ProxyConfig
+from localstack.utils.strings import short_uid
+
+
+def test_proxy_create_secret(start_aws_proxy, cleanups):
+    # start proxy
+    config = ProxyConfig(services={"secretsmanager": {"resources": ".*"}})
+    start_aws_proxy(config)
+
+    # create clients
+    sm_client = connect_to().secretsmanager
+    sm_client_aws = boto3.client("secretsmanager")
+
+    # list buckets to assert that proxy is up and running
+    secrets_proxied = sm_client.list_secrets()["SecretList"]
+    secrets_aws = sm_client_aws.list_secrets()["SecretList"]
+    assert secrets_proxied == secrets_aws
+
+    # create secret in AWS
+    secret_name = f"s_{short_uid()}"
+    result = sm_client_aws.create_secret(Name=secret_name, SecretString="test")
+    secret_id = result["ARN"]
+    cleanups.append(lambda: sm_client_aws.delete_secret(SecretId=secret_id))
+
+    # assert that the secret can be retrieved via the proxy
+    secret_details = sm_client.describe_secret(SecretId=secret_id)
+    secret_details_aws = sm_client.describe_secret(SecretId=secret_id)
+    secret_details.pop("ResponseMetadata")
+    secret_details_aws.pop("ResponseMetadata")
+    assert secret_details == secret_details_aws