maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deploy] Bug Fix:Update Sitemap Generator to Handle IAM Profiles (#10000)

Browse source
This commit is contained in:
Molly Struve 2020-08-31 13:21:53 -05:00 • committed by GitHub
parent b26b031616
commit 1fbab70dc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 65 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
config/sitemap.rb
View file

@ -1,12 +1,70 @@
# TEMPORARY
# Until https://github.com/kjvarga/sitemap_generator/pull/359 is merged
# We have to monkey patch the S3Adapter to allow for the fog_public option to be set
module SitemapGenerator
# https://github.com/kjvarga/sitemap_generator/blob/master/lib/sitemap_generator/adapters/s3_adapter.rb
class S3Adapter
def initialize(opts = {}) # rubocop:disable Style/OptionHash
@aws_access_key_id = opts[:aws_access_key_id] || ENV["AWS_ACCESS_KEY_ID"]
@aws_secret_access_key = opts[:aws_secret_access_key] || ENV["AWS_SECRET_ACCESS_KEY"]
@fog_provider = opts[:fog_provider] || ENV["FOG_PROVIDER"]
@fog_directory = opts[:fog_directory] || ENV["FOG_DIRECTORY"]
@fog_region = opts[:fog_region] || ENV["FOG_REGION"]
@fog_path_style = opts[:fog_path_style] || ENV["FOG_PATH_STYLE"]
@fog_storage_options = opts[:fog_storage_options] || {}
@fog_public = opts[:fog_public].to_s.present? ? opts[:fog_public] : true # additional line
end
# Call with a SitemapLocation and string data
def write(location, raw_data)
SitemapGenerator::FileAdapter.new.write(location, raw_data)
credentials = { provider: @fog_provider }
if @aws_access_key_id && @aws_secret_access_key
credentials[:aws_access_key_id] = @aws_access_key_id
credentials[:aws_secret_access_key] = @aws_secret_access_key
else
credentials[:use_iam_profile] = true
end
credentials[:region] = @fog_region if @fog_region
credentials[:path_style] = @fog_path_style if @fog_path_style
storage = Fog::Storage.new(@fog_storage_options.merge(credentials))
directory = storage.directories.new(key: @fog_directory)
directory.files.create(
key: location.path_in_public,
body: File.open(location.path),
public: @fog_public, # additional line
)
end
end
end
if Rails.env.production?
region = ApplicationConfig["AWS_UPLOAD_REGION"].presence || ApplicationConfig["AWS_DEFAULT_REGION"]
SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
fog_provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
fog_region: region,
)
config_hash = if ENV["FOREM_CONTEXT"] == "forem_cloud" # @forem/systems jdoss's special sauce.
# Excluding the aws_access_key_id and aws_secret_access_key causes use_iam_profile
# to be set to true by the S3Adapter
# https://github.com/kjvarga/sitemap_generator/blob/0b847f1e7a544ea8ef87bb643a732e30a07a14c9/lib/sitemap_generator/adapters/s3_adapter.rb#L39
{
fog_provider: "AWS",
fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
fog_region: "us-east-2",
fog_public: false
}
else
{
fog_provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
fog_region: region
}
end
SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(config_hash)
SitemapGenerator::Sitemap.sitemaps_host = "https://#{ApplicationConfig['AWS_BUCKET_NAME']}.s3.amazonaws.com/"
SitemapGenerator::Sitemap.public_path = "tmp/"
SitemapGenerator::Sitemap.sitemaps_path = "sitemaps/"