From 58dc64651716fffd87385e185bc42744fa80c733 Mon Sep 17 00:00:00 2001 From: Brad Watson Date: Tue, 5 Dec 2023 09:15:09 -0600 Subject: [PATCH] Iterates the Fedora version after update to v4.7.6 (#1548). (#2229) --- .gitignore | 2 +- app/jobs/README.md | 6 +++--- app/jobs/fixity_check_job.rb | 2 +- config/initializers/characterization_service.rb | 2 +- config/initializers/job_io_wrapper.rb | 2 +- .../jobs/process_aws_fixity_preservation_events_job_spec.rb | 2 +- spec/lib/preservation_events_spec.rb | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8155a77f..4f454193 100644 --- a/.gitignore +++ b/.gitignore @@ -90,7 +90,7 @@ flycheck_*.el /.bundle /vendor/bundle -.env.development +.env* # ignore branding path public/branding diff --git a/app/jobs/README.md b/app/jobs/README.md index 6d87571a..218c8e4d 100644 --- a/app/jobs/README.md +++ b/app/jobs/README.md @@ -149,7 +149,7 @@ The following are the types of Preservation Events the Curate application record - Records: - `start`: date and time when the event started. - `outcome`: "Success"/"Failure" - - `software_version`: "Fedora v4.7.5" + - `software_version`: "Fedora v4.7.6" - `user`: user that initiates the check. - `details`: either "Fixity intact for file: < file name >: sha1:< sha1 value >" or "Fixity check failed for: < file name >: sha1:< sha1 value >" - Event created in: `FixityCheckJob` @@ -165,7 +165,7 @@ The following are the types of Preservation Events the Curate application record - Records: - `start`: date and time when the ingest started. - `outcome`: "Success"/"Failure" - - `software_version`: "Fedora v4.7.5" + - `software_version`: "Fedora v4.7.6" - `user`: user that submitted the file. - `details`: either "< file name > submitted for preservation storage" or "< file name > could not be submitted for preservation storage" - Event created in: `JobIoWrapper#ingest_file` @@ -173,7 +173,7 @@ The following are the types of Preservation Events the Curate application record - Records: - `start`: date and time when the calculation started. - `outcome`: "Success"/"Failure" - - `software_version`: "FITS v1.5.0, Fedora v4.7.5, Ruby Digest library" + - `software_version`: "FITS v1.5.0, Fedora v4.7.6, Ruby Digest library" - `user`: user that deposited the file. - `details`: an array of the checksums. - Event created in: `Hydra::Works::CharacterizationServic#append_original_checksum` \ No newline at end of file diff --git a/app/jobs/fixity_check_job.rb b/app/jobs/fixity_check_job.rb index e0a863ca..b7e5bade 100644 --- a/app/jobs/fixity_check_job.rb +++ b/app/jobs/fixity_check_job.rb @@ -66,7 +66,7 @@ def file_set_preservation_event(log, file_set_id, file_id, event_start, initiati @logger = Logger.new(STDOUT) fixity_file_set = ::FileSet.find(file_set_id) fixity_file = Hydra::PCDM::File.find(file_id) - event = { 'type' => 'Fixity Check', 'start' => event_start, 'software_version' => 'Fedora v4.7.5', 'user' => initiating_user } + event = { 'type' => 'Fixity Check', 'start' => event_start, 'software_version' => 'Fedora v4.7.6', 'user' => initiating_user } if log == true event['outcome'] = 'Success' event['details'] = "Fixity intact for file: #{fixity_file&.original_name}: sha1:#{fixity_file&.checksum&.value}" diff --git a/config/initializers/characterization_service.rb b/config/initializers/characterization_service.rb index a15612ee..1aea0197 100644 --- a/config/initializers/characterization_service.rb +++ b/config/initializers/characterization_service.rb @@ -49,7 +49,7 @@ def digest_preservation_event(file_set_id, event_start, value) file_set = FileSet.find(file_set_id) # create event for digest calculation/failure event = { 'type' => 'Message Digest Calculation', 'start' => event_start, 'details' => value, - 'software_version' => 'FITS v1.5.0, Fedora v4.7.5, Ruby Digest library', 'user' => @user.presence || file_set.depositor } + 'software_version' => 'FITS v1.5.0, Fedora v4.7.6, Ruby Digest library', 'user' => @user.presence || file_set.depositor } event['outcome'] = value.size == 3 ? 'Success' : 'Failure' create_preservation_event(file_set, event) end diff --git a/config/initializers/job_io_wrapper.rb b/config/initializers/job_io_wrapper.rb index e3dab21b..45c0ef7e 100644 --- a/config/initializers/job_io_wrapper.rb +++ b/config/initializers/job_io_wrapper.rb @@ -48,7 +48,7 @@ def size # create preservation_event for fileset creation (method in PreservationEvents module) def file_set_preservation_event(file_set, event_start, outcome, details) event = { 'type' => 'File submission', 'start' => event_start, 'outcome' => outcome, 'details' => details, - 'software_version' => 'Fedora v4.7.5', 'user' => user.uid } + 'software_version' => 'Fedora v4.7.6', 'user' => user.uid } create_preservation_event(file_set, event) end end diff --git a/spec/jobs/process_aws_fixity_preservation_events_job_spec.rb b/spec/jobs/process_aws_fixity_preservation_events_job_spec.rb index 2ee7a9e0..70b4f0c0 100644 --- a/spec/jobs/process_aws_fixity_preservation_events_job_spec.rb +++ b/spec/jobs/process_aws_fixity_preservation_events_job_spec.rb @@ -39,7 +39,7 @@ let(:event) do { 'type' => 'Fixity Check', 'start' => start, 'end' => 'Wed, 08 Mar 2023 16:45:16 +0000', 'details' => "Fixity intact for sha1:#{sha1} in aws_bucket", - 'software_version' => 'Fedora v4.7.5', 'user' => 'bobsuruncle', 'outcome' => 'Success' } + 'software_version' => 'Fedora v4.7.6', 'user' => 'bobsuruncle', 'outcome' => 'Success' } end it 'stops duplicates from happening' do diff --git a/spec/lib/preservation_events_spec.rb b/spec/lib/preservation_events_spec.rb index ad410061..0d3ceced 100644 --- a/spec/lib/preservation_events_spec.rb +++ b/spec/lib/preservation_events_spec.rb @@ -10,7 +10,7 @@ let(:event) do { 'type' => 'Fixity Check', 'start' => start, 'end' => 'Wed, 08 Mar 2023 16:45:16 +0000', 'details' => "Fixity intact for sha1:#{sha1} in aws_bucket", - 'software_version' => 'Fedora v4.7.5', 'user' => 'bobsuruncle', 'outcome' => 'Success' } + 'software_version' => 'Fedora v4.7.6', 'user' => 'bobsuruncle', 'outcome' => 'Success' } end before { create_preservation_event(file_set, event) }