Disable fits file creation and remove checks for fits from tests (#282)

* This disables the Context that causes the FITS file to get generated. Also this removes any tests for FITS files.
jhu-idc · Dec 13, 2021 · c43b9e3 · c43b9e3
1 parent 38a54b8
commit c43b9e3
Show file tree

Hide file tree

Showing 22 changed files with 89 additions and 275 deletions.
diff --git a/.env b/.env
@@ -14,7 +14,7 @@
 # to take effect; e.g. 'make dev-up'
 ENVIRONMENT=local
 
-REQUIRED_SERIVCES=activemq alpaca cantaloupe idc-crayfish crayfits drupal mariadb solr idc-snapshot testcafe minio
+REQUIRED_SERIVCES=activemq alpaca cantaloupe idc-crayfish drupal mariadb solr idc-snapshot testcafe minio
 ###############################################################################
 # Environment variables specific to composer.
 ###############################################################################

diff --git a/codebase/config/sync/context.context.technical_metadata_on_ingest.yml b/codebase/config/sync/context.context.technical_metadata_on_ingest.yml
@@ -14,7 +14,7 @@ label: 'Technical Metadata on Ingest'
 group: Islandora
 description: 'Defines FITS harvesting behavior'
 requireAllConditions: false
-disabled: false
+disabled: true
 conditions:
   media_has_term:
     id: media_has_term

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_audio.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_audio.yml
@@ -52,9 +52,9 @@ process:
     callable: date
     source: constants/DATE_FORMAT
   _the_filename:
-      plugin: default_value
-      source: new_filename
-      default: '@_url_filename'
+    plugin: default_value
+    source: new_filename
+    default: '@_url_filename'
   _destination_dir:
     plugin: concat
     source:

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_document.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_document.yml
@@ -52,9 +52,9 @@ process:
     callable: date
     source: constants/DATE_FORMAT
   _the_filename:
-      plugin: default_value
-      source: new_filename
-      default: '@_url_filename'
+    plugin: default_value
+    source: new_filename
+    default: '@_url_filename'
   _destination_dir:
     plugin: concat
     source:

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_extracted_text.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_extracted_text.yml
@@ -53,9 +53,9 @@ process:
     callable: date
     source: constants/DATE_FORMAT
   _the_filename:
-      plugin: default_value
-      source: new_filename
-      default: '@_url_filename'
+    plugin: default_value
+    source: new_filename
+    default: '@_url_filename'
   _destination_dir:
     plugin: concat
     source:

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_file.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_file.yml
@@ -52,9 +52,9 @@ process:
     callable: date
     source: constants/DATE_FORMAT
   _the_filename:
-      plugin: default_value
-      source: new_filename
-      default: '@_url_filename'
+    plugin: default_value
+    source: new_filename
+    default: '@_url_filename'
   _destination_dir:
     plugin: concat
     source:

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_image.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_image.yml
@@ -52,9 +52,9 @@ process:
     callable: date
     source: constants/DATE_FORMAT
   _the_filename:
-      plugin: default_value
-      source: new_filename
-      default: '@_url_filename'
+    plugin: default_value
+    source: new_filename
+    default: '@_url_filename'
   _destination_dir:
     plugin: concat
     source:

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_video.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_video.yml
@@ -52,9 +52,9 @@ process:
     callable: date
     source: constants/DATE_FORMAT
   _the_filename:
-      plugin: default_value
-      source: new_filename
-      default: '@_url_filename'
+    plugin: default_value
+    source: new_filename
+    default: '@_url_filename'
   _destination_dir:
     plugin: concat
     source:

diff --git a/docker-compose.env.yml b/docker-compose.env.yml
@@ -61,27 +61,6 @@ services:
       ALPACA_HTTP_SOCKET_TIMEOUT_MS: ${ALPACA_HTTP_SOCKET_TIMEOUT_MS:-7200000}
   cantaloupe:
     # No environment variables require overriding.
-  crayfits:
-    environment:
-      NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600}
-      NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600}
-      NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600}
-      NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600}
-      NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600}
-      NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600}
-      NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600}
-      NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600}
-      NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600}
-      NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600}
-      PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600}
-      PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600}
-      PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20}
-      PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600}
-      PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M}
-      PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M}
-      PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600}
-      PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600}
-      PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M}
   mariadb:
     environment:
       #

diff --git a/docker-compose.sample.env.yml b/docker-compose.sample.env.yml
@@ -45,23 +45,21 @@ services:
     environment:
       #
       # Must be exactly the same as ACTIVEMQ_PASSWORD.
-      # 
+      #
       ALPACA_ACTIVEMQ_PASSWORD: password
       #
-      # Password for admin user: https://karaf.apache.org/manual/latest/security 
+      # Password for admin user: https://karaf.apache.org/manual/latest/security
       #
       ALPACA_KARAF_ADMIN_PASSWORD: password
   blazegraph:
     # No environment variables require overriding.
   cantaloupe:
     # No environment variables require overriding.
-  crayfits:
-    # No environment variables require overriding.
   mariadb:
     environment:
       #
       # Password for the root user.
-      # 
+      #
       MYSQL_ROOT_PASSWORD: password
   # If you use PostgreSQL for any services uncomment this section.
   # postgresql:
@@ -93,22 +91,22 @@ services:
       DRUPAL_DEFAULT_SALT: 9PPaL0CxZAIcq0l9wxgDGlCZrp7JdT_x7v9gVzpdbUjMt1PqDz3uD0Zy-i16DuJ1-Htuq5hqeg
       #
       # The administrator email account for the default site.
-      # 
+      #
       DRUPAL_DEFAULT_ACCOUNT_EMAIL: [email protected]
       #
       # The password of the admin account for the default site.
-      # 
+      #
       DRUPAL_DEFAULT_ACCOUNT_PASSWORD: password
       #
-      # The password Drupal uses to connect to the database for the default site. 
+      # The password Drupal uses to connect to the database for the default site.
       #
       DRUPAL_DEFAULT_DB_PASSWORD: password
       #
       # Must match MYSQL_ROOT_PASSWORD, used to create the database / user.
       #
       DRUPAL_DEFAULT_DB_ROOT_PASSWORD: password
       #
-      # JWT Key Pair 
+      # JWT Key Pair
       #
       DRUPAL_JWT_PRIVATE_KEY: |-
         -----BEGIN RSA PRIVATE KEY-----
@@ -140,7 +138,7 @@ services:
         -----END RSA PRIVATE KEY-----
       #
       # All other *_JWT_PUBLIC keys should match this value exactly.
-      # 
+      #
       DRUPAL_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR
@@ -167,7 +165,7 @@ services:
       FCREPO_JWT_ADMIN_TOKEN: islandora
       #
       # Must be exactly the same as DRUPAL_JWT_PUBLIC_KEY.
-      # 
+      #
       FCREPO_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR
@@ -191,10 +189,10 @@ services:
       #
       # Must be exactly the same as FCREPO_JWT_ADMIN_TOKEN.
       #
-      GEMINI_JWT_ADMIN_TOKEN: islandora 
+      GEMINI_JWT_ADMIN_TOKEN: islandora
       #
       # Must be exactly the same as DRUPAL_JWT_PUBLIC_KEY.
-      # 
+      #
       GEMINI_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR
@@ -210,10 +208,10 @@ services:
       #
       # Must be exactly the same as FCREPO_JWT_ADMIN_TOKEN.
       #
-      HOMARUS_JWT_ADMIN_TOKEN: islandora 
+      HOMARUS_JWT_ADMIN_TOKEN: islandora
       #
       # Must be exactly the same as DRUPAL_JWT_PUBLIC_KEY.
-      # 
+      #
       HOMARUS_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR
@@ -229,10 +227,10 @@ services:
       #
       # Must be exactly the same as FCREPO_JWT_ADMIN_TOKEN.
       #
-      HOUDINI_JWT_ADMIN_TOKEN: islandora 
+      HOUDINI_JWT_ADMIN_TOKEN: islandora
       #
       # Must be exactly the same as DRUPAL_JWT_PUBLIC_KEY.
-      # 
+      #
       HOUDINI_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR
@@ -248,10 +246,10 @@ services:
       #
       # Must be exactly the same as FCREPO_JWT_ADMIN_TOKEN.
       #
-      HYPERCUBE_JWT_ADMIN_TOKEN: islandora 
+      HYPERCUBE_JWT_ADMIN_TOKEN: islandora
       #
       # Must be exactly the same as DRUPAL_JWT_PUBLIC_KEY.
-      # 
+      #
       HYPERCUBE_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR
@@ -281,12 +279,12 @@ services:
       #
       # php -r 'echo password_hash(md5("password"), PASSWORD_DEFAULT) . "\n";'
       #
-      # N.B. You must double up '$' characters to prevent them from being 
+      # N.B. You must double up '$' characters to prevent them from being
       # interpolated by docker-compose.yml
       MATOMO_USER_PASS: $$2y$$10$$S38e7HPM9LI3aOIvcnRsfuMCm4ipNP572QsvbCK60upoHVJ61hMrS
       #
       # Must be exactly the same as DRUPAL_DEFAULT_SITE_URL without the protocol.
-      # 
+      #
       # If you are using an IP address with traefik.me, change the dot between COMPOSE_PROJECT_NAME and
       # DRUPAL_SITE_HOST to a hyphen (i.e. ${COMPOSE_PROJECT_NAME-isle-dc}.${DRUPAL_SITE_HOST-traefik.me}
       # becomes ${COMPOSE_PROJECT_NAME-isle-dc}-${DRUPAL_SITE_HOST-traefik.me}
@@ -303,10 +301,10 @@ services:
       #
       # Must be exactly the same as FCREPO_JWT_ADMIN_TOKEN.
       #
-      RECAST_JWT_ADMIN_TOKEN: islandora 
+      RECAST_JWT_ADMIN_TOKEN: islandora
       #
       # Must be exactly the same as DRUPAL_JWT_PUBLIC_KEY.
-      # 
+      #
       RECAST_JWT_PUBLIC_KEY: |-
         -----BEGIN PUBLIC KEY-----
         MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6uK3nozywVaRCAB3FHdR

diff --git a/end-to-end/tests/admin/s3.spec.js b/end-to-end/tests/admin/s3.spec.js
@@ -55,15 +55,13 @@ test('Verify original file and derivatives are in S3', async t => {
     // (increase timeout in case derivatives haven't been created yet?)
     const service_derivative = Selector('div.view-content').find('a').withText('Service File.jpg');
     const thumb_derivative = Selector('div.view-content').find('a').withText('Thumbnail Image.jpg');
-    const fits_derivative = Selector('div.view-content').find('a').withText('FITS File.xml');
 
     const service_count = await service_derivative.count
     const thumb_count = await thumb_derivative.count
-    const fits_count = await fits_derivative.count
 
     // if a derivative isn't present yet, it may be because it hasn't been generated yet.
     // in that case, wait 30 seconds and refresh the page, and see if it appears.
-    if (service_count < 1 || thumb_count < 1 || fits_count < 1) {
+    if (service_count < 1 || thumb_count < 1) {
         console.log("Derivatives haven't appeared.  Sleeping for 30 seconds, then trying again ...")
         // sleep 30 seconds, refresh the page
         await t.wait(30000);
@@ -72,7 +70,6 @@ test('Verify original file and derivatives are in S3', async t => {
 
     await t.expect(service_derivative.count).eql(1);
     await t.expect(thumb_derivative.count).eql(1);
-    await t.expect(fits_derivative.count).eql(1);
 
     const original_uri = await media.getAttribute('href');
     const thumb_media_uri = await thumb_derivative.getAttribute('href');

diff --git a/end-to-end/tests/ui/item-detail-image.spec.js b/end-to-end/tests/ui/item-detail-image.spec.js
@@ -60,8 +60,8 @@ test('Download', async (t) => {
     .expect(ImagePage.downloadModal.visibility().exists).notOk()
     .click(ImagePage.downloadBtn)
     .expect(ImagePage.downloadModal.visibility().exists).ok()
-    .expect(ImagePage.downloadModal.content.count).eql(3)
-    .expect(ImagePage.downloadModal.content.find('a[download]').count).eql(3);
+    .expect(ImagePage.downloadModal.content.count).eql(2)
+    .expect(ImagePage.downloadModal.content.find('a[download]').count).eql(2);
 });
 
 test('Export metadata', async (t) => {