wellapi 0.3.7__tar.gz → 0.3.8__tar.gz

{wellapi-0.3.7 → wellapi-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wellapi
-Version: 0.3.7
+Version: 0.3.8
 Summary: A simple web framework for aws lambda
 Author-email: romayuhym <romayuhym@gmail.com>
 Requires-Python: >=3.12

{wellapi-0.3.7 → wellapi-0.3.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wellapi"
-version = "0.3.7"
+version = "0.3.8"
 description = "A simple web framework for aws lambda"
 readme = "README.md"
 authors = [

{wellapi-0.3.7 → wellapi-0.3.8}/src/wellapi/build/cdk.py

@@ -52,7 +52,20 @@ class WellApiCDK(Construct):
         self.app_srt = app_srt
         self.handlers_dir = os.path.abspath(handlers_dir)
 
-        wellapi_app: WellApi = self._package_app(cors=cors)
+        api_role = iam.Role(
+            self,
+            "ApiRole",
+            assumed_by=iam.ServicePrincipal("apigateway.amazonaws.com"),
+            role_name="ApiRole",
+        )
+        api_role.add_to_policy(
+            iam.PolicyStatement(
+                actions=["lambda:InvokeFunction"],
+                resources=["*"],
+            )
+        )
+
+        wellapi_app: WellApi = self._package_app(cors=cors, api_role_arn=api_role.role_arn)
 
         self._create_api(wellapi_app, cache_enable=cache_enable, log_enable=log_enable)
 
@@ -70,6 +83,16 @@ class WellApiCDK(Construct):
         ]
         code_layer = _lambda.Code.from_asset(APP_LAYOUT_FILE)
 
+        lambda_role = iam.Role(
+            self,
+            "LambdaRole",
+            assumed_by=iam.ServicePrincipal("lambda.amazonaws.com"),
+            managed_policies=[
+                iam.ManagedPolicy.from_aws_managed_policy_name("service-role/AWSLambdaBasicExecutionRole"),
+                iam.ManagedPolicy.from_aws_managed_policy_name("service-role/AWSLambdaVPCAccessExecutionRole"),
+            ],
+        )
+
         lmbd: Lambda
         for lmbd in wellapi_app.lambdas:
             lambda_function = _lambda.Function(
@@ -86,6 +109,7 @@ class WellApiCDK(Construct):
                 vpc_subnets=vpc_subnets,
                 security_groups=sg,
                 environment=environment,
+                role=lambda_role
             )
 
             if lmbd.type_ == "endpoint":
@@ -218,7 +242,7 @@ class WellApiCDK(Construct):
         )
         self.usage_plan.add_api_key(self.api_key)
 
-    def _package_app(self, cors: bool = False) -> WellApi:
+    def _package_app(self, cors: bool = False, api_role_arn: str | None = None) -> WellApi:
         wellapi_app = import_app(self.app_srt)
         load_handlers(self.handlers_dir)
 
@@ -231,6 +255,7 @@ class WellApiCDK(Construct):
             tags=wellapi_app.openapi_tags,
             servers=wellapi_app.servers,
             cors=cors,
+            api_role_arn=api_role_arn,
         )
         with open(OPENAPI_FILE, "w") as f:
             json.dump(resp, f)

{wellapi-0.3.7 → wellapi-0.3.8}/src/wellapi/openapi/utils.py

@@ -146,6 +146,7 @@ def get_openapi(
     license_info: dict[str, str | Any] | None = None,
     separate_input_output_schemas: bool = True,
     cors: bool = False,
+    api_role_arn: str | None = None
 ) -> dict[str, Any]:
     info: dict[str, Any] = {"title": title, "version": version}
     if description:
@@ -184,6 +185,7 @@ def get_openapi(
             field_mapping=field_mapping,
             separate_input_output_schemas=separate_input_output_schemas,
             cors=cors,
+            api_role_arn=api_role_arn,
         )
         if result:
             path, security_schemes, path_definitions = result
@@ -266,6 +268,7 @@ def get_openapi_path(
     ],
     separate_input_output_schemas: bool = True,
     cors: bool = False,
+    api_role_arn: str | None = None
 ) -> tuple[dict[str, Any], dict[str, Any], dict[str, Any]]:
     path = {}
     security_schemes: dict[str, Any] = {}
@@ -276,7 +279,7 @@ def get_openapi_path(
         current_response_class = route.response_class
     assert current_response_class, "A response class is needed to generate OpenAPI"
     route_response_media_type = "application/json"
-    operation = get_openapi_operation_metadata(route=route, operation_ids=operation_ids)
+    operation = get_openapi_operation_metadata(route=route, operation_ids=operation_ids, api_role_arn=api_role_arn)
     parameters: list[dict[str, Any]] = []
     flat_dependant = get_flat_dependant(route.dependant, skip_repeats=True)
     security_definitions, operation_security = get_openapi_security_definitions(
@@ -441,7 +444,7 @@ def get_openapi_path(
 
 
 def get_openapi_operation_metadata(
-    *, route: Lambda, operation_ids: set[str]
+    *, route: Lambda, operation_ids: set[str], api_role_arn: str | None = None
 ) -> dict[str, Any]:
     operation: dict[str, Any] = {}
     if route.tags:
@@ -468,8 +471,10 @@ def get_openapi_operation_metadata(
         "uri": {
             "Fn::Sub": f"arn:aws:apigateway:${{AWS::Region}}:lambda:path/2015-03-31/functions/${{{route.arn}Function.Arn}}/invocations"
         },
+        "passthroughBehavior": "when_no_match",
         "httpMethod": "POST",
         "type": "aws_proxy",
+        "credentials": api_role_arn,
     }
 
     return operation

{wellapi-0.3.7 → wellapi-0.3.8}/src/wellapi/utils.py

@@ -35,3 +35,4 @@ def load_handlers(handlers_dir: str):
             importlib.import_module(module_name)
         except ImportError as e:
             print(f"Помилка імпорту {module_name}: {e}")
+            raise e

{wellapi-0.3.7 → wellapi-0.3.8}/uv.lock

@@ -328,7 +328,7 @@ wheels = [
 
 [[package]]
 name = "wellapi"
-version = "0.3.7"
+version = "0.3.8"
 source = { editable = "." }
 dependencies = [
     { name = "email-validator" },