Thanks to visit codestin.com
Credit goes to github.com

Skip to content

replace CircleCI job for S3 stream to v3 and remove stream provider #9043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,17 @@ jobs:
- store_test_results:
path: target/reports/

itest-s3-stream-provider:
itest-s3-v3-provider:
executor: ubuntu-machine-amd64
working_directory: /tmp/workspace/repo
steps:
- attach_workspace:
at: /tmp/workspace
- prepare-pytest-tinybird
- run:
name: Test S3 Streaming provider
name: Test S3 v3 provider
environment:
PROVIDER_OVERRIDE_S3: "stream"
PROVIDER_OVERRIDE_S3: "v3"
TEST_PATH: "tests/aws/services/s3/"
COVERAGE_ARGS: "-p"
command: |
Expand Down Expand Up @@ -485,7 +485,7 @@ workflows:
- itest-sfn-v2-provider:
requires:
- preflight
- itest-s3-stream-provider:
- itest-s3-v3-provider:
requires:
- preflight
- unit-tests:
Expand Down Expand Up @@ -532,6 +532,7 @@ workflows:
requires:
- itest-lambda-legacy-local
- itest-sfn-v2-provider
- itest-s3-v3-provider
- acceptance-tests
- docker-test-amd64
- docker-test-arm64
Expand All @@ -544,6 +545,7 @@ workflows:
requires:
- itest-lambda-legacy-local
- itest-sfn-v2-provider
- itest-s3-v3-provider
- acceptance-tests
- docker-test-amd64
- docker-test-arm64
Expand Down
7 changes: 2 additions & 5 deletions localstack/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,11 +427,8 @@ def in_docker():
# whether legacy s3 is enabled
LEGACY_S3_PROVIDER = os.environ.get("PROVIDER_OVERRIDE_S3", "") == "legacy"

# whether the S3 streaming provider is enabled (beware, it breaks persistence for now)
STREAM_S3_PROVIDER = os.environ.get("PROVIDER_OVERRIDE_S3", "") == "stream"

# whether the S3 native provider is enabled (beware, it breaks persistence for now)
NATIVE_S3_PROVIDER = os.environ.get("PROVIDER_OVERRIDE_S3", "") == "v3"
# whether the S3 native provider is enabled
NATIVE_S3_PROVIDER = os.environ.get("PROVIDER_OVERRIDE_S3", "") in ("v3", "stream")

# Whether to report internal failures as 500 or 501 errors.
FAIL_FAST = is_env_true("FAIL_FAST")
Expand Down
6 changes: 3 additions & 3 deletions localstack/services/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,10 @@ def s3_v2():

@aws_provider(api="s3", name="stream")
def s3_stream():
from localstack.services.s3.provider_stream import S3ProviderStream
from localstack.services.s3.v3.provider import S3Provider

provider = S3ProviderStream()
return Service.for_provider(provider, dispatch_table_factory=MotoFallbackDispatcher)
provider = S3Provider()
return Service.for_provider(provider)


@aws_provider(api="s3", name="v3")
Expand Down
Loading