pushmi_pullyu 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4380518d529c79ac7972e3ab29dee3524082df9e66a3f0f1e3eefbb5c08855d
-  data.tar.gz: c43b7f5a944ceb4fafa298ebbb7ec47725a8bbff04a8b04ea51874b6bacc2ba6
+  metadata.gz: 178780e39d4759d4510533ec9e8d73d48f1caafb2903e8b76059d1f63d831418
+  data.tar.gz: 31d7cef11a46cfbee7167f6492f09f721a8f9586624f6793da5b294faab0ae9d
 SHA512:
-  metadata.gz: 0c7e9b00f0e8a6727393da41e9060dff06a6b8aba0baf9f7ed84bbc89e17e0988e1858a8c0bd925983ccda379e249374af0c738be976ec21708a3cf6be35b20e
-  data.tar.gz: 6ed33393e60e371ea74b9eba143ff3ce3f6ddac81954ddf944d68f3d75087f2adc777ac4f8a8db4037c20131201ec0f1325a90d465b3cd06be6fa04a878a728d
+  metadata.gz: 924be7d5609673e1d8ca83f3c320a5d6866e12b6baa04795bfd7b4906e25ee57a7180c9c473c404a55f0ba20aa17da213e81fc4ed401d1a76d256e0775efb3e6
+  data.tar.gz: 2e9978ce931d0b07e7c5efe51f656e49749765691a56285fa2c223292715a6224197fafd08477f02515c04462d9c23cee61a84dfb70327b5ddb010d4bdf5519d

data/CHANGELOG.md

@@ -6,6 +6,12 @@ PushmiPullyu is a Ruby application, whose primary job is to manage the flow of c
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.3]
+ - Refresh authentication token after it expires [#311](https://github.com/ualbertalib/pushmi_pullyu/issues/311)
+
+## [2.1.2]
+ - Simplify get entity code [#280](https://github.com/ualbertalib/pushmi_pullyu/issues/280)
+
 ## [2.1.1]
  - Increase clarity of log files [#433](https://github.com/ualbertalib/pushmi_pullyu/issues/433)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushmi_pullyu (2.1.1)
+    pushmi_pullyu (2.1.3)
       activesupport (>= 5, < 8)
       bagit (~> 0.4)
       connection_pool (~> 2.2)

data/docker-compose.yml

@@ -6,6 +6,8 @@ services:
     # swift auth -v -U test:tester -K testing -A http://localhost:8080/auth/v1.0
     # swift auth
     # swift post ERA
-    image: openstackswift/saio
+    # image: openstackswift/saio
+    # The previously used image was getting connection problems
+    image: openstackswift/saio:change_846891_latest
     ports:
       - '8080:8080'

data/lib/pushmi_pullyu/cli.rb

@@ -199,13 +199,14 @@ class PushmiPullyu::CLI
   def run_preservation_cycle
     begin
       entity = queue.wait_next_item
-      PushmiPullyu::Logging.log_preservation_attempt(entity,
-                                                     queue.get_entity_ingestion_attempt(entity))
-      return unless entity && entity[:type].present? && entity[:uuid].present?
     rescue StandardError => e
       log_exception(e)
     end
 
+    return unless entity && entity[:type].present? && entity[:uuid].present?
+
+    PushmiPullyu::Logging.log_preservation_attempt(entity,
+                                                   queue.get_entity_ingestion_attempt(entity))
     # add additional information about the error context to errors that occur while processing this item.
     Rollbar.scoped(entity_uuid: entity[:uuid]) do
       # Download AIP from Jupiter, bag and tar AIP directory and cleanup after
@@ -225,7 +226,7 @@ class PushmiPullyu::CLI
         queue.add_entity_in_timeframe(entity)
         PushmiPullyu::Logging.log_preservation_fail_and_retry(entity, queue.get_entity_ingestion_attempt(entity), e)
       rescue PushmiPullyu::PreservationQueue::MaxDepositAttemptsReached => e
-        PushmiPullyu::Logging.log_preservation_failure(entity, queue.get_entity_ingestion_attempt(entity), e)
+        PushmiPullyu::Logging.log_preservation_failure(entity, PushmiPullyu.options[:ingestion_attempts], e)
         log_exception(e)
       end
 

data/lib/pushmi_pullyu/swift_depositer.rb

@@ -1,10 +1,7 @@
 require 'digest/md5'
 require 'openstack'
-
 class PushmiPullyu::SwiftDepositer
 
-  attr_reader :swift_connection
-
   def initialize(connection)
     # Generic authentication parameters
     swift_connection_parameters = {
@@ -13,7 +10,11 @@ class PushmiPullyu::SwiftDepositer
       auth_url: connection[:auth_url],
       project_name: connection[:project_name],
       auth_method: 'password',
-      service_type: 'object-store'
+      service_type: 'object-store',
+      # The retry_auth value should be true by default. It is currently set
+      # to nil which causes the connection to die without giving more error
+      # details.
+      retry_auth: true
     }
 
     if connection[:auth_version] == 'v3'
@@ -28,10 +29,8 @@ class PushmiPullyu::SwiftDepositer
 
   def deposit_file(file_name, swift_container)
     file_base_name = File.basename(file_name, '.*')
-
     checksum = Digest::MD5.file(file_name).hexdigest
-
-    era_container = swift_connection.container(swift_container)
+    era_container = @swift_connection.container(swift_container)
 
     # Add swift metadata with in accordance to AIP spec:
     # https://docs.google.com/document/d/154BqhDPAdGW-I9enrqLpBYbhkF9exX9lV3kMaijuwPg/edit#

data/lib/pushmi_pullyu/version.rb

@@ -1,3 +1,3 @@
 module PushmiPullyu
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushmi_pullyu
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Shane Murnaghan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport