elminate dryad refs

CDLUC3 · May 1, 2024 · 24f58b7 · 24f58b7
1 parent d515744
commit 24f58b7
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 37 deletions.
diff --git a/cognito-lambda-nonvpc/Gemfile.lock b/cognito-lambda-nonvpc/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
+    aws-partitions (1.923.0)
     aws-sdk-cognitoidentityprovider (1.90.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)

diff --git a/mysql-ruby-lambda/Gemfile.lock b/mysql-ruby-lambda/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
+    aws-partitions (1.923.0)
     aws-sdk-core (3.194.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

diff --git a/src-admintool/Gemfile.lock b/src-admintool/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
+    aws-partitions (1.923.0)
     aws-sdk-core (3.194.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

diff --git a/src-admintool/config/reports.yml b/src-admintool/config/reports.yml
@@ -84,7 +84,7 @@ objects_by_local_id:
   class: ObjectsByLocalIdQuery
   category: objects
   description: |
-    This report displays an object with an exact match to a localid such as `doi:10.5061/dryad.9999`.  
+    This report displays an object with an exact match to a localid .
     Wildcard searching is not permitted.
     
     Click the Object Id link to see a detailed listing of the files contained in the object.
@@ -495,7 +495,6 @@ recent_ingests:
   category: ingest
   description: |
     Enumerate the ingest batches that were processed on a specific date.
-    All Dryad submissions for the specific date will be counted as a single batch.
 arklist:
   link-title: Objects by Ark List Query
   breadcrumb: bp_obj

diff --git a/src-admintool/queries/audit_oldest_query.rb b/src-admintool/queries/audit_oldest_query.rb
@@ -21,8 +21,6 @@ def get_sql
         status != 'processing'
       AND NOT
         verified IS null
-      AND
-        inv_node_id not in (4,14,18) /*dryad nodes*/
       order by
         verified
       LIMIT 1

diff --git a/src-admintool/queries/consistency_files_query.rb b/src-admintool/queries/consistency_files_query.rb
@@ -19,12 +19,6 @@ def get_sql
     %{
       select
         case
-          when c.mnemonic like 'cdl_dryad%'
-            then 'Dryad'
-          when c.mnemonic = 'oneshare_dataup'
-            then 'DataOne'
-          when c.mnemonic = 'dataone_dash'
-            then 'DataOne'
           when ifnull(c.mnemonic, '') = ''
             then 'No Mnemonic'
           when age.inv_object_id = (
@@ -74,7 +68,6 @@ def get_sql
         case
           when count(*) = 0 then 'PASS'
           when #{@copies.to_i} = 3 then 'PASS'
-          when #{@copies.to_i} = 4 and c.mnemonic = 'cdl_dryad' then 'INFO'
           when ifnull(
             sum(
               case

diff --git a/src-admintool/queries/consistency_objects_query.rb b/src-admintool/queries/consistency_objects_query.rb
@@ -19,12 +19,6 @@ def get_sql
     %{
       select
         case
-          when c.mnemonic like 'cdl_dryad%'
-            then 'Dryad'
-          when c.mnemonic = 'oneshare_dataup'
-            then 'DataOne'
-          when c.mnemonic = 'dataone_dash'
-            then 'DataOne'
           when ifnull(c.mnemonic, '') = ''
             then 'No Mnemonic'
           when age.inv_object_id = (
@@ -74,7 +68,6 @@ def get_sql
         case
           when count(*) = 0 then 'PASS'
           when #{@copies.to_i} = 3 then 'PASS'
-          when #{@copies.to_i} = 4 and c.mnemonic = 'cdl_dryad' then 'INFO'
           when ifnull(
             sum(
               case

diff --git a/src-admintool/queries/consistency_primary_nodes_query.rb b/src-admintool/queries/consistency_primary_nodes_query.rb
@@ -3,7 +3,7 @@
 # Query class - see config/reports.yml for description
 class ConsistencyPrimaryNodeQuery < AdminQuery
   def get_title
-    'Collections with Non-standard Primary Nodes (Not SDSC or Dryad S3)'
+    'Collections with Non-standard Primary Nodes (Not SDSC)'
   end
 
   def get_sql
@@ -27,7 +27,6 @@ def get_sql
         case
           when n.number = 4001 then 'SKIP'
           when n.number = 5001 then 'INFO'
-          when c.name like 'CDL Dryad Stage' then 'INFO'
           when c.name like 'CDL Wasabi Demo Collection' then 'INFO'
           else 'FAIL'
         end as status
@@ -54,7 +53,7 @@ def get_sql
       and
         o.aggregate_role = 'MRT-collection'
       where
-        n.number not in (3041, 9501, 9502)
+        n.number not in (9501, 9502)
       group by
         nodenum,
         nodename,

diff --git a/src-admintool/queries/consistency_secondary_nodes_query.rb b/src-admintool/queries/consistency_secondary_nodes_query.rb
@@ -3,7 +3,7 @@
 # Query class - see config/reports.yml for description
 class ConsistencySecondaryNodeQuery < AdminQuery
   def get_title
-    'Collections with Non-standard Secondary Nodes (Not Glacier+Wasabi or SDSC+Wasabi or Dryad Glacier+SDSC)'
+    'Collections with Non-standard Secondary Nodes (Not Glacier+Wasabi or SDSC+Wasabi)'
   end
 
   def get_sql
@@ -25,7 +25,6 @@ def get_sql
           when c.name like 'Merritt %' then 'INFO'
           when lower(c.name) like '%service level agreement%' then 'INFO'
           when c.name like '%SLA' then 'INFO'
-          when c.name like 'CDL Dryad Stage' then 'INFO'
           when c.name like 'CDL Wasabi Demo Collection' then 'INFO'
           else 'FAIL'
         end as status
@@ -48,7 +47,7 @@ def get_sql
       group by
         collection
       having
-        nodes not in ('2001,6001', '2001,9501', '2002,6001', '2002,9502', '3641,9501')
+        nodes not in ('2001,6001', '2001,9501', '2002,6001', '2002,9502')
       ;
     }
   end

diff --git a/src-admintool/queries/ingest_by_month_query.rb b/src-admintool/queries/ingest_by_month_query.rb
@@ -5,7 +5,7 @@ class IngestBytesByMonthQuery < AdminQuery
   def initialize(query_factory, path, myparams)
     super(query_factory, path, myparams)
     @defyears = 10
-    @totit = @defyears * 12 + 1
+    @totit = (@defyears * 12) + 1
     @tend = ((Date.today - Date.today.day + 1) >> 1).strftime('%Y-%m-%d')
     @tstart = ((Date.today - Date.today.day + 1) << (12 * @defyears)).strftime('%Y-%m-%d')
   end

diff --git a/src-admintool/web/index.html b/src-admintool/web/index.html
@@ -455,7 +455,7 @@ <h3>Storage Configuration</h3>
         <li class="helpinfo"><a href="https://github.com/CDLUC3/mrt-doc-private/blob/main/docs/system-recovery/storage-test-specific-nodes.md">Test individual storage nodes</a></li>
         <li class="node"><a href="{{ADMINTOOL_HOME}}?path=collnodes">Storage Nodes by Collection</a></li>
         <li class="node"><a href="{{ADMINTOOL_HOME}}?path=collection_node_cleanup_required">Storage Node/Collection Cleanup Needed</a></li>
-        <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=con_primary">Collections with Non-standard Primary Nodes (Not SDSC or Dryad S3)</a></li>
+        <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=con_primary">Collections with Non-standard Primary Nodes (Not SDSC)</a></li>
         <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=con_secondary">Collections with Non-standard Secondary Nodes (Not Glacier+Wasabi or SDSC+Wasabi)</a></li>
       </ul>
     </div>

diff --git a/src-colladmin/Gemfile.lock b/src-colladmin/Gemfile.lock
@@ -22,13 +22,13 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
+    aws-partitions (1.923.0)
     aws-sdk-core (3.194.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ec2 (1.453.0)
+    aws-sdk-ec2 (1.454.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.80.0)

diff --git a/src-colladmin/README.md b/src-colladmin/README.md
@@ -37,7 +37,7 @@
     - GET /admin/bids/*Age in Days*
       - Get list of batches on disk
     - GET /admin/bid/*BID*/<age in days>
-      - Get batch info in days (Useful for Dryad: JOB_ONLY)
+      - Get batch info in days 
 - Display Job Detail (job metadata)
   - Colladmin
     - GET job?bid=*BID*&job=*JID*
@@ -98,8 +98,8 @@ Ingest Admin APIs
 - GET /admin/locks                - list ingest locks
 - GET /admin/lock/<lock>          - query specific ingest lock
 
-- GET /admin/bid/<bid>            - batch listing (dryad will be "JOB_ONLY")
-- GET /admin/bid/<bid>/<age in days>      - batch listing, with age (dryad will be "JOB_ONLY")
+- GET /admin/bid/<bid>            - batch listing )
+- GET /admin/bid/<bid>/<age in days>      - batch listing, with age 
 - GET /admin/bids/<age in days>   - batch listing
 
 - GET /admin/jid-erc/<bid>/<jid>  - Job ERC data

diff --git a/src-colladmin/config/actions.yml b/src-colladmin/config/actions.yml
@@ -453,7 +453,7 @@ cognito-users:
     Users are not created explicitly in the admin tool. A user is created by (1)performing an SSO login or (2)registering as a non-SAML user.  
     This screen contains buttons that could trigger the addition/removal of specific users from a *Cognito User Group*.
 
-    Note: While the tool supports non-SAML users, in practice, we have not authorized any non-SAML users.  This is intended for partners such as Dryad staff.
+    Note: While the tool supports non-SAML users, in practice, we have not authorized any non-SAML users.
   documentation: |
     Aws: Lambda Invoke (Lambda interface to Cognito enpoints)
   migration: m0

diff --git a/src-common/Gemfile.lock b/src-common/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
+    aws-partitions (1.923.0)
     aws-sdk-core (3.194.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

diff --git a/src-testdriver/Gemfile.lock b/src-testdriver/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
+    aws-partitions (1.923.0)
     aws-sdk-core (3.194.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)