defra_ruby_aws 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51507ca675b7d5f9bd8d566119f7a771363ba2a8fd8a0cbdf3b60e6744cc8716
-  data.tar.gz: 0c499db00c8fa4d3744c1fb95db7d37764532b7276f97afd87a5f6f8d7cb8000
+  metadata.gz: 615c2177dcd53df53e778f1f66c2b7773bd245cd5944160b8f24a7e077cd2d06
+  data.tar.gz: b9ebf33614bb98115f136f23d58038ecbe972d2ed0b4cd483b1dd9a2bc277179
 SHA512:
-  metadata.gz: 5b1b00ffe99b938cb3be003ef86250f139e163fc1eb3b2b881384da567865ab39f37502931fe1e6fadb1d4730a0577c595f0d70c079a9f8f1f111a07b1ec2e93
-  data.tar.gz: 605b52150f2ff0fef21eb4f2e1bdb72b60d412d4621a5ce8daa732136feeeb40efb5cf1e2062d0639cb7a3dae1cdd46184a89a98b6ff3d8cfd87397dc3578e93
+  metadata.gz: 4badfeadc9868a51e4b17095bd32c2a322a457eadfb2d04df77ee7ce5c63a3ba4851c81daaca0a08e7343e0c1509e8cb0d64f59a108460098652f1a671917502
+  data.tar.gz: 730b22d1f17c17ac76b8d314eb8c3f80f4c7b0e47b321019a3e8bb0f4e28a779a59b8ea44cb8c377e59827418621f6dde9916ca256760c019a0559de04cb792f

data/lib/defra_ruby/aws/bucket.rb

@@ -9,7 +9,7 @@ module DefraRuby
         @credentials = configs[:credentials]
         @bucket_name = configs[:name]
         @region = setup_region(configs[:region])
-        @encrypt_with_kms = setup_encrypt_with_kms(configs[:encrypt_with_kms])
+        @encrypt_with_kms = configs[:encrypt_with_kms].to_s.downcase == "true"
 
         validate!
       end
@@ -56,14 +56,6 @@ module DefraRuby
         "eu-west-1"
       end
 
-      def setup_encrypt_with_kms(encrypt_with_kms)
-        return false if encrypt_with_kms.nil?
-
-        # Handle the argument being either a string or a boolean, or some other
-        # value e.g. "foo"
-        encrypt_with_kms.to_s.downcase == "true"
-      end
-
       def validate!
         validate_presence_of_name!
         validate_presence_of_credentials!

data/lib/defra_ruby/aws/services/bucket_loader_service.rb

@@ -25,12 +25,26 @@ module DefraRuby
 
       def response_exe
         lambda do
-          s3_bucket
-            .object(destination)
-            .upload_file(file.path, server_side_encryption: bucket.encryption_type)
+          transfer_manager.upload_file(
+            file.path,
+            bucket: bucket.bucket_name,
+            key: destination,
+            server_side_encryption: bucket.encryption_type
+          )
         end
       end
 
+      def transfer_manager
+        ::Aws::S3::TransferManager.new(client: s3_client)
+      end
+
+      def s3_client
+        ::Aws::S3::Client.new(
+          region: bucket.region,
+          credentials: aws_credentials
+        )
+      end
+
       def destination
         [*dir, File.basename(file.path)].compact.join("/")
       end

data/lib/defra_ruby/aws/version.rb

@@ -2,6 +2,6 @@
 
 module DefraRuby
   module Aws
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_aws
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Defra
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.197'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.197'
+        version: '0'
 description: Package of AWS features commonly used in Defra Rails based digital services
 email:
 - alan.cruikshanks@environment-agency.gov.uk
@@ -46,29 +45,12 @@ files:
 - lib/defra_ruby/aws/services/list_bucket_files_service.rb
 - lib/defra_ruby/aws/services/presigned_url_service.rb
 - lib/defra_ruby/aws/version.rb
-- spec/defra_ruby_aws_spec.rb
-- spec/examples.txt
-- spec/features/upload_file_to_bucket_spec.rb
-- spec/lib/defra_ruby/aws/bucket_spec.rb
-- spec/lib/defra_ruby/aws/configuration_spec.rb
-- spec/lib/defra_ruby/aws/response_spec.rb
-- spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb
-- spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb
-- spec/lib/defra_ruby/aws/services/list_bucket_files_service_spec.rb
-- spec/lib/defra_ruby/aws/services/presigned_url_service_spec.rb
-- spec/spec_helper.rb
-- spec/support/aws_sdk_s3.rb
-- spec/support/defra_ruby_aws.rb
-- spec/support/dotenv.rb
-- spec/support/pry.rb
-- spec/support/simplecov.rb
-- spec/support/webmock.rb
 homepage: https://github.com/DEFRA/defra-ruby-aws
 licenses:
 - Open Government Licence v3.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -83,25 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Defra ruby on rails AWS helpers
-test_files:
-- spec/defra_ruby_aws_spec.rb
-- spec/spec_helper.rb
-- spec/examples.txt
-- spec/features/upload_file_to_bucket_spec.rb
-- spec/support/defra_ruby_aws.rb
-- spec/support/aws_sdk_s3.rb
-- spec/support/simplecov.rb
-- spec/support/webmock.rb
-- spec/support/pry.rb
-- spec/support/dotenv.rb
-- spec/lib/defra_ruby/aws/configuration_spec.rb
-- spec/lib/defra_ruby/aws/response_spec.rb
-- spec/lib/defra_ruby/aws/bucket_spec.rb
-- spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb
-- spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb
-- spec/lib/defra_ruby/aws/services/presigned_url_service_spec.rb
-- spec/lib/defra_ruby/aws/services/list_bucket_files_service_spec.rb
+test_files: []

data/spec/defra_ruby_aws_spec.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe DefraRuby::Aws do
-  it "has a version number" do
-    expect(DefraRuby::Aws::VERSION).not_to be nil
-  end
-end

data/spec/examples.txt

@@ -1,48 +0,0 @@
-example_id                                                                            | status | run_time        |
-------------------------------------------------------------------------------------- | ------ | --------------- |
-./spec/defra_ruby_aws_spec.rb[1:1]                                                    | passed | 0.0016 seconds  |
-./spec/features/upload_file_to_bucket_spec.rb[1:1]                                    | passed | 0.02788 seconds |
-./spec/features/upload_file_to_bucket_spec.rb[1:2]                                    | passed | 0.0197 seconds  |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:1:1]                                     | passed | 0.00011 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:2:1]                                     | passed | 0.00254 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:3:1]                                     | passed | 0.00015 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:4:1]                                     | passed | 0.00012 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:5:1:1]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:5:2:1]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:6:1]                                     | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:7:1:1]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:7:1:2]                                   | passed | 0.00008 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:7:2:1]                                   | passed | 0.0001 seconds  |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:7:2:2]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:1:1]                                   | passed | 0.0001 seconds  |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:1:2]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:2:1]                                   | passed | 0.00015 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:2:2]                                   | passed | 0.0001 seconds  |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:3:1]                                   | passed | 0.00013 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:3:2]                                   | passed | 0.00011 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:4:1]                                   | passed | 0.0001 seconds  |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:4:2]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:5:1]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:1:8:5:2]                                   | passed | 0.00009 seconds |
-./spec/lib/defra_ruby/aws/bucket_spec.rb[1:2:1]                                       | passed | 0.00052 seconds |
-./spec/lib/defra_ruby/aws/configuration_spec.rb[1:1:1]                                | passed | 0.00064 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:1:1:1]                                   | passed | 0.00014 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:1:2:1]                                   | passed | 0.0002 seconds  |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:1:3:1]                                   | passed | 0.00035 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:1:4:1]                                   | passed | 0.00014 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:1:5:1]                                   | passed | 0.00014 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:2:1:1]                                   | passed | 0.00274 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:3:1:1]                                   | passed | 0.00453 seconds |
-./spec/lib/defra_ruby/aws/response_spec.rb[1:3:2:1]                                   | passed | 0.0003 seconds  |
-./spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb[1:1:1:1]             | passed | 0.0007 seconds  |
-./spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb[1:1:1:2:1]           | passed | 0.00069 seconds |
-./spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb[1:1:2:1]             | passed | 0.00063 seconds |
-./spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb[1:1:2:2:1]           | passed | 0.00068 seconds |
-./spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb[1:1:1]     | passed | 0.04121 seconds |
-./spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb[1:1:2:1]   | passed | 0.00086 seconds |
-./spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb[1:1:3:1]   | passed | 0.00103 seconds |
-./spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb[1:1:3:2:1] | passed | 0.00087 seconds |
-./spec/lib/defra_ruby/aws/services/list_bucket_files_service_spec.rb[1:1:1:1]         | passed | 0.00649 seconds |
-./spec/lib/defra_ruby/aws/services/list_bucket_files_service_spec.rb[1:1:2:1]         | passed | 0.00144 seconds |
-./spec/lib/defra_ruby/aws/services/presigned_url_service_spec.rb[1:1:1]               | passed | 0.53559 seconds |
-./spec/lib/defra_ruby/aws/services/presigned_url_service_spec.rb[1:1:2:1]             | passed | 0.00344 seconds |

data/spec/features/upload_file_to_bucket_spec.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe "Defra Ruby AWS" do
-  it "Upload a file to an AWS bucket" do
-    configure_gem
-    stub_successful_request
-
-    bucket = DefraRuby::Aws.get_bucket("bulk-test")
-    response = bucket.load(Tempfile.new("test-bucket-load.test"))
-
-    expect(response).to be_successful
-  end
-
-  it "fails gracefully" do
-    configure_gem
-    stub_failing_request
-
-    bucket = DefraRuby::Aws.get_bucket("bulk-test")
-    response = bucket.load(Tempfile.new("test-bucket-load.test"))
-
-    expect(response).to_not be_successful
-    expect(response.error).to be_a(Aws::S3::Errors::Forbidden)
-  end
-
-  def configure_gem
-    DefraRuby::Aws.configure do |config|
-      config.buckets = [{
-        name: "bulk-test",
-        credentials: {
-          access_key_id: "ACCESS_KEY_ID",
-          secret_access_key: "SECRET_ACCESS_KEY"
-        }
-      }]
-    end
-  end
-
-  def stub_successful_request
-    stub_request(:put, %r{https://bulk-test\.s3\.eu-west-1\.amazonaws\.com/test-bucket-load\..+})
-  end
-
-  def stub_failing_request
-    stub_request(
-      :put,
-      %r{https://bulk-test\.s3\.eu-west-1\.amazonaws\.com/test-bucket-load\..+}
-    ).to_return(
-      status: 403
-    )
-  end
-end

data/spec/lib/defra_ruby/aws/bucket_spec.rb

@@ -1,241 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe Bucket do
-      subject(:bucket) { described_class.new(configs) }
-
-      let(:credentials) { { access_key_id: "access_key", secret_access_key: "secret" } }
-
-      describe "#initialize" do
-        context "when a name configuration is missing" do
-          let(:configs) do
-            {
-              name: nil,
-              credentials: {}
-            }
-          end
-
-          it "raises an error" do
-            expect { bucket }.to raise_error("DefraRuby::Aws buckets configurations: missing bucket name")
-          end
-        end
-
-        context "when credentials configuration is missing" do
-          let(:configs) do
-            {
-              name: "foo",
-              credentials: {}
-            }
-          end
-
-          it "raises an error" do
-            expect { bucket }.to raise_error("DefraRuby::Aws buckets configurations: missing credentials for bucket foo")
-          end
-        end
-
-        context "when credentials access key id is missing" do
-          let(:configs) do
-            {
-              name: "foo",
-              credentials: {
-                secret_access_key: "secret"
-              }
-            }
-          end
-
-          it "raises an error" do
-            expect { bucket }.to raise_error("DefraRuby::Aws buckets configurations: missing access key id for bucket foo")
-          end
-        end
-
-        context "when credentials secret access key is missing" do
-          let(:configs) do
-            {
-              name: "foo",
-              credentials: {
-                access_key_id: "access_key"
-              }
-            }
-          end
-
-          it "raises an error" do
-            expect { bucket }.to raise_error("DefraRuby::Aws buckets configurations: missing secret access key for bucket foo")
-          end
-        end
-
-        context "when 'region' is not set" do
-          context "because it has not been added to the config" do
-            let(:configs) do
-              {
-                name: "foo",
-                credentials: credentials
-              }
-            end
-
-            it "defaults the region to 'eu-west-1'" do
-              expect(bucket.region).to eq("eu-west-1")
-            end
-          end
-
-          context "because its value is an empty string" do
-            let(:configs) do
-              {
-                name: "foo",
-                credentials: credentials,
-                region: ""
-              }
-            end
-
-            it "defaults the region to 'eu-west-1'" do
-              expect(bucket.region).to eq("eu-west-1")
-            end
-          end
-        end
-
-        context "when 'region' is set" do
-          let(:region) { "eu-west-2" }
-          let(:configs) do
-            {
-              name: "foo",
-              credentials: credentials,
-              region: region
-            }
-          end
-
-          it "sets the region to match" do
-            expect(bucket.region).to eq(region)
-          end
-        end
-
-        context "when 'encrypt_with_kms' is not set" do
-          context "because it has not been added to the config" do
-            let(:configs) do
-              {
-                name: "foo",
-                credentials: credentials
-              }
-            end
-
-            it "defaults encrypt_with_kms to false" do
-              expect(bucket.encrypt_with_kms).to be false
-            end
-
-            it "sets encryption_type to :AES256" do
-              expect(bucket.encryption_type).to eq(:AES256)
-            end
-          end
-
-          context "because its value is an empty string" do
-            let(:configs) do
-              {
-                name: "foo",
-                credentials: credentials,
-                encrypt_with_kms: ""
-              }
-            end
-
-            it "defaults encrypt_with_kms to false" do
-              expect(bucket.encrypt_with_kms).to be false
-            end
-
-            it "sets encryption_type to :AES256" do
-              expect(bucket.encryption_type).to eq(:AES256)
-            end
-          end
-        end
-
-        context "when 'encrypt_with_kms' is set" do
-          let(:encrypt_with_kms) { true }
-          let(:configs) do
-            {
-              name: "foo",
-              credentials: credentials,
-              encrypt_with_kms: encrypt_with_kms
-            }
-          end
-
-          context "to true as a boolean" do
-            let(:encrypt_with_kms) { true }
-
-            it "defaults encrypt_with_kms to true" do
-              expect(bucket.encrypt_with_kms).to be true
-            end
-
-            it "sets encryption_type to aws:kms" do
-              expect(bucket.encryption_type).to eq("aws:kms")
-            end
-          end
-
-          context "to true as a string" do
-            let(:encrypt_with_kms) { "true" }
-
-            it "defaults encrypt_with_kms to true" do
-              expect(bucket.encrypt_with_kms).to be true
-            end
-
-            it "sets encryption_type to aws:kms" do
-              expect(bucket.encryption_type).to eq("aws:kms")
-            end
-          end
-
-          context "to false as a boolean" do
-            let(:encrypt_with_kms) { false }
-
-            it "defaults encrypt_with_kms to false" do
-              expect(bucket.encrypt_with_kms).to be false
-            end
-
-            it "sets encryption_type to aws:kms" do
-              expect(bucket.encryption_type).to eq(:AES256)
-            end
-          end
-
-          context "to false as a string" do
-            let(:encrypt_with_kms) { "false" }
-
-            it "defaults encrypt_with_kms to false" do
-              expect(bucket.encrypt_with_kms).to be false
-            end
-
-            it "sets encryption_type to aws:kms" do
-              expect(bucket.encryption_type).to eq(:AES256)
-            end
-          end
-
-          context "to something not recognised" do
-            let(:encrypt_with_kms) { "bar" }
-
-            it "defaults encrypt_with_kms to false" do
-              expect(bucket.encrypt_with_kms).to be false
-            end
-
-            it "sets encryption_type to :AES256" do
-              expect(bucket.encryption_type).to eq(:AES256)
-            end
-          end
-        end
-      end
-
-      describe "#load" do
-        let(:configs) do
-          {
-            name: "foo",
-            credentials: credentials
-          }
-        end
-
-        it "loads the given file to the s3 bucket" do
-          result = double(:result)
-          file = double(:file)
-          options = double(:options)
-
-          expect(BucketLoaderService).to receive(:run).with(bucket, file, options).and_return(result)
-          expect(bucket.load(file, options)).to eq(result)
-        end
-      end
-    end
-  end
-end

data/spec/lib/defra_ruby/aws/configuration_spec.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe Configuration do
-      subject(:configuration) { described_class.new }
-
-      describe "#buckets=" do
-        let(:buckets) { %i[foo bar baz] }
-
-        it "creates a list of buckets" do
-          expect(Bucket).to receive(:new).with(:foo)
-          expect(Bucket).to receive(:new).with(:bar)
-          expect(Bucket).to receive(:new).with(:baz)
-
-          configuration.buckets = buckets
-        end
-      end
-    end
-  end
-end

data/spec/lib/defra_ruby/aws/response_spec.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe Response do
-      subject(:response) { described_class.new(response_exe) }
-
-      describe "#successful?" do
-        context "when the response throws an error" do
-          let(:response_exe) { -> { raise "Boom!" } }
-
-          it "returns false" do
-            expect(response).to_not be_successful
-          end
-        end
-
-        context "when the response don't throw an error" do
-          let(:response_exe) { -> { true } }
-
-          it "returns true" do
-            expect(response).to be_successful
-          end
-        end
-
-        context "when the response returns a nil object" do
-          let(:response_exe) { -> { nil } }
-
-          it "returns false" do
-            expect(response).to_not be_successful
-          end
-        end
-
-        context "when the response returns false" do
-          let(:response_exe) { -> { false } }
-
-          it "returns false" do
-            expect(response).to_not be_successful
-          end
-        end
-
-        context "when the response returns an object" do
-          let(:response_exe) { -> { "I am an object" } }
-
-          it "returns true" do
-            expect(response).to be_successful
-          end
-        end
-      end
-
-      describe "#result" do
-        context "when the response includes a result object" do
-          let(:response_exe) { -> { "I am an object" } }
-
-          it "returns the s3 result object" do
-            expect(described_class.new(response_exe).result).to eq "I am an object"
-          end
-        end
-      end
-
-      describe "#error" do
-        context "when the response throws an error" do
-          let(:response_exe) { -> { raise StandardError, "Boom!" } }
-
-          it "returns the error" do
-            expect(response.error).to be_a(StandardError)
-          end
-        end
-
-        context "when the response don't throw an error" do
-          let(:response_exe) { -> { true } }
-
-          it "returns a nil object" do
-            expect(response.error).to be_nil
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/defra_ruby/aws/services/bucket_loader_service_spec.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe BucketLoaderService do
-
-      describe "#run" do
-        let(:credentials) { { access_key_id: "key_id", secret_access_key: "secret" } }
-        let(:bucket) { Bucket.new(configs) }
-
-        context "when 'encrypt_with_kms' is not set" do
-          let(:configs) do
-            {
-              credentials: credentials,
-              name: "bulk"
-            }
-          end
-
-          it "loads the given file to the s3 bucket using :AES256" do
-            aws_resource = double(:aws_resource)
-            s3_bucket = double(:s3_bulk_bucket)
-            file = double(:file, path: "foo/bar/baz/test.csv")
-            s3_object = double(:s3_object)
-            result = double(:result)
-
-            expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-            expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-            expect(s3_bucket).to receive(:object).with("test.csv").and_return(s3_object)
-            expect(s3_object).to receive(:upload_file).with("foo/bar/baz/test.csv", server_side_encryption: :AES256).and_return(result)
-
-            expect(described_class.run(bucket, file)).to be_a(Response)
-          end
-
-          context "when an s3_directory is provided" do
-            it "loads the given file to the s3 bucket at the correct location using AWS:KMS" do
-              aws_resource = double(:aws_resource)
-              s3_bucket = double(:s3_bulk_bucket)
-              file = double(:file, path: "foo/bar/baz/test.csv")
-              s3_object = double(:s3_object)
-              result = double(:result)
-              options = { s3_directory: "directory" }
-
-              expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-              expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-              expect(s3_bucket).to receive(:object).with("directory/test.csv").and_return(s3_object)
-              expect(s3_object).to receive(:upload_file).with("foo/bar/baz/test.csv", server_side_encryption: :AES256).and_return(result)
-
-              expect(described_class.run(bucket, file, options)).to be_a(Response)
-            end
-          end
-        end
-
-        context "when 'encrypt_with_kms' is set" do
-          let(:configs) do
-            {
-              credentials: credentials,
-              name: "bulk",
-              encrypt_with_kms: true
-            }
-          end
-
-          it "loads the given file to the s3 bucket using AWS:KMS" do
-            aws_resource = double(:aws_resource)
-            s3_bucket = double(:s3_bulk_bucket)
-            file = double(:file, path: "foo/bar/baz/test.csv")
-            s3_object = double(:s3_object)
-            result = double(:result)
-
-            expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-            expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-            expect(s3_bucket).to receive(:object).with("test.csv").and_return(s3_object)
-            expect(s3_object).to receive(:upload_file).with("foo/bar/baz/test.csv", server_side_encryption: "aws:kms").and_return(result)
-
-            expect(described_class.run(bucket, file)).to be_a(Response)
-          end
-
-          context "when an s3_directory is provided" do
-            it "loads the given file to the s3 bucket at the correct location using AWS:KMS" do
-              aws_resource = double(:aws_resource)
-              s3_bucket = double(:s3_bulk_bucket)
-              file = double(:file, path: "foo/bar/baz/test.csv")
-              s3_object = double(:s3_object)
-              result = double(:result)
-              options = { s3_directory: %w[directory second_directory] }
-
-              expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-              expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-              expect(s3_bucket).to receive(:object).with("directory/second_directory/test.csv").and_return(s3_object)
-              expect(s3_object).to receive(:upload_file).with("foo/bar/baz/test.csv", server_side_encryption: "aws:kms").and_return(result)
-
-              expect(described_class.run(bucket, file, options)).to be_a(Response)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/defra_ruby/aws/services/delete_file_from_bucket_service_spec.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe DeleteFileFromBucketService do
-      describe "#run" do
-        let(:configs) do
-          {
-            credentials: {
-              access_key_id: "key_id",
-              secret_access_key: "secret"
-            },
-            name: "bulk"
-          }
-        end
-        let(:bucket) { Bucket.new(configs) }
-
-        it "returns a successful response" do
-          aws_resource = double(:aws_resource)
-          s3_bucket = double(:s3_bulk_bucket)
-          file_name = "test.csv"
-          s3_object = double(:s3_object)
-          result = double(:result, request_charged: "present")
-
-          expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-          expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-          expect(s3_bucket).to receive(:object).with("test.csv").and_return(s3_object)
-          expect(s3_object).to receive(:delete).and_return(result)
-
-          response = described_class.run(bucket, file_name)
-          expect(response).to be_successful
-        end
-
-        context "when an s3_directory is provided" do
-          it "returns a successful response" do
-            aws_resource = double(:aws_resource)
-            s3_bucket = double(:s3_bulk_bucket)
-            file_name = "test.csv"
-            s3_object = double(:s3_object)
-            result = double(:result, request_charged: "present")
-            options = { s3_directory: "directory" }
-
-            expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-            expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-            expect(s3_bucket).to receive(:object).with("directory/test.csv").and_return(s3_object)
-            expect(s3_object).to receive(:delete).and_return(result)
-
-            response = described_class.run(bucket, file_name, options)
-            expect(response).to be_successful
-          end
-        end
-
-        context "when the response body returns an empty charged requests" do
-          it "returns a non successful response" do
-            aws_resource = double(:aws_resource)
-            s3_bucket = double(:s3_bulk_bucket)
-            file_name = "test.csv"
-            s3_object = double(:s3_object)
-            result = double(:result, request_charged: "")
-
-            expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-            expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-            expect(s3_bucket).to receive(:object).with("test.csv").and_return(s3_object)
-            expect(s3_object).to receive(:delete).and_return(result)
-
-            response = described_class.run(bucket, file_name)
-            expect(response).to_not be_successful
-          end
-
-          context "when an s3_directory is provided" do
-            it "returns a non successful response" do
-              aws_resource = double(:aws_resource)
-              s3_bucket = double(:s3_bulk_bucket)
-              file_name = "test.csv"
-              s3_object = double(:s3_object)
-              result = double(:result, request_charged: "")
-              options = { s3_directory: %w[directory second_directory] }
-
-              expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-              expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-              expect(s3_bucket).to receive(:object).with("directory/second_directory/test.csv").and_return(s3_object)
-              expect(s3_object).to receive(:delete).and_return(result)
-
-              response = described_class.run(bucket, file_name, options)
-              expect(response).to_not be_successful
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/defra_ruby/aws/services/list_bucket_files_service_spec.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe ListBucketFilesService do
-      describe "#run" do
-        let(:configs) do
-          {
-            credentials: {
-              access_key_id: "key_id",
-              secret_access_key: "secret"
-            },
-            name: "bulk"
-          }
-        end
-        let(:bucket) { Bucket.new(configs) }
-
-        context "when an s3_directory is provided" do
-          it "returns a successful response" do
-            aws_resource = double(:aws_resource)
-            s3_bucket = double(:s3_bulk_bucket)
-            s3_object1 = double(:s3_object)
-            s3_object2 = double(:s3_object)
-            s3_objects = [s3_object1, s3_object2]
-            s3_directory = "/a_directory"
-            options = {}
-
-            expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-            expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-            expect(s3_bucket).to receive(:objects).with(prefix: s3_directory).and_return(s3_objects)
-            expect(s3_object1).to receive(:key).and_return("object1").at_least(:once)
-            expect(s3_object2).to receive(:key).and_return("object2").at_least(:once)
-
-            response = described_class.run(bucket, s3_directory, options)
-            expect(response).to be_successful
-            expect(response.result).to match_array([s3_object1.key, s3_object2.key])
-          end
-        end
-
-        context "when an s3_directory is not provided" do
-          it "returns a non successful response" do
-            aws_resource = double(:aws_resource)
-            s3_bucket = double(:s3_bulk_bucket)
-            s3_directory = nil
-
-            expect(::Aws::S3::Resource).to receive(:new).and_return(aws_resource)
-            expect(aws_resource).to receive(:bucket).with("bulk").and_return(s3_bucket)
-            expect(s3_bucket).to receive(:objects).with(prefix: s3_directory).and_return(nil)
-
-            response = described_class.run(bucket, s3_directory)
-            expect(response).to_not be_successful
-            expect(response.result).to be_nil
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/defra_ruby/aws/services/presigned_url_service_spec.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module DefraRuby
-  module Aws
-    RSpec.describe PresignedUrlService do
-      describe ".run" do
-        let(:configs) do
-          {
-            name: "test",
-            credentials: {
-              access_key_id: "123",
-              secret_access_key: "Secret"
-            }
-          }
-        end
-        let(:bucket) { Bucket.new(configs) }
-        let(:presigned_url) { described_class.run(bucket, "testfile.csv") }
-
-        it "returns a presigned url for a given file in the bucket" do
-          expect(presigned_url).to include("https://test.s3.eu-west-1.amazonaws.com/testfile.csv")
-          expect(presigned_url).to include("response-content-disposition=attachment")
-          expect(presigned_url).to include("response-content-type=text%2Fcsv")
-          expect(presigned_url).to include("Amz-Expires")
-          expect(presigned_url).to include("Amz-Credential")
-          expect(presigned_url).to include("Amz-Signature")
-        end
-
-        context "when an s3_directory is provided" do
-          let(:presigned_url) { described_class.run(bucket, "testfile.csv", { s3_directory: "directory" }) }
-
-          it "returns a presigned url for a given file in the bucket" do
-            expect(presigned_url).to include("https://test.s3.eu-west-1.amazonaws.com/directory/testfile.csv")
-            expect(presigned_url).to include("response-content-disposition=attachment")
-            expect(presigned_url).to include("response-content-type=text%2Fcsv")
-            expect(presigned_url).to include("Amz-Expires")
-            expect(presigned_url).to include("Amz-Credential")
-            expect(presigned_url).to include("Amz-Signature")
-          end
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-
-# Require and run our simplecov initializer as the very first thing we do.
-# This is as per its docs https://github.com/colszowka/simplecov#getting-started
-require "./spec/support/simplecov"
-
-# Requires supporting ruby files with custom matchers and macros, etc, in
-# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
-# run as spec files by default. This means that files in spec/support that end
-# in _spec.rb will both be required and run as specs, causing the specs to be
-# run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with the --pattern
-# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-#
-# We make an exception for simplecov because that will already have been
-# required and run at the very top of spec_helper.rb
-support_files = Dir["./spec/support/**/*.rb"].reject { |file| file == "./spec/support/simplecov.rb" }
-support_files.each { |f| require f }
-
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  config.filter_run_when_matching :focus
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  config.disable_monkey_patching!
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-end

data/spec/support/aws_sdk_s3.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Gem that allows us to integrate with AWS S3 (cloud storage)
-require "aws-sdk-s3"

data/spec/support/defra_ruby_aws.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Need to require our actual code files.
-require "defra_ruby/aws"

data/spec/support/dotenv.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Load env vars from a text file
-require "dotenv/load"

data/spec/support/pry.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-# Support debugging in the tests. Add `binding.pry` wherever you want execution
-# to stop and the debugger to kick in.
-# Details on the debugging commands can be found here
-# https://github.com/deivid-rodriguez/pry-byebug#commands
-require "pry-byebug"

data/spec/support/simplecov.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "simplecov"
-
-# We start it with the rails param to ensure it includes coverage for all code
-# started by the rails app, and not just the files touched by our unit tests.
-# This gives us the most accurate assessment of our unit test coverage
-# https://github.com/colszowka/simplecov#getting-started
-SimpleCov.start do
-  # We filter the spec folder, mainly to ensure that any dummy apps don't get
-  # included in the coverage report. However our intent is that nothing in the
-  # spec folder should be included
-  add_filter "/spec/"
-  # The version file is simply just that, so we do not feel the need to ensure
-  # we have a test for it
-  add_filter "lib/defra_ruby/aws/version"
-end

data/spec/support/webmock.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Library for stubbing and setting expectations on HTTP requests in Ruby
-require "webmock/rspec"