sync with upstream

.circleci/config.yml

@@ -7,6 +7,9 @@ parameters:
   ubuntu-arm64-machine-image:
     type: string
     default: "ubuntu-2204:2023.02.1"
+  PYTEST_LOGLEVEL:
+    type: string
+    default: "WARNING"
   skip_test_selection:
     type: boolean
     default: false
@@ -20,7 +23,7 @@ executors:
       image: << pipeline.parameters.ubuntu-amd64-machine-image >>
 
 commands:
-  prepare-pytest-tinybird:
+  prepare-testselection:
     steps:
       - unless:
           condition: << pipeline.parameters.skip_test_selection >>
@@ -31,6 +34,9 @@ commands:
                   if [[ -n "$CI_PULL_REQUEST" ]] ; then
                     echo "export TESTSELECTION_PYTEST_ARGS='--path-filter=target/testselection/test-selection.txt '" >> $BASH_ENV
                   fi
+
+  prepare-pytest-tinybird:
+    steps:
       - run:
           name: Setup Environment Variables
           command: |
@@ -166,6 +172,8 @@ jobs:
   acceptance-tests:
     executor: ubuntu-machine-amd64
     working_directory: /tmp/workspace/repo
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -194,9 +202,12 @@ jobs:
   itest-sfn-legacy-provider:
     executor: ubuntu-machine-amd64
     working_directory: /tmp/workspace/repo
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
     steps:
       - attach_workspace:
           at: /tmp/workspace
+      - prepare-testselection
       - prepare-pytest-tinybird
       - prepare-account-region-randomization
       - run:
@@ -220,9 +231,12 @@ jobs:
   itest-s3-v2-legacy-provider:
     executor: ubuntu-machine-amd64
     working_directory: /tmp/workspace/repo
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
     steps:
       - attach_workspace:
           at: /tmp/workspace
+      - prepare-testselection
       - prepare-pytest-tinybird
       - prepare-account-region-randomization
       - run:
@@ -246,9 +260,12 @@ jobs:
   itest-cloudwatch-v2-provider:
     executor: ubuntu-machine-amd64
     working_directory: /tmp/workspace/repo
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
     steps:
       - attach_workspace:
           at: /tmp/workspace
+      - prepare-testselection
       - prepare-pytest-tinybird
       - prepare-account-region-randomization
       - run:
@@ -269,6 +286,35 @@ jobs:
       - store_test_results:
           path: target/reports/
 
+  itest-events-v2-provider:
+    executor: ubuntu-machine-amd64
+    working_directory: /tmp/workspace/repo
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - prepare-testselection
+      - prepare-pytest-tinybird
+      - prepare-account-region-randomization
+      - run:
+          name: Test EventBridge v2 provider
+          environment:
+            PROVIDER_OVERRIDE_EVENTS: "v2"
+            TEST_PATH: "tests/aws/services/events/"
+            COVERAGE_ARGS: "-p"
+          command: |
+            COVERAGE_FILE="target/coverage/.coverage.eventsV2.${CIRCLE_NODE_INDEX}" \
+            PYTEST_ARGS="${TINYBIRD_PYTEST_ARGS}${TESTSELECTION_PYTEST_ARGS}--reruns 3 --junitxml=target/reports/events_v2.xml -o junit_suite_name='events_v2'" \
+            make test-coverage
+      - persist_to_workspace:
+          root:
+            /tmp/workspace
+          paths:
+            - repo/target/coverage/
+      - store_test_results:
+          path: target/reports/
+
   docker-build:
     parameters:
       platform:
@@ -320,7 +366,9 @@ jobs:
       image: << parameters.machine_image >>
     resource_class: << parameters.resource_class >>
     working_directory: /tmp/workspace/repo
-    parallelism: 4
+    parallelism: 5
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -343,6 +391,7 @@ jobs:
           key: common-functions-<< parameters.platform >>-{{ checksum "/tmp/common-functions-checksums" }}
           paths:
             - "tests/aws/services/lambda_/functions/common"
+      - prepare-testselection
       - prepare-pytest-tinybird
       - prepare-account-region-randomization
       - run:
@@ -376,6 +425,8 @@ jobs:
   bootstrap-tests:
     executor: ubuntu-machine-amd64
     working_directory: /tmp/workspace/repo
+    environment:
+      PYTEST_LOGLEVEL: << pipeline.parameters.PYTEST_LOGLEVEL >>
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -480,12 +531,18 @@ jobs:
       - run:
           name: Upload test metrics and implemented coverage data to tinybird
           command: |
-            source .venv/bin/activate
-            mkdir parity_metrics && mv target/metric_reports/metric-report-raw-data-*amd64*.csv parity_metrics
-            METRIC_REPORT_DIR_PATH=parity_metrics \
-            IMPLEMENTATION_COVERAGE_FILE=scripts/implementation_coverage_full.csv \
-            SOURCE_TYPE=community \
-            python -m scripts.tinybird.upload_raw_test_metrics_and_coverage
+            # check if a fork-only env var is set (https://circleci.com/docs/variables/)
+            if [ -z "$CIRCLE_PR_REPONAME" ]; then
+              source .venv/bin/activate
+              mkdir parity_metrics && mv target/metric_reports/metric-report-raw-data-*amd64*.csv parity_metrics
+              METRIC_REPORT_DIR_PATH=parity_metrics \
+              IMPLEMENTATION_COVERAGE_FILE=scripts/implementation_coverage_full.csv \
+              SOURCE_TYPE=community \
+              python -m scripts.tinybird.upload_raw_test_metrics_and_coverage
+            else
+              echo "Skipping parity reporting to tinybird (no credentials, running on fork)..."
+            fi
+
       - run:
           name: Create Coverage Diff (Code Coverage)
           # pycobertura diff will return with exit code 0-3 -> we currently expect 2 (2: the changes worsened the overall coverage),
@@ -653,6 +710,10 @@ workflows:
           requires:
             - preflight
             - test-selection
+      - itest-events-v2-provider:
+          requires:
+            - preflight
+            - test-selection
       - unit-tests:
           requires:
             - preflight
@@ -700,6 +761,7 @@ workflows:
             - itest-sfn-legacy-provider
             - itest-s3-v2-legacy-provider
             - itest-cloudwatch-v2-provider
+            - itest-events-v2-provider
             - acceptance-tests
             - docker-test-amd64
             - docker-test-arm64
@@ -713,6 +775,7 @@ workflows:
             - itest-sfn-legacy-provider
             - itest-s3-v2-legacy-provider
             - itest-cloudwatch-v2-provider
+            - itest-events-v2-provider
             - acceptance-tests
             - docker-test-amd64
             - docker-test-arm64

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -57,10 +57,21 @@ body:
     description: |
       examples:
         - **OS**: Ubuntu 20.04
-        - **LocalStack**: latest
+        - **LocalStack**:
+          You can find this information in the logs when starting localstack
+
+          LocalStack version: 3.4.1.dev
+          LocalStack Docker image sha: sha256:f02ab8ef73f66b0ab26bb3d24a165e1066a714355f79a42bf8aa1a336d5722e7
+          LocalStack build date: 2024-05-14
+          LocalStack build git hash: ecd7dc879
+
     value: |
         - OS:
         - LocalStack:
+          LocalStack version:
+          LocalStack Docker image sha:
+          LocalStack build date:
+          LocalStack build git hash:
     render: markdown
   validations:
     required: false

.github/ISSUE_TEMPLATE/enhancement-request.yml → .github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,7 +1,7 @@
-name: ✨ Enhancement request
-description: Request a new enhancement
-title: "enhancement request: <title>"
-labels: ["type: enhancement", "status: triage needed"]
+name: ✨ Feature request
+description: Request a new feature
+title: "feature request: <title>"
+labels: ["type: feature", "status: triage needed"]
 body:
 - type: markdown
   attributes:
@@ -10,20 +10,20 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the enhancement you are requesting.
+    description: Please search to see if an issue already exists for the feature you are requesting.
     options:
     - label: I have searched the existing issues
       required: true
 - type: textarea
   attributes:
-    label: Enhancement description
-    description: Please describe the enhancement you would like LocalStack to have
+    label: Feature description
+    description: Please describe the feature you would like LocalStack to have
   validations:
     required: true
 - type: textarea
   attributes:
     label: 🧑‍💻 Implementation
-    description: If you are a developer and have an idea how to implement this enhancement, please sketch it out here.
+    description: If you are a developer and have an idea how to implement this feature, please sketch it out here.
   validations:
     required: false
 - type: textarea

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,25 +1,24 @@
-<!-- Please refer to the contribution guidelines before raising a PR: https://github.com/localstack/localstack/blob/master/CONTRIBUTING.md -->
+<!-- Please refer to the contribution guidelines before raising a PR: https://github.com/localstack/localstack/blob/master/docs/CONTRIBUTING.md -->
 
 <!-- Why am I raising this PR? Add context such as related issues, PRs, or documentation. -->
 ## Motivation
 
 
-<!-- What notable changes does this PR make? -->
+<!-- What changes does this PR make? How does LocalStack behave differently now? -->
 ## Changes
 
-
-<!-- The following sections are optional, but can be useful! 
-
+<!-- Optional section: How to test these changes? -->
+<!--
 ## Testing
 
-Description of how to test the changes
+-->
 
+<!-- Optional section: What's left to do before it can be merged? -->
+<!--
 ## TODO
 
 What's left to do:
 
 - [ ] ...
 - [ ] ...
-
 -->
-

.github/workflows/asf-updates.yml

@@ -48,7 +48,7 @@ jobs:
         run: |
           source .venv/bin/activate
           # explicitly perform an unsafe fix to remove unused imports in the generated ASF APIs
-          ruff check --select F401 --unsafe-fixes --fix . --config "lint.ignore-init-module-imports = false"
+          ruff check --select F401 --unsafe-fixes --fix . --config "lint.preview = true"
           make format-modified
 
       - name: Check for changes
@@ -66,23 +66,30 @@ jobs:
           echo "$(git diff --name-only origin/master localstack/aws/api/ | sed 's#localstack/aws/api/#- #g' | sed 's#/__init__.py##g' | sed 's/_/-/g')" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Update botocore pin
+      - name: Update botocore and transitive pins
         # only update the pin if we have updates in the ASF code
         if: ${{ success() && steps.check-for-changes.outputs.diff-count != '0' && steps.check-for-changes.outputs.diff-count != '' }}
         run: |
           source .venv/bin/activate
           # determine botocore version in venv
           BOTOCORE_VERSION=$(python -c "import botocore; print(botocore.__version__)");
-          echo "Pinning botocore to version $BOTOCORE_VERSION"
+          echo "Pinning botocore, boto3, and boto3-stubs to version $BOTOCORE_VERSION"
           bin/release-helper.sh set-dep-ver botocore "==$BOTOCORE_VERSION"
+          bin/release-helper.sh set-dep-ver boto3 "==$BOTOCORE_VERSION"
+          bin/release-helper.sh set-dep-ver boto3-stubs "==$BOTOCORE_VERSION"
+
+          # aws-cli is two minor versions behind botocore
+          AWSCLI_VERSION=$(python -c 'import botocore; from packaging.version import Version; version = Version(botocore.__version__); print(f"{version.major}.{version.minor - 2}.{version.micro}")')
+          echo "Pinning aws-cli to version $AWSCLI_VERSION"
+          bin/release-helper.sh set-dep-ver awscli "==$AWSCLI_VERSION"
 
           # upgrade the requirements files only for the botocore package
           pip install pip-tools
-          pip-compile --upgrade-package botocore --upgrade-package boto3 --extra base-runtime -o requirements-base-runtime.txt pyproject.toml
-          pip-compile --upgrade-package botocore --upgrade-package boto3 --upgrade-package awscli --extra runtime -o requirements-runtime.txt pyproject.toml
-          pip-compile --upgrade-package botocore --upgrade-package boto3 --upgrade-package awscli --extra test -o requirements-test.txt pyproject.toml
-          pip-compile --upgrade-package botocore --upgrade-package boto3 --upgrade-package awscli --extra dev -o requirements-dev.txt pyproject.toml
-          pip-compile --upgrade-package botocore --upgrade-package boto3 --upgrade-package awscli --extra typehint -o requirements-typehint.txt pyproject.toml
+          pip-compile --strip-extras --upgrade-package "botocore==$BOTOCORE_VERSION" --upgrade-package "boto3==$BOTOCORE_VERSION" --extra base-runtime -o requirements-base-runtime.txt pyproject.toml
+          pip-compile --strip-extras --upgrade-package "botocore==$BOTOCORE_VERSION" --upgrade-package "boto3==$BOTOCORE_VERSION" --upgrade-package "awscli==$AWSCLI_VERSION" --extra runtime -o requirements-runtime.txt pyproject.toml
+          pip-compile --strip-extras --upgrade-package "botocore==$BOTOCORE_VERSION" --upgrade-package "boto3==$BOTOCORE_VERSION" --upgrade-package "awscli==$AWSCLI_VERSION" --extra test -o requirements-test.txt pyproject.toml
+          pip-compile --strip-extras --upgrade-package "botocore==$BOTOCORE_VERSION" --upgrade-package "boto3==$BOTOCORE_VERSION" --upgrade-package "awscli==$AWSCLI_VERSION" --extra dev -o requirements-dev.txt pyproject.toml
+          pip-compile --strip-extras --upgrade-package "botocore==$BOTOCORE_VERSION" --upgrade-package "boto3==$BOTOCORE_VERSION" --upgrade-package "awscli==$AWSCLI_VERSION" --upgrade-package "boto3-stubs==$BOTOCORE_VERSION" --extra typehint -o requirements-typehint.txt pyproject.toml
 
       - name: Read PR markdown template
         if: ${{ success() && steps.check-for-changes.outputs.diff-count != '0' && steps.check-for-changes.outputs.diff-count != '' }}

.github/workflows/marker-report-issue.yml

@@ -41,7 +41,7 @@ jobs:
         # makes use of the marker report plugin localstack.testing.pytest.marker_report
       - name: Generate marker report
         env:
-          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -s --co --disable-warnings --marker-report --marker-report-path './target'"
+          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -s --co --disable-warnings --marker-report --marker-report-path './target'"
           MARKER_REPORT_PROJECT_NAME: localstack
           MARKER_REPORT_COMMIT_SHA: ${{ github.sha }}
         run: |

.github/workflows/marker-report.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Collect marker report
         env:
-          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -s --co --disable-warnings --marker-report --marker-report-tinybird-upload"
+          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -s --co --disable-warnings --marker-report --marker-report-tinybird-upload"
           MARKER_REPORT_PROJECT_NAME: localstack
           MARKER_REPORT_TINYBIRD_TOKEN: ${{ secrets.MARKER_REPORT_TINYBIRD_TOKEN }}
           MARKER_REPORT_COMMIT_SHA: ${{ github.sha }}

.github/workflows/pr-cla.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: "(github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'"
-        uses: "cla-assistant/github-action@v2.1.3-beta"
+        uses: "cla-assistant/github-action@v2.4.0"
         env:
           GITHUB_TOKEN: "${{ secrets.PRO_ACCESS_TOKEN }}"
           PERSONAL_ACCESS_TOKEN: "${{ secrets.PRO_ACCESS_TOKEN }}"