configure-s3-website 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8aeecfcf2c39ebb0f814a54d3782130e12e9e25
-  data.tar.gz: c73066e5e5b09d982985efb9b45352dab92a7776
+  metadata.gz: c33ce4f35ab6af0df19dc186cd931a5cc70d96e4
+  data.tar.gz: 86ef41e2572b387d6ea1666b030135e5179341d0
 SHA512:
-  metadata.gz: 4ddc2df2a4940adb7bb10dd89b6e769011ce9d2101833b0063bdb8f1dad6ae022425cd4ed78b8502b21561ce4944ade726c35c79f2ca119f2d32846dddb90aaf
-  data.tar.gz: f4c9cf08d17924c9147ecb18aca2282e678080f8bb82d7e709ba0a5579e160aa2463a2587d274e6452adc3d77f37394a493e2829b3ba5dca5ee42d0c01962b11
+  metadata.gz: fd81ad8e3e2d4304ffd8cd9231671e9f428fb380064ba60b1624b4401600abf5ec1b4480befb8d8f48acd8de737a5a6dbb3e8e2de7dfda552c606533568c2288
+  data.tar.gz: b3654371cf9a0e2ec151c94af155577ec438421714e179786f5e956b1c57010d63bf8228a688d4cf39cabe25aab5df3723c4e28ae9aa4b938b5211841b9ad33e

data/README.md

@@ -3,8 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/laurilehmijoki/configure-s3-website.png)](http://travis-ci.org/laurilehmijoki/configure-s3-website)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/configure-s3-website.png)](http://badge.fury.io/rb/configure-s3-website)
 
-Configure an AWS S3 bucket to function as a website. Easily from the
-command-line interface.
+Configure an AWS S3 bucket to function as a website easily from a command-line interface.
 
 The bucket may or may not exist. If the bucket does not exist,
 `configure-s3-website` will create it.
@@ -17,7 +16,14 @@ For deploying websites to S3, consider using [s3_website](https://github.com/lau
 
 ## Usage
 
-Create a file that contains the S3 credentials and the name of the bucket:
+Create a file that contains the name of your AWS profile with access to S3 and the name of the bucket:
+
+```yaml
+profile: name-of-your-aws-profile-with-access
+s3_bucket: name-of-your-bucket
+```
+
+**or** create a file that contains the S3 credentials and the name of the bucket:
 
 ```yaml
 s3_id: your-aws-access-key
@@ -70,11 +76,11 @@ file. For example:
 ```yaml
 cloudfront_distribution_config:
   default_cache_behavior:
-    min_TTL: 600
+    min_ttl: 600
   aliases:
     quantity: 1
     items:
-      CNAME: your.domain.net
+      - your.domain.net
 ```
 
 See the section below for more information about the valid values of the
@@ -94,12 +100,12 @@ Let's say your config file contains the following fragment:
 cloudfront_distribution_id: AXSAXSSE134
 cloudfront_distribution_config:
   default_cache_behavior:
-    min_TTL: 600
+    min_ttl: 600
   default_root_object: index.json
 ```
 
 When you invoke `configure-s3-website`, it will overwrite the default value of
-*default_cache_behavior's* *min_TTL* as well as the default value of
+*default_cache_behavior's* *min_ttl* as well as the default value of
 *default_root_object* setting in the [default distribution configs](#default-distribution-configs).
 
 This gem generates `<DistributionConfig>` of the CloudFront REST API. For
@@ -151,7 +157,7 @@ Type](http://docs.aws.amazon.com/AmazonCloudFront/latest/APIReference/Distributi
       }
     },
     'viewer_protocol_policy' => 'allow-all',
-    'min_TTL' => '86400'
+    'min_ttl' => '86400'
   },
   'cache_behaviors' => {
     'quantity' => '0'

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.0
+
+* Add ability to use an AWS profile instead of explicit `s3_id` and `s3_secret`
+
 ## 2.0.0
 
 ### Breaking changes

data/lib/configure-s3-website/config_source/file_config_source.rb

@@ -20,6 +20,10 @@ module ConfigureS3Website
       @config['s3_secret']
     end
 
+    def profile
+      @config['profile']
+    end
+
     def s3_bucket_name
       @config['s3_bucket']
     end
@@ -74,10 +78,14 @@ module ConfigureS3Website
     end
 
     def self.validate_config(config, yaml_file_path)
-      required_keys = %w{s3_id s3_secret s3_bucket}
-      missing_keys = required_keys.reject do |key| config.keys.include?key end
-      unless missing_keys.empty?
-        raise "File #{yaml_file_path} does not contain the required key(s) #{missing_keys.join(', ')}"
+      # make sure the bucket name is configured at a minimum
+      if not config.keys.include?'s3_bucket'
+        raise "File #{yaml_file_path} does not contain the required key 's3_bucket'"
+      end
+
+      # check that either s3_id or profile is configured
+      if not (config.keys.include?'s3_id' or config.keys.include?'profile')
+        raise "File #{yaml_file_path} does not contain either 's3_id' or 'profile'"
       end
     end
   end

data/lib/configure-s3-website/s3_client.rb

@@ -21,11 +21,18 @@ module ConfigureS3Website
     private
 
     def self.s3(config_source)
-      s3 = Aws::S3::Client.new(
-        region: config_source.s3_endpoint,
-        access_key_id: config_source.s3_access_key_id,
-        secret_access_key: config_source.s3_secret_access_key
-      )
+      if config_source.s3_access_key_id
+        Aws::S3::Client.new(
+          region: config_source.s3_endpoint,
+          access_key_id: config_source.s3_access_key_id,
+          secret_access_key: config_source.s3_secret_access_key
+        )
+      else
+        Aws::S3::Client.new(
+          region: config_source.s3_endpoint,
+          profile: config_source.profile,
+        )
+      end
     end
 
     def self.enable_website_configuration(config_source)

data/lib/configure-s3-website/version.rb

@@ -1,3 +1,3 @@
 module ConfigureS3Website
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configure-s3-website
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge