这是indexloc提供的服务，不要输入任何密码
Skip to content

AV-2443: Update cloudstorage and show validation errors in the UI #2795

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

Merged
merged 6 commits into from
Jul 28, 2025
+4 −8
Merged

AV-2443: Update cloudstorage and show validation errors in the UI #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c6cc6d
AV-2443: Update cloudstorage and show validation errors in the UI
Zharktas Jun 18, 2025
47fa4ee
Update cloudstorage
Zharktas Jun 18, 2025
a41565f
Update cloudstorage variables in ckan config
Zharktas Jun 18, 2025
b4b9faf
Dont use secure urls locally
Zharktas Jun 18, 2025
87b9da4
parameters need to be strings
Zharktas Jun 18, 2025
3fae9a1
provide credentials for cloudstorage and use secure urls
Zharktas Jun 18, 2025
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
6 changes: 2 additions & 4 deletions cdk/lib/ckan-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,7 @@
ckanContainerEnv['CKAN_CLOUDSTORAGE_ENABLED'] = 'true';
ckanContainerEnv['CKAN_CLOUDSTORAGE_DRIVER'] = pCkanCloudstorageDriver.stringValue;
ckanContainerEnv['CKAN_CLOUDSTORAGE_CONTAINER_NAME'] = pCkanCloudstorageContainerName.stringValue;
ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = pCkanCloudstorageUseSecureUrls.stringValue;
ckanContainerEnv['CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS'] = '1';
ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = 'true'
ckanContainerEnv['CKAN_CLOUDSTORAGE_DRIVER_OPTIONS'] = '';

ckanTaskPolicyAllowCloudstorage = new iam.PolicyStatement({
Expand All @@ -393,8 +392,7 @@
ckanContainerEnv['CKAN_CLOUDSTORAGE_ENABLED'] = 'false';
ckanContainerEnv['CKAN_CLOUDSTORAGE_DRIVER'] = '';
ckanContainerEnv['CKAN_CLOUDSTORAGE_CONTAINER_NAME'] = '';
ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = '';
ckanContainerEnv['CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS'] = '0';
ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = 'false';

Check warning on line 395 in cdk/lib/ckan-stack.ts

View check run for this annotation

Codecov / codecov/patch

cdk/lib/ckan-stack.ts#L395 

Added line #L395 was not covered by tests
}

const ckanLogGroup = new logs.LogGroup(this, 'ckanLogGroup', {
Expand Down
2 changes: 1 addition & 1 deletion ckan/ckanext/ckanext-cloudstorage
Open in desktop
Submodule ckanext-cloudstorage updated 26 files
+90 −0 .github/workflows/test.yml
+0 −1 .gitignore
+7 −5 README.md
+31 −9 ckanext/cloudstorage/fanstatic/scripts/cloudstorage-multipart-upload.js
+1 −1 ckanext/cloudstorage/helpers.py
+18 −15 ckanext/cloudstorage/logic/action/multipart.py
+1 −0 ckanext/cloudstorage/migration/cloudstorage/README
+74 −0 ckanext/cloudstorage/migration/cloudstorage/alembic.ini
+81 −0 ckanext/cloudstorage/migration/cloudstorage/env.py
+24 −0 ckanext/cloudstorage/migration/cloudstorage/script.py.mako
+51 −0 ckanext/cloudstorage/migration/cloudstorage/versions/8daf8d1f572e_create_cloudstorage_tables.py
+2 −2 ckanext/cloudstorage/plugin/__init__.py
+25 −58 ckanext/cloudstorage/storage.py
+36 −0 ckanext/cloudstorage/tests/ckan_setup.py
+39 −0 ckanext/cloudstorage/tests/conftest.py
+0 −0 ckanext/cloudstorage/tests/logic/action/__init__.py
+153 −0 ckanext/cloudstorage/tests/logic/action/test_multipart.py
+29 −0 ckanext/cloudstorage/tests/test_helpers.py
+49 −0 ckanext/cloudstorage/tests/test_plugin.py
+51 −0 ckanext/cloudstorage/tests/test_storage.py
+56 −0 ckanext/cloudstorage/tests/test_utils.py
+3 −0 dev-requirements.txt
+31 −0 pyproject.toml
+1 −2 requirements.txt
+0 −31 setup.py
+58 −0 test.ini
1 change: 0 additions & 1 deletion ckan/templates/production.ini.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ ckanext.reminder.email_field = maintainer_email
ckanext.cloudstorage.driver = {{ environ('CKAN_CLOUDSTORAGE_DRIVER') }}
ckanext.cloudstorage.container_name = {{ environ('CKAN_CLOUDSTORAGE_CONTAINER_NAME') }}
ckanext.cloudstorage.use_secure_urls = {{ environ('CKAN_CLOUDSTORAGE_USE_SECURE_URLS') }}
ckanext.cloudstorage.aws_use_boto3_sessions = {{ environ('CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS') }}
ckanext.cloudstorage.driver_options = {{ environ('CKAN_CLOUDSTORAGE_DRIVER_OPTIONS') }}
ckanext.cloudstorage.datapusher.formats = csv xls xlsx tsv application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ods application/vnd.oasis.opendocument.spreadsheet
ckan.datapusher.formats = nonexistingformat
Expand Down
3 changes: 1 addition & 2 deletions docker/.env.ckan.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ CKAN_CLOUDSTORAGE_ENABLED=false
CKAN_CLOUDSTORAGE_DRIVER="S3_EU_WEST"
CKAN_CLOUDSTORAGE_DRIVER_OPTIONS=""
CKAN_CLOUDSTORAGE_CONTAINER_NAME=""
CKAN_CLOUDSTORAGE_USE_SECURE_URLS=1
CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS=1
CKAN_CLOUDSTORAGE_USE_SECURE_URLS=true
AWS_ACCESS_KEY_ID=""
AWS_SECRET_ACCESS_KEY=""
ZULIP_API_URL=
Expand Down
Loading