Skip to content

Commit 18f84c8

Browse files
committed
rohmu: remove swift support
1 parent 8455f6b commit 18f84c8

File tree

9 files changed

+8
-597
lines changed

9 files changed

+8
-597
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ and other databases.
2525
Features
2626
**********
2727

28-
- Supported object storages: Azure, GCP, S3, Swift (OpenStack), local file storage, and SFTP.
28+
- Supported object storages: Azure, GCP, S3, local file storage, and SFTP.
2929
- Supported compression algorithms: Snappy_, zstd_, and lzma_.
3030

3131
..

docs/api__object_storage.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,3 @@ SFTP
4949

5050
.. autoclass:: rohmu.object_storage.sftp.SFTPTransfer
5151
:members:
52-
53-
54-
Swift
55-
=====
56-
57-
.. autopydantic_model:: rohmu.object_storage.config.SwiftObjectStorageConfig
58-
59-
.. autoclass:: rohmu.object_storage.swift.SwiftTransfer
60-
:members:

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dependencies = [
3737
"pydantic >= 1.10.17",
3838
"python-dateutil",
3939
"python-snappy",
40-
"python-swiftclient",
4140
"requests",
4241
"typing_extensions; python_version<'3.12'",
4342
"zstandard",

rohmu/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
S3ObjectStorageConfig,
3030
SFTPObjectStorageConfig,
3131
StorageDriver,
32-
SwiftObjectStorageConfig,
3332
)
3433

3534
__all__ = [
@@ -56,5 +55,4 @@
5655
"STORAGE_TYPE",
5756
"StorageDriver",
5857
"StorageModel",
59-
"SwiftObjectStorageConfig",
6058
]

rohmu/factory.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ def get_class_for_storage_driver(storage_driver: StorageDriver) -> Type[BaseTran
3838

3939
return S3Transfer
4040
elif storage_driver == StorageDriver.swift:
41-
from rohmu.object_storage.swift import SwiftTransfer
42-
43-
return SwiftTransfer
41+
raise NotImplementedError()
4442

4543
raise InvalidConfigurationError(f"unsupported storage type {storage_driver.value!r}")
4644

rohmu/object_storage/config.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@ def calculate_s3_chunk_size() -> int:
8383
S3_READ_BLOCK_SIZE: Final[int] = 1024 * 1024 * 1
8484

8585

86-
SWIFT_CHUNK_SIZE: Final[int] = 1024 * 1024 * 5 # 5 Mi
87-
SWIFT_SEGMENT_SIZE: Final[int] = 1024 * 1024 * 1024 * 3 # 3 Gi
88-
SWIFT_MAX_NUM_PARTS_PER_UPLOAD = 10000
89-
90-
9186
class AzureObjectStorageConfig(StorageModel):
9287
bucket_name: Optional[str]
9388
account_name: str
@@ -186,26 +181,3 @@ class SFTPObjectStorageConfig(StorageModel):
186181
private_key: Optional[str] = Field(None, repr=False)
187182
prefix: Optional[str] = None
188183
storage_type: Literal[StorageDriver.sftp] = StorageDriver.sftp
189-
190-
191-
class SwiftObjectStorageConfig(StorageModel):
192-
user: str
193-
key: str = Field(repr=False)
194-
container_name: str
195-
auth_url: str
196-
auth_version: str = "2.0"
197-
tenant_name: Optional[str] = None
198-
segment_size: int = SWIFT_SEGMENT_SIZE
199-
region_name: Optional[str] = None
200-
user_id: Optional[str] = None
201-
user_domain_id: Optional[str] = None
202-
user_domain_name: Optional[str] = None
203-
tenant_id: Optional[str] = None
204-
project_id: Optional[str] = None
205-
project_name: Optional[str] = None
206-
project_domain_id: Optional[str] = None
207-
project_domain_name: Optional[str] = None
208-
service_type: Optional[str] = None
209-
endpoint_type: Optional[str] = None
210-
prefix: Optional[str] = None
211-
storage_type: Literal[StorageDriver.swift] = StorageDriver.swift

0 commit comments

Comments
 (0)