defra_ruby_mocks 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463dba0a1c6925c35c0265dfa65a55a6e1a8e7ec33c4e5dc793fa1e51f1b3c01
-  data.tar.gz: 101fea584ee1cbbf481ebe591f1d1e280903a8be16834e3616697ee80be402b8
+  metadata.gz: 6394eef6671bf7402ae9086113fa641729b149df46d6f1fcb6a1d3281c19b742
+  data.tar.gz: 5e0606b7bb200a849cea22cd1abbee314cbbf0449fb7003de05b85be7ef57136
 SHA512:
-  metadata.gz: eb946492539db155e729244008599522dfad177db1536696a8f4d1e7090e9f4a9f03df0f1622add82bb968ab07bba25056b1524f4a19799c2402cd59edd61362
-  data.tar.gz: 70de2d5dfe16524ccc00c3d491a1dc933dce584b434877ab6b8d96c02d31729ff51dc5f9005b87b0301af6769cddc1d0ef22c253b3b2ed8779042f1007702d65
+  metadata.gz: 1dea451c6e0c2e98c913b8d8c5d0c67915a7548a0d3a648f1d891df3c0b4ca40b7c47d8c82ecc2a8b8d9e3a9ec290e07bb628452dfa37fea9e8fa940d381ef5e
+  data.tar.gz: 762b4407b39d0538f7386a3733b915a217dd810c787ca0080b4be8684ed4857349e6b26258e3eb4a7cf74eddf90cfa3c385a3b3df5235fe72dc9d100a9e8540a

data/README.md

@@ -171,10 +171,10 @@ This Govpay mock replicates those 2 interactions with the following url
 
 #### Configuration
 
-In order to use the govpay mock you'll need to provide additional configuration details
+In order to use the govpay mock you'll need to provide additional configuration details:
 
 ```ruby
-# config/initializers/defra_ruby_mocks.rb
+config/initializers/defra_ruby_mocks.rb
 require "defra_ruby_mocks"
 
 DefraRubyMocks.configure do |config|
@@ -184,6 +184,26 @@ end
 
 The domain is used when generating the URL we tell the app to redirect users to. As this is just an engine and not a standalone service, we need to tell it what domain it is running from.
 
+You'll also need to provide AWS configuration details for the mocks, for example:
+
+```ruby
+require "defra_ruby/aws"
+
+DefraRuby::Aws.configure do |c|
+  govpay_mocks_bucket = {
+    name: ENV.fetch("AWS_DEFRA_RUBY_MOCKS_BUCKET", nil),
+    region: ENV.fetch("AWS_REGION", nil),
+    credentials: {
+      access_key_id: ENV.fetch("AWS_DEFRA_RUBY_MOCKS_ACCESS_KEY_ID", nil),
+      secret_access_key: ENV.fetch("AWS_DEFRA_RUBY_MOCKS_SECRET_ACCESS_KEY", nil)
+    },
+    encrypt_with_kms: ENV.fetch("AWS_DEFRA_RUBY_MOCKS_ENCRYPT_WITH_KMS", nil)
+  }
+
+  c.buckets = [govpay_mocks_bucket]
+end
+```
+
 ```ruby
 mount DefraRubyMocks::Engine => "/mocks"
 ```

data/app/controllers/defra_ruby_mocks/govpay_controller.rb

@@ -60,7 +60,7 @@ module DefraRubyMocks
     private
 
     def s3_bucket_name
-      @s3_bucket_name = ENV.fetch("GOVPAY_MOCKS_BUCKET", "defra-ruby-mocks-s3bkt001")
+      @s3_bucket_name = ENV.fetch("AWS_DEFRA_RUBY_MOCKS_BUCKET", nil)
     end
 
     def return_url_file_name

data/app/services/defra_ruby_mocks/aws_bucket_service.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "aws-sdk-s3"
 require "defra_ruby/aws"
 
 module DefraRubyMocks
@@ -18,6 +19,7 @@ module DefraRubyMocks
     def write(bucket_name, file_name, content)
       @bucket_name = bucket_name
       @file_name = file_name
+      Rails.logger.debug ":::::: mocks writing to S3"
 
       write_temp_file(content)
 
@@ -27,12 +29,18 @@ module DefraRubyMocks
     end
 
     def read(bucket_name, file_name)
-      Rails.logger.warn ":::::: reading from S3"
-
-      s3 = Aws::S3::Client.new
-      s3.get_object(bucket: bucket_name, key: file_name)
-    rescue Aws::S3::NoSuchBucket => e
-      raise StandardError, e
+      @bucket_name = bucket_name
+      @file_name = file_name
+      Rails.logger.debug ":::::: mocks reading from S3"
+
+      s3 = Aws::S3::Client.new(
+        region: ENV.fetch("AWS_REGION", nil),
+        credentials: Aws::Credentials.new(
+          ENV.fetch("AWS_DEFRA_RUBY_MOCKS_ACCESS_KEY_ID", nil),
+          ENV.fetch("AWS_DEFRA_RUBY_MOCKS_SECRET_ACCESS_KEY", nil)
+        )
+      )
+      s3.get_object(bucket: bucket_name, key: file_name).body.read
     end
 
     private
@@ -42,12 +50,12 @@ module DefraRubyMocks
     end
 
     def write_temp_file(content)
-      Rails.logger.warn ":::::: creating temp file for #{content}"
+      Rails.logger.debug ":::::: mocks creating temp file for #{content}"
       File.write(temp_filepath, content)
     end
 
     def load_temp_file_to_s3
-      Rails.logger.warn ":::::: loading temp file to S3"
+      Rails.logger.debug ":::::: mocks loading temp file to S3 bucket #{bucket_name}"
 
       result = nil
 

data/lib/defra_ruby_mocks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DefraRubyMocks
-  VERSION = "4.2.1"
+  VERSION = "4.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_mocks
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Defra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails