Merge pull request #2164 from ministryofjustice/use-irsa-for-jpc-reports

fix: Use IRSA for JPS reports
ministryofjustice · Sep 7, 2023 · db6a650 · db6a650
2 parents 5986c8f + b4f0799
commit db6a650
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 51 deletions.
diff --git a/app/lib/cloud_data/reports_feed.rb b/app/lib/cloud_data/reports_feed.rb
@@ -1,10 +1,7 @@
 module CloudData
   class ReportsFeed
     def initialize(bucket_name = ENV['S3_REPORTING_BUCKET_NAME'])
-      client = Aws::S3::Client.new(
-        access_key_id: ENV['S3_REPORTING_ACCESS_KEY_ID'],
-        secret_access_key: ENV['S3_REPORTING_SECRET_ACCESS_KEY'],
-      )
+      client = Aws::S3::Client.new
       @s3 = Aws::S3::Resource.new(client: client)
       @bucket = @s3.bucket(bucket_name)
     end

diff --git a/k8s_migrate_job.yml b/k8s_migrate_job.yml
diff --git a/lib/tasks/metrics.rake b/lib/tasks/metrics.rake
@@ -1,8 +1,6 @@
 namespace :metrics do
   desc 'Exports metrics in all the popular formats to s3'
   task :export, [:metric_class] => :environment do |_, args|
-    abort 'Please set S3_METRICS_ACCESS_KEY_ID' if ENV['S3_METRICS_ACCESS_KEY_ID'].blank?
-    abort 'Please set S3_METRICS_SECRET_ACCESS_KEY' if ENV['S3_METRICS_SECRET_ACCESS_KEY'].blank?
     abort 'Please set S3_METRICS_REGION' if ENV['S3_METRICS_REGION'].blank?
     abort 'Please set S3_METRICS_BUCKET_NAME' if ENV['S3_METRICS_BUCKET_NAME'].blank?