Skip to content

Commit

Permalink
Iterates the Fedora version after update to v4.7.6 (#1548). (#2229)
Browse files Browse the repository at this point in the history
  • Loading branch information
bwatson78 authored Dec 5, 2023
1 parent f04531d commit 58dc646
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ flycheck_*.el
/.bundle
/vendor/bundle

.env.development
.env*

# ignore branding path
public/branding
Expand Down
6 changes: 3 additions & 3 deletions app/jobs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -165,15 +165,15 @@ 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`
- `Message Digest Calculation`: denotes the calculation of a file's checksum.
- 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`
2 changes: 1 addition & 1 deletion app/jobs/fixity_check_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/characterization_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/job_io_wrapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/preservation_events_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down

0 comments on commit 58dc646

Please sign in to comment.