[Automated] Merged master into target preview_envs_k8s

modules/vba_documents/app/sidekiq/vba_documents/upload_processor.rb

@@ -21,8 +21,6 @@ class UploadProcessor
     sidekiq_options unique_for: 30.days
 
     def perform(guid, caller_data, retries = 0)
-      return if cancelled?
-
       response = nil
       brt = Benchmark.realtime do
         # @retries variable used via the CentralMail::Utilities which is included via VBADocuments::UploadValidations
@@ -46,20 +44,6 @@ def perform(guid, caller_data, retries = 0)
       response&.success? ? true : false
     end
 
-    def cancelled?
-      Sidekiq.redis do |c|
-        if c.respond_to? :exists?
-          c.exists?("cancelled-#{jid}")
-        else
-          c.exists("cancelled-#{jid}")
-        end
-      end
-    end
-
-    def self.cancel!(jid)
-      Sidekiq.redis { |c| c.setex("cancelled-#{jid}", 86_400, 1) }
-    end
-
     private
 
     # rubocop:disable Metrics/MethodLength

modules/vba_documents/spec/request/v1/uploads_request_spec.rb

@@ -135,7 +135,6 @@
         @md = JSON.parse(valid_metadata)
         @upload_submission = VBADocuments::UploadSubmission.new
         @upload_submission.update(status: 'uploaded')
-        allow_any_instance_of(VBADocuments::UploadProcessor).to receive(:cancelled?).and_return(false)
         allow_any_instance_of(Tempfile).to receive(:size).and_return(1) # must be > 0 or submission will error w/DOC107
         allow(VBADocuments::MultipartParser).to receive(:parse) {
           { 'metadata' => @md.to_json, 'content' => valid_doc }

modules/vba_documents/spec/request/v2/uploads_request_spec.rb

@@ -202,7 +202,6 @@
         @md = JSON.parse(valid_metadata)
         @upload_submission = VBADocuments::UploadSubmission.new
         @upload_submission.update(status: 'uploaded')
-        allow_any_instance_of(VBADocuments::UploadProcessor).to receive(:cancelled?).and_return(false)
         allow_any_instance_of(Tempfile).to receive(:size).and_return(1) # must be > 0 or submission will error w/DOC107
         allow(VBADocuments::MultipartParser).to receive(:parse) {
           { 'metadata' => @md.to_json, 'content' => valid_doc }

modules/vba_documents/spec/sidekiq/upload_processor_spec.rb

@@ -72,7 +72,6 @@
   end
 
   before do
-    allow_any_instance_of(described_class).to receive(:cancelled?).and_return(false)
     allow_any_instance_of(Tempfile).to receive(:size).and_return(1) # must be > 0 or submission will error w/DOC107
     objstore = instance_double(VBADocuments::ObjectStore)
     version = instance_double(Aws::S3::ObjectVersion)