Browse Source

Use env var for bucket name

pull/2671/head
Kat 2 years ago
parent
commit
3f258d5bfd
  1. 3
      app/controllers/start_controller.rb
  2. 3
      app/helpers/collection_resources_helper.rb
  3. 1
      config/environments/development.rb
  4. 1
      config/environments/production.rb
  5. 1
      config/environments/review.rb
  6. 1
      config/environments/staging.rb
  7. 1
      config/environments/test.rb
  8. 6
      spec/helpers/collection_resources_helper_spec.rb

3
app/controllers/start_controller.rb

@ -67,7 +67,8 @@ class StartController < ApplicationController
private private
def download_resource(file, filename) def download_resource(file, filename)
url = "https://#{Rails.application.config.collection_resources_s3_bucket_name}.s3.amazonaws.com/#{file}" storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["COLLECTION_RESOURCES_BUCKET"])
url = "https://#{storage_service.configuration.bucket_name}.s3.amazonaws.com/#{file}"
uri = URI.parse(url) uri = URI.parse(url)
response = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http| response = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|

3
app/helpers/collection_resources_helper.rb

@ -11,7 +11,8 @@ module CollectionResourcesHelper
def file_type_size_and_pages(file, number_of_pages: nil) def file_type_size_and_pages(file, number_of_pages: nil)
file_pages = number_of_pages ? pluralize(number_of_pages, "page") : nil file_pages = number_of_pages ? pluralize(number_of_pages, "page") : nil
url = "https://#{Rails.application.config.collection_resources_s3_bucket_name}.s3.amazonaws.com/#{file}" storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["COLLECTION_RESOURCES_BUCKET"])
url = "https://#{storage_service.configuration.bucket_name}.s3.amazonaws.com/#{file}"
uri = URI.parse(url) uri = URI.parse(url)
response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http| response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|

1
config/environments/development.rb

@ -85,5 +85,4 @@ Rails.application.configure do
config.active_record.yaml_column_permitted_classes = [Time, BigDecimal] config.active_record.yaml_column_permitted_classes = [Time, BigDecimal]
config.active_job.queue_adapter = :inline config.active_job.queue_adapter = :inline
config.collection_resources_s3_bucket_name = "core-dev-collection-resources"
end end

1
config/environments/production.rb

@ -147,5 +147,4 @@ Rails.application.configure do
end end
} }
end end
config.collection_resources_s3_bucket_name = "core-prod-collection-resources"
end end

1
config/environments/review.rb

@ -127,5 +127,4 @@ Rails.application.configure do
# see https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017 # see https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
config.active_record.yaml_column_permitted_classes = [Time, BigDecimal] config.active_record.yaml_column_permitted_classes = [Time, BigDecimal]
config.collection_resources_s3_bucket_name = "core-dev-collection-resources"
end end

1
config/environments/staging.rb

@ -127,5 +127,4 @@ Rails.application.configure do
# see https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017 # see https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
config.active_record.yaml_column_permitted_classes = [Time, BigDecimal] config.active_record.yaml_column_permitted_classes = [Time, BigDecimal]
config.collection_resources_s3_bucket_name = "core-staging-collection-resources"
end end

1
config/environments/test.rb

@ -67,5 +67,4 @@ Rails.application.configure do
config.active_record.yaml_column_permitted_classes = [Time, BigDecimal] config.active_record.yaml_column_permitted_classes = [Time, BigDecimal]
config.active_job.queue_adapter = :test config.active_job.queue_adapter = :test
config.collection_resources_s3_bucket_name = "core-test-collection-resources"
end end

6
spec/helpers/collection_resources_helper_spec.rb

@ -3,6 +3,12 @@ require "rails_helper"
RSpec.describe CollectionResourcesHelper do RSpec.describe CollectionResourcesHelper do
let(:current_user) { create(:user, :data_coordinator) } let(:current_user) { create(:user, :data_coordinator) }
let(:user) { create(:user, :data_coordinator) } let(:user) { create(:user, :data_coordinator) }
let(:storage_service) { instance_double(Storage::S3Service) }
before do
allow(Storage::S3Service).to receive(:new).and_return(storage_service)
allow(storage_service).to receive(:configuration).and_return(OpenStruct.new(bucket_name: "core-test-collection-resources"))
end
describe "when displaying file metadata" do describe "when displaying file metadata" do
context "with pages" do context "with pages" do

Loading…
Cancel
Save