Merge branch 'master' into AV-2055_upgrade_to_drupal_10

vrk-kpa · Oct 23, 2023 · 40b2a3b · 40b2a3b
2 parents 7ca6788 + 5a8c75b
commit 40b2a3b
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 64 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -20,7 +20,7 @@ jobs:
           pip install ruff
       - name: Run ruff
         run: |
-          ruff check --format=github ckan
+          ruff check --output-format=github ckan
 
   code-sniffer:
     name: code-sniffer

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -364,7 +364,7 @@ jobs:
           -e COMMIT_INFO_REMOTE
           -e CYPRESS_CI_BUILD_URL
           --entrypoint cypress 
-          cypress/included:12.17.2 run 
+          cypress/included:13.3.1 run 
           --browser chrome:stable 
           --record --key ${{ secrets.CYPRESS_RECORD_KEY }} 
           --parallel 

diff --git a/cdk/lib/ckan-stack.ts b/cdk/lib/ckan-stack.ts
@@ -365,6 +365,7 @@ export class CkanStack extends Stack {
       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_DRIVER_OPTIONS'] = '';
 
       const ckanTaskExecPolicyAllowCloudstorage = new iam.PolicyStatement({
         actions: ['*'],

diff --git a/ckan/ckanext/ckanext-cloudstorage b/ckan/ckanext/ckanext-cloudstorage
diff --git a/docker/.env.template b/docker/.env.template
@@ -3,8 +3,8 @@ REGISTRY=""
 REPOSITORY=""
 
 # opendata images
-CKAN_IMAGE_TAG="abb59d3680d1c4b829272d575fdc51985e7fee5d"
-DRUPAL_IMAGE_TAG="d85b02dbf8c754228c26c94a148ec99693c1178a"
+CKAN_IMAGE_TAG="a0bed994f6e0432261fb004bfd822e8e9a69d377"
+DRUPAL_IMAGE_TAG="ab02756f63f3fb3b475bb67e54a63309e72b2d54"
 SOLR_IMAGE_TAG="acedaa3c1d35875178b6d104fe413bef0bbdd155"
 NGINX_IMAGE_TAG="cc823d149f1f80af4354a6f38973cec9fb994cc1"
 DATAPUSHER_IMAGE_TAG="37245d2426ed6218a7352115d4147139defc9d8e"

diff --git a/docker/README.md b/docker/README.md
@@ -1,4 +1,4 @@
-# docker
+# docker 
 
 This folder contains dockerized versions of the opendata services.
 

diff --git a/drupal/scripts/init_drupal.sh b/drupal/scripts/init_drupal.sh
@@ -114,12 +114,13 @@ echo "uninstall modules.."
 #[[ "$MODULE_INFO" == *"page_cache"* ]]  && drush pm:uninstall -y page_cache
 [[ "$MODULE_INFO" == *"protected_submissions"* ]]  && drush pm:uninstall -y protected_submissions
 [[ "$MODULE_INFO" == *"avoindata_infobox"* ]]  && drush pm:uninstall -y avoindata_infobox
-[[ "$MODULE_INFO" == "avoindata_ckeditor_plugins" ]]  && drush pm:uninstall -y avoindata_ckeditor_plugins
-[[ "$MODULE_INFO" == "ckeditor" ]]  && drush pm:uninstall -y ckeditor
-[[ "$MODULE_INFO" == "color" ]]  && drush pm:uninstall -y color
-[[ "$MODULE_INFO" == "rdf" ]]  && drush pm:uninstall -y rdf
-[[ "$MODULE_INFO" == "bartik" ]]  && drush pm:uninstall -y bartik
-[[ "$MODULE_INFO" == "seven" ]]  && drush pm:uninstall -y seven
+[[ "$MODULE_INFO" == *"avoindata_ckeditor_plugins"* ]]  && drush pm:uninstall -y avoindata_ckeditor_plugins
+[[ "$MODULE_INFO" == *"ckeditor"* ]]  && drush pm:uninstall -y ckeditor
+[[ "$MODULE_INFO" == *"color"* ]]  && drush pm:uninstall -y color
+[[ "$MODULE_INFO" == *"rdf"* ]]  && drush pm:uninstall -y rdf
+[[ "$MODULE_INFO" == *"bartik"* ]]  && drush pm:uninstall -y bartik
+[[ "$MODULE_INFO" == *"seven"* ]]  && drush pm:uninstall -y seven
+
 
 # enable modules
 echo "enable modules.."
+0 −1		ckanext/cloudstorage/plugin/__init__.py
+3 −2		ckanext/cloudstorage/storage.py