Merge 1fa6e08 into c3bdaf6

app/lib/preservation_catalog/s3/audit.rb

@@ -5,7 +5,7 @@ module S3
     # Methods for auditing checking the state of a ZippedMoabVersion on an S3 endpoint.  Requires AWS credentials are
     # available in the environment.  At the time of this comment, ONLY running queue workers will have proper creds loaded.
     class Audit
-      delegate :bucket, :bucket_name, to: ::PreservationCatalog::S3
+      delegate :bucket_name, to: ::PreservationCatalog::S3
 
       attr_reader :zmv, :results
 
@@ -72,6 +72,14 @@ def check_existence(aws_s3_object, part)
           false
         end
       end
+
+      def bucket
+        endpoint = zmv.zip_endpoint.endpoint_name
+        ::PreservationCatalog::S3.configure(region: Settings.zip_endpoints[endpoint].region,
+                                            access_key_id: Settings.zip_endpoints[endpoint].access_key_id,
+                                            secret_access_key: Settings.zip_endpoints[endpoint].secret_access_key)
+        ::PreservationCatalog::S3.bucket
+      end
     end
   end
 end

spec/lib/preservation_catalog/s3/audit_spec.rb

@@ -3,7 +3,12 @@
 require 'rails_helper'
 
 RSpec.describe PreservationCatalog::S3::Audit do
-  let(:zmv) { create(:zipped_moab_version) }
+  let(:zip_endpoint) do
+    ZipEndpoint.find_by(endpoint_name: 'aws_s3_west_2')
+  end
+  let(:zmv) do
+    create(:zipped_moab_version, zip_endpoint: zip_endpoint)
+  end
   let(:cm) { zmv.complete_moab }
   let(:bucket) { instance_double(Aws::S3::Bucket) }
   let(:bucket_name) { "sul-sdr-us-west-bucket" }
@@ -16,6 +21,7 @@
     allow(AuditResults).to receive(:new).and_return(results)
     allow(PreservationCatalog::S3).to receive(:bucket).and_return(bucket)
     allow(PreservationCatalog::S3).to receive(:bucket_name).and_return(bucket_name)
+    allow(PreservationCatalog::S3).to receive(:configure)
   end
 
   context 'some parts are unreplicated' do
@@ -45,6 +51,13 @@
         .to change { ok_part.reload.last_existence_check }.from(nil)
         .and change { ok_part.reload.last_checksum_validation }.from(nil)
     end
+
+    it 'configures S3' do
+      described_class.check_replicated_zipped_moab_version(zmv, results)
+      expect(PreservationCatalog::S3).to have_received(:configure).with(region: 'us-west-2',
+                                                                        access_key_id: 'overridden-by-env-var-in-ci',
+                                                                        secret_access_key: 'overridden-by-env-var-in-ci')
+    end
   end
 
   context 'all parts listed as ok, but no parts exist on s3' do