Skip to content
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.

Sign up for GitHub

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

Jump to bottom

NAS-132769 / 24.10.2 / Fix NOTICE: s3: s3 provider "" not known - please set correctly als… (by themylogin) #15054

Merged
merged 1 commit into from
Nov 27, 2024
Merged

NAS-132769 / 24.10.2 / Fix NOTICE: s3: s3 provider "" not known - please set correctly als… (by themylogin) #15054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/middlewared/middlewared/rclone/remote/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ async def validate_task_basic(self, task, credentials, verrors):
task["attributes"]["region"] = response["LocationConstraint"] or "us-east-1"

async def get_credentials_extra(self, credentials):
result = {}
result = {"provider": "Other"}

if (credentials["attributes"].get("endpoint") or "").rstrip("/").endswith(".scw.cloud"):
if credentials["attributes"].get("max_upload_parts", 10000) == 10000:
Expand All @@ -81,7 +81,6 @@ async def get_task_extra(self, task):
server_side_encryption=task["attributes"].get("encryption") or "",
skip_region=undefined,
signatures_v2=undefined,
provider="Other",
)

if not task["credentials"]["attributes"].get("skip_region", False):
Expand Down
3 changes: 1 addition & 2 deletions src/middlewared/middlewared/rclone/remote/storjix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,14 @@ def list_buckets_sync():
return await self.middleware.run_in_thread(list_buckets_sync)

async def get_credentials_extra(self, credentials):
return {"endpoint": "https://gateway.storjshare.io"}
return {"endpoint": "https://gateway.storjshare.io", "provider": "Other"}

async def get_task_extra(self, task):
# Storj recommended these settings
return {
"chunk_size": "64M",
"disable_http2": "true",
"upload_cutoff": "64M",
"provider": "Other",
}

def get_restic_config(self, task):
Expand Down