Skip to content

Commit f7037ee

Browse files
bentskudominikschubert
bentsku
authored and
dominikschubert
committed
remove s3 legacy provider (#11746)
1 parent 3de5aa9 commit f7037ee

22 files changed

+13
-3555
lines changed

‎CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@
199199
/localstack-core/localstack/services/s3/ @bentsku
200200
/tests/aws/services/s3/ @bentsku
201201
/tests/unit/test_s3.py @bentsku
202-
/tests/unit/services/s3/ @bentsku
203202

204203
# scheduler
205204
/localstack-core/localstack/aws/api/scheduler/ @joe4dev

‎localstack-core/localstack/aws/protocol/parser.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
from werkzeug.exceptions import BadRequest, NotFound
8989

9090
from localstack.aws.protocol.op_router import RestServiceOperationRouter
91-
from localstack.config import LEGACY_V2_S3_PROVIDER
9291
from localstack.http import Request
9392

9493

@@ -1074,11 +1073,8 @@ def _is_vhost_address_get_bucket(request: Request) -> str | None:
10741073

10751074
@_handle_exceptions
10761075
def parse(self, request: Request) -> Tuple[OperationModel, Any]:
1077-
if not LEGACY_V2_S3_PROVIDER:
1078-
"""Handle virtual-host-addressing for S3."""
1079-
with self.VirtualHostRewriter(request):
1080-
return super().parse(request)
1081-
else:
1076+
"""Handle virtual-host-addressing for S3."""
1077+
with self.VirtualHostRewriter(request):
10821078
return super().parse(request)
10831079

10841080
def _parse_shape(

‎localstack-core/localstack/config.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,6 @@ def in_docker():
454454
# whether to assume http or https for `get_protocol`
455455
USE_SSL = is_env_true("USE_SSL")
456456

457-
# whether the S3 legacy V2/ASF provider is enabled
458-
LEGACY_V2_S3_PROVIDER = os.environ.get("PROVIDER_OVERRIDE_S3", "") in ("v2", "legacy_v2", "asf")
459-
460457
# Whether to report internal failures as 500 or 501 errors.
461458
FAIL_FAST = is_env_true("FAIL_FAST")
462459

‎localstack-core/localstack/services/providers.py

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -248,57 +248,14 @@ def route53resolver():
248248
return Service.for_provider(provider, dispatch_table_factory=MotoFallbackDispatcher)
249249

250250

251-
@aws_provider(api="s3", name="asf")
252-
def s3_asf():
253-
from localstack.services.moto import MotoFallbackDispatcher
254-
from localstack.services.s3.legacy.provider import S3Provider
255-
256-
provider = S3Provider()
257-
return Service.for_provider(provider, dispatch_table_factory=MotoFallbackDispatcher)
258-
259-
260-
@aws_provider(api="s3", name="v2")
261-
def s3_v2():
262-
from localstack.services.moto import MotoFallbackDispatcher
263-
from localstack.services.s3.legacy.provider import S3Provider
264-
265-
provider = S3Provider()
266-
return Service.for_provider(provider, dispatch_table_factory=MotoFallbackDispatcher)
267-
268-
269-
@aws_provider(api="s3", name="legacy_v2")
270-
def s3_legacy_v2():
271-
from localstack.services.moto import MotoFallbackDispatcher
272-
from localstack.services.s3.legacy.provider import S3Provider
273-
274-
provider = S3Provider()
275-
return Service.for_provider(provider, dispatch_table_factory=MotoFallbackDispatcher)
276-
277-
278-
@aws_provider(api="s3", name="default")
251+
@aws_provider()
279252
def s3():
280253
from localstack.services.s3.provider import S3Provider
281254

282255
provider = S3Provider()
283256
return Service.for_provider(provider)
284257

285258

286-
@aws_provider(api="s3", name="stream")
287-
def s3_stream():
288-
from localstack.services.s3.provider import S3Provider
289-
290-
provider = S3Provider()
291-
return Service.for_provider(provider)
292-
293-
294-
@aws_provider(api="s3", name="v3")
295-
def s3_v3():
296-
from localstack.services.s3.provider import S3Provider
297-
298-
provider = S3Provider()
299-
return Service.for_provider(provider)
300-
301-
302259
@aws_provider()
303260
def s3control():
304261
from localstack.services.moto import MotoFallbackDispatcher

‎localstack-core/localstack/services/s3/legacy/__init__.py

Whitespace-only changes.

‎localstack-core/localstack/services/s3/legacy/models.py

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)