Skip to content

Feature/202210 institutional storage control/fixedbug/37211 #460

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Feature/202210 institutional storage control/fixedbug/37211 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d819e8
refs [Bug][NII Redmine#37211]機関ストレージ(アドオン方式)におけるエクスポート・リストア処理の残課題について
tma-ntphat Mar 7, 2024
2403df8
refs [Bug][NII Redmine#40871] エクスポートデータ(/export_xx_xxxxxxxxxx/files/配…
tma-ntphat Mar 7, 2024
094fa2c
refs [Bug][NII Redmine#40871] エクスポートデータ(/export_xx_xxxxxxxxxx/files/配…
tma-ntphat Mar 7, 2024
15e1576
Merge branch 'develop' into feature/202210-InstitutionalStorageContro…
tma-ntphat Jul 3, 2024
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
9 changes: 5 additions & 4 deletions addons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,7 @@
"dropboxbusiness",
"s3compatinstitutions",
"ociinstitutions",
"s3",
"s3compat",
"owncloud"
"onedrivebusiness"
],
"institutional_storage_bulk_mount_method": [
"box",
Expand All @@ -185,6 +183,9 @@
],
"addons_has_max_keys": [
"s3",
"s3compat"
"s3compat",
"s3compatinstitutions",
"s3compatb3",
"ociinstitutions"
]
}
6 changes: 4 additions & 2 deletions addons/s3compatb3/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,10 @@ def get_user_info(host, access_key, secret_key):
connection = connect_s3compatb3(host, access_key, secret_key)
buckets = connection.buckets.all()
[bucket.name for bucket in buckets]
identity = boto3.client('sts').get_caller_identity()
return identity
return connection
# Fix for not being able to setup Oracle Cloud Infrastructure for Institutions
# identity = boto3.client('sts').get_caller_identity()
# return identity
except ClientError:
return None
return None
Expand Down
54 changes: 33 additions & 21 deletions admin/base/schemas/file-info-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,6 @@
]
}
},
"required": [
"host",
"object",
"folder",
"address",
"service",
"version",
"provider"
],
"additionalProperties": true
},
"project": {
Expand Down Expand Up @@ -244,15 +235,6 @@
]
}
},
"required": [
"host",
"object",
"folder",
"address",
"service",
"version",
"provider"
],
"additionalProperties": true
},
"metadata": {
Expand Down Expand Up @@ -318,6 +300,12 @@
"null"
]
},
"quickXorHash": {
"type": [
"string",
"null"
]
},
"size": {
"type": [
"string",
Expand Down Expand Up @@ -366,9 +354,6 @@
"path",
"etag",
"materialized",
"md5",
"sha1",
"sha256",
"size",
"sizeInt",
"extra",
Expand All @@ -377,6 +362,33 @@
"modified",
"modified_utc"
],
"anyOf": [
{
"required": [
"md5"
]
},
{
"required": [
"sha1"
]
},
{
"required": [
"sha256"
]
},
{
"required": [
"sha512"
]
},
{
"required": [
"quickXorHash"
]
}
],
"additionalProperties": true
}
},
Expand Down
Loading