defra_ruby_mocks 4.2.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463dba0a1c6925c35c0265dfa65a55a6e1a8e7ec33c4e5dc793fa1e51f1b3c01
-  data.tar.gz: 101fea584ee1cbbf481ebe591f1d1e280903a8be16834e3616697ee80be402b8
+  metadata.gz: a608d402c9667f9aef72c67f4ae1edf115d0385b4315e37e6c926d1c79d92958
+  data.tar.gz: 2d8f253849caf74c2486777e82f2c5406bde65725d14078271452df3afdaab98
 SHA512:
-  metadata.gz: eb946492539db155e729244008599522dfad177db1536696a8f4d1e7090e9f4a9f03df0f1622add82bb968ab07bba25056b1524f4a19799c2402cd59edd61362
-  data.tar.gz: 70de2d5dfe16524ccc00c3d491a1dc933dce584b434877ab6b8d96c02d31729ff51dc5f9005b87b0301af6769cddc1d0ef22c253b3b2ed8779042f1007702d65
+  metadata.gz: b4550088184172df4cf64516baa91a60ae1f6fd496cb2a3d8dbbe9c3375dc1afc73e2dbea191217d059c34773d73de56cc4b5c8c854a1b1cb47869ca8cc8bd22
+  data.tar.gz: ec7ca0077154ced7847aa76947403b2a994a7b3f2460bc1451755abc4e31f16ed30407ca1c60588f1d04f66c28b9b075c6d64abdcf7021b7ad18775323d85faf

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/app/services/defra_ruby_mocks/govpay_refund_details_service.rb

@@ -40,7 +40,7 @@ module DefraRubyMocks
     end
 
     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 timestamp_file_name

data/app/services/defra_ruby_mocks/govpay_request_refund_service.rb

@@ -24,7 +24,7 @@ module DefraRubyMocks
     end
 
     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 timestamp_file_name

data/lib/defra_ruby_mocks/version.rb

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

metadata

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