localstack-core 4.13.1__tar.gz → 4.13.1.dev2__tar.gz

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/CODEOWNERS

@@ -207,10 +207,10 @@
 /tests/aws/services/route53resolver/ @macnev2013 @sannya-singal
 
 # s3
-/localstack-core/localstack/aws/api/s3/ @bentsku @k-a-il @aidehn
-/localstack-core/localstack/services/s3/ @bentsku @k-a-il @aidehn
-/tests/aws/services/s3/ @bentsku @k-a-il @aidehn
-/tests/unit/services/s3/ @bentsku @k-a-il @aidehn
+/localstack-core/localstack/aws/api/s3/ @bentsku @k-a-il
+/localstack-core/localstack/services/s3/ @bentsku @k-a-il
+/tests/aws/services/s3/ @bentsku @k-a-il
+/tests/unit/services/s3/ @bentsku @k-a-il
 
 # s3control
 /localstack-core/localstack/aws/api/s3control/ @bentsku

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/Dockerfile

@@ -129,7 +129,7 @@ COPY --from=builder /opt/code/localstack/.venv /opt/code/localstack/.venv
 ARG LOCALSTACK_BUILD_VERSION
 
 # add project files necessary to install all dependencies
-ADD Makefile pyproject.toml plux.ini ./
+ADD Makefile pyproject.toml ./
 # add the localstack start scripts (necessary for the installation of the runtime dependencies, i.e. `pip install -e .`)
 ADD bin/localstack bin/localstack.bat bin/localstack-supervisor bin/
 
@@ -142,6 +142,10 @@ RUN --mount=type=cache,target=/root/.cache \
     SETUPTOOLS_SCM_PRETEND_VERSION_FOR_LOCALSTACK_CORE=${LOCALSTACK_BUILD_VERSION} \
     pip install -e .[runtime]
 
+# Generate the plugin entrypoints
+RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_LOCALSTACK_CORE=${LOCALSTACK_BUILD_VERSION} \
+    make entrypoints
+
 # Generate service catalog cache in static libs dir
 RUN . .venv/bin/activate && python3 -m localstack.aws.spec
 

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/Dockerfile.s3

@@ -76,7 +76,7 @@ COPY --from=builder /opt/code/localstack/.venv /opt/code/localstack/.venv
 ARG LOCALSTACK_BUILD_VERSION
 
 # add project files necessary to install all dependencies
-ADD Makefile pyproject.toml plux.ini requirements-base-runtime.txt ./
+ADD Makefile pyproject.toml requirements-base-runtime.txt ./
 # add the localstack start scripts (necessary for the installation of the runtime dependencies, i.e. `pip install -e .`)
 ADD bin/localstack bin/localstack.bat bin/localstack-supervisor bin/
 
@@ -89,6 +89,10 @@ RUN --mount=type=cache,target=/root/.cache \
     SETUPTOOLS_SCM_PRETEND_VERSION_FOR_LOCALSTACK_CORE=${LOCALSTACK_BUILD_VERSION} \
     pip install -e .[base-runtime]
 
+# Generate the plugin entrypoints
+RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_LOCALSTACK_CORE=${LOCALSTACK_BUILD_VERSION} \
+    make entrypoints
+
 # Generate service catalog cache in static libs dir
 RUN . .venv/bin/activate && python3 -m localstack.aws.spec
 

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/Makefile

@@ -27,7 +27,7 @@ usage:                    ## Show this help
 
 $(VENV_ACTIVATE): pyproject.toml
 	test -d $(VENV_DIR) || $(VENV_BIN) $(VENV_DIR)
-	$(VENV_RUN); $(PIP_CMD) install --upgrade pip setuptools wheel
+	$(VENV_RUN); $(PIP_CMD) install --upgrade pip setuptools wheel plux
 	touch $(VENV_ACTIVATE)
 
 venv: $(VENV_ACTIVATE)    ## Create a new (empty) virtual environment
@@ -36,8 +36,7 @@ freeze:                   ## Run pip freeze -l in the virtual environment
 	@$(VENV_RUN); pip freeze -l
 
 upgrade-pinned-dependencies: venv
-	# TODO: Avoid pip 26.0 for now due to https://github.com/jazzband/pip-tools/issues/2319
-	$(VENV_RUN); $(PIP_CMD) install --upgrade "pip!=26.0" pip-tools pre-commit
+	$(VENV_RUN); $(PIP_CMD) install --upgrade pip pip-tools pre-commit
 	$(VENV_RUN); pip-compile --strip-extras --upgrade -o requirements-basic.txt pyproject.toml
 	$(VENV_RUN); pip-compile --strip-extras --upgrade --extra runtime -o requirements-runtime.txt pyproject.toml
 	$(VENV_RUN); pip-compile --strip-extras --upgrade --extra test -o requirements-test.txt pyproject.toml
@@ -70,14 +69,14 @@ install-s3: venv     ## Install dependencies for the localstack runtime for s3-o
 	$(VENV_RUN); $(PIP_CMD) install -r requirements-base-runtime.txt
 	$(VENV_RUN); $(PIP_CMD) install $(PIP_OPTS) -e ".[base-runtime]"
 
-install: install-dev      ## Install full dependencies into venv
+install: install-dev entrypoints  ## Install full dependencies into venv
 
-entrypoints: install-dev
-	$(VENV_RUN); python -m plux entrypoints
-	@# make sure that the plux.ini file with the entrypoints has correctly been created
-	@test -s plux.ini || (echo "Entrypoints were not correctly created! Aborting!" && exit 1)
+entrypoints:              ## Run plux to build entry points
+	$(VENV_RUN); python3 -c "from setuptools import setup; setup()" plugins egg_info
+	@# make sure that the entrypoints were correctly created and are non-empty
+	@test -s localstack-core/localstack_core.egg-info/entry_points.txt || (echo "Entrypoints were not correctly created! Aborting!" && exit 1)
 
-dist:                     ## Build source and built (wheel) distributions of the current version
+dist: entrypoints        ## Build source and built (wheel) distributions of the current version
 	$(VENV_RUN); pip install --upgrade build twine; python -m build
 
 publish: clean-dist dist  ## Publish the library to the central PyPi repository

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.1
+Version: 4.13.1.dev2
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0
@@ -21,7 +21,7 @@ Requires-Dist: cachetools>=5.0
 Requires-Dist: cryptography
 Requires-Dist: dnslib>=0.9.10
 Requires-Dist: dnspython>=1.16.0
-Requires-Dist: plux>=1.14.0
+Requires-Dist: plux>=1.10
 Requires-Dist: psutil>=5.4.8
 Requires-Dist: python-dotenv>=0.19.1
 Requires-Dist: pyyaml>=5.1

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/localstack-core/localstack/services/cloudformation/scaffolding/__main__.py

@@ -922,7 +922,7 @@ def generate(
         )
     console.print("\nWondering where to get started?")
     console.print(
-        "First run `make entrypoints` to update the plux.ini file with your new resource provider plugin."
+        "First run `make entrypoints` to make sure your resource provider plugin is actually registered."
     )
     console.print(
         'Then start off by finalizing the generated minimal ("basic") template and get it to deploy against AWS.'

{localstack_core-4.13.1 → localstack_core-4.13.1.dev2}/localstack-core/localstack/services/lambda_/resource_providers/aws_lambda_function.py

@@ -2,18 +2,17 @@
 from __future__ import annotations
 
 import os
+from pathlib import Path
 from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
     OperationStatus,
     ProgressEvent,
+    ResourceProvider,
     ResourceRequest,
 )
 from localstack.services.lambda_.lambda_utils import get_handler_file_from_name
-from localstack.services.lambda_.resource_providers.generated.aws_lambda_function_base import (
-    LambdaFunctionProviderBase,
-)
 from localstack.utils.archives import is_zip_file
 from localstack.utils.files import mkdir, new_tmp_dir, rm_rf, save_file
 from localstack.utils.strings import is_base64, to_bytes
@@ -318,7 +317,10 @@ def _transform_function_to_model(function):
     return response_model
 
 
-class LambdaFunctionProvider(LambdaFunctionProviderBase):
+class LambdaFunctionProvider(ResourceProvider[LambdaFunctionProperties]):
+    TYPE = "AWS::Lambda::Function"  # Autogenerated. Don't change
+    SCHEMA = util.get_schema_path(Path(__file__))  # Autogenerated. Don't change
+
     def create(
         self,
         request: ResourceRequest[LambdaFunctionProperties],
@@ -335,8 +337,6 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
 
         Create-only properties:
           - /properties/FunctionName
-          - /properties/PackageType
-          - /properties/TenancyConfig
 
         Read-only properties:
           - /properties/Arn
@@ -366,10 +366,10 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
           - lambda:PutRuntimeManagementConfig
           - lambda:TagResource
           - lambda:GetPolicy
-          - lambda:PutFunctionRecursionConfig
-          - lambda:GetFunctionRecursionConfig
-          - lambda:PutFunctionScalingConfig
-          - lambda:PassCapacityProvider
+          - lambda:AddPermission
+          - lambda:RemovePermission
+          - lambda:GetResourcePolicy
+          - lambda:PutResourcePolicy
 
         """
         model = request.desired_state
@@ -480,9 +480,6 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
         IAM permissions required:
           - lambda:GetFunction
           - lambda:GetFunctionCodeSigningConfig
-          - lambda:GetFunctionRecursionConfig
-          - lambda:GetRuntimeManagementConfig
-          - lambda:GetFunctionScalingConfig
         """
         function_name = request.desired_state["FunctionName"]
         lambda_client = request.aws_client_factory.lambda_
@@ -502,7 +499,6 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
 
         IAM permissions required:
           - lambda:DeleteFunction
-          - lambda:GetFunction
           - ec2:DescribeNetworkInterfaces
         """
         try:
@@ -524,6 +520,7 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
           - lambda:DeleteFunctionConcurrency
           - lambda:GetFunction
           - lambda:PutFunctionConcurrency
+          - lambda:ListTags
           - lambda:TagResource
           - lambda:UntagResource
           - lambda:UpdateFunctionConfiguration
@@ -544,11 +541,12 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
           - lambda:DeleteFunctionCodeSigningConfig
           - lambda:GetCodeSigningConfig
           - lambda:GetFunctionCodeSigningConfig
-          - lambda:PutFunctionRecursionConfig
-          - lambda:GetFunctionRecursionConfig
-          - lambda:PutFunctionScalingConfig
-          - lambda:PublishVersion
-          - lambda:PassCapacityProvider
+          - lambda:GetPolicy
+          - lambda:AddPermission
+          - lambda:RemovePermission
+          - lambda:GetResourcePolicy
+          - lambda:PutResourcePolicy
+          - lambda:DeleteResourcePolicy
         """
         client = request.aws_client_factory.lambda_
 
@@ -612,11 +610,6 @@ class LambdaFunctionProvider(LambdaFunctionProviderBase):
         self,
         request: ResourceRequest[LambdaFunctionProperties],
     ) -> ProgressEvent[LambdaFunctionProperties]:
-        """
-        List available resources of this type
-        IAM permissions required:
-          - lambda:ListFunctions
-        """
         functions = request.aws_client_factory.lambda_.list_functions()
         return ProgressEvent(
             status=OperationStatus.SUCCESS,