From 04400595a71992077a5553229ebb6906141aedb8 Mon Sep 17 00:00:00 2001 From: Benjamin Curtis Date: Fri, 3 Feb 2017 11:37:49 -0800 Subject: [PATCH] Fall back to ENV vars for AWS credentials --- lib/middleman-cloudfront/extension.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/middleman-cloudfront/extension.rb b/lib/middleman-cloudfront/extension.rb index c8cb1c1..0b2d4a8 100644 --- a/lib/middleman-cloudfront/extension.rb +++ b/lib/middleman-cloudfront/extension.rb @@ -7,8 +7,8 @@ class Extension < Middleman::Extension # @param [Symbol] key The name of the option # @param [Object] default The default value for the option # @param [String] description A human-readable description of what the option does - option :access_key_id, nil, 'Access key id' - option :secret_access_key, nil, 'Secret access key' + option :access_key_id, ENV['AWS_ACCESS_KEY_ID'], 'Access key id' + option :secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'], 'Secret access key' option :distribution_id, nil, 'Distribution id' option :filter, /.*/, 'Filter files to be invalidated' option :after_build, false, 'Invalidate after build' @@ -20,6 +20,11 @@ def initialize(app, options_hash={}, &block) def after_build Middleman::Cli::CloudFront::Invalidate.new.invalidate(options) if options.after_build end + + def after_configuration + options.access_key_id ||= ENV['AWS_ACCESS_KEY_ID'] + options.secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY'] + end helpers do def invalidate(files = nil)