bricolage 5.16.9 → 5.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed1736cc4dd6aeefde5325779a37d3c6e3d8019
-  data.tar.gz: 612b7ea80708ebd02b783360a9334b8cd1ed5526
+  metadata.gz: 05fc1225db07602f098fbcd2271156076265a888
+  data.tar.gz: 11e34d16227dfcdb02bd1d51043d99897ca0f133
 SHA512:
-  metadata.gz: f283a64d7553787d518181ae2a15b1f3ce66f0caccf1107f83389cfbc010f483e700d16c50bc29065536d153befc18335e85f9e86aa4195b15b19632bcdf2ed0
-  data.tar.gz: 46aded67b24fcf0066ccacf402cf380ee6cc5d9fe137e7bc0dd7cc3d3c61f3df1c13c212fd2596c38997e0c6424a9cc8098a1a7fbb0b98ae83c72a97ddf75c76
+  metadata.gz: 516296b703b34e4dc187f78d38d6087f01ae69867717677530ef49cf7e31e8a38ece329fc273af73891aec30d76887b1b61eda977fb26985ecb4d242aceb3fd1
+  data.tar.gz: af04b494591374c139e1a66fce78704722ff522ee3b948c72039048d4decbd283d85710ab9da203d4a89ca4dac5b212aadb7b62f3bb986539f37cb616c3d9d78

data/lib/bricolage/s3datasource.rb

@@ -11,16 +11,22 @@ module Bricolage
     def initialize(
         endpoint: 's3-ap-northeast-1.amazonaws.com',
         region: 'ap-northeast-1',
-        bucket: nil, prefix: nil,
-        access_key_id: nil, secret_access_key: nil, master_symmetric_key: nil,
+        bucket: nil,
+        prefix: nil,
+        access_key_id: nil,
+        secret_access_key: nil,
+        iam_role: nil,
+        master_symmetric_key: nil,
         encryption: nil,
-        s3cfg: nil)
+        s3cfg: nil
+    )
       @endpoint = (/\Ahttps?:/ =~ endpoint) ? endpoint : "https://#{endpoint}"
       @region = region
       @bucket_name = bucket
       @prefix = (prefix && prefix.empty?) ? nil : prefix
       @access_key_id = access_key_id
       @secret_access_key = secret_access_key
+      @iam_role = iam_role
       @master_symmetric_key = master_symmetric_key
       @encryption = encryption
       @s3cfg = s3cfg
@@ -38,11 +44,15 @@ module Bricolage
 
     # For Redshift
     def credential_string
-      [
-        "aws_access_key_id=#{access_key}",
-        "aws_secret_access_key=#{secret_key}",
-        (@master_symmetric_key && "master_symmetric_key=#{@master_symmetric_key}")
-      ].compact.join(';')
+      if @iam_role
+        "aws_iam_role=#{@iam_role}"
+      else
+        [
+          "aws_access_key_id=#{access_key}",
+          "aws_secret_access_key=#{secret_key}",
+          (@master_symmetric_key && "master_symmetric_key=#{@master_symmetric_key}")
+        ].compact.join(';')
+      end
     end
 
     def access_key

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.16.9'
+  VERSION = '5.17.0'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.16.9)
+    bricolage (5.17.0)
       aws-sdk (~> 2)
       mysql2
       pg
@@ -11,17 +11,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.5.6)
-      aws-sdk-resources (= 2.5.6)
-    aws-sdk-core (2.5.6)
+    aws-sdk (2.6.0)
+      aws-sdk-resources (= 2.6.0)
+    aws-sdk-core (2.6.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.6)
-      aws-sdk-core (= 2.5.6)
+    aws-sdk-resources (2.6.0)
+      aws-sdk-core (= 2.6.0)
     coderay (1.1.0)
     fluent-logger (0.5.1)
       msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
     hirb (0.7.3)
-    httpclient (2.8.2.2)
+    httpclient (2.8.2.4)
     jmespath (1.3.1)
     json (2.0.2)
     method_source (0.8.2)
@@ -37,7 +37,7 @@ GEM
     ruby-progressbar (1.7.5)
     rubyzip (1.1.7)
     slop (3.6.0)
-    td (0.14.1)
+    td (0.15.0)
       hirb (>= 0.4.5)
       msgpack (>= 0.4.4, < 0.8.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       parallel (~> 1.8.0)

data/test/home/config/development/database.yml

@@ -48,10 +48,11 @@ s3:
   region: "ap-northeast-1"
   bucket: tabemiru-data.ap-northeast-1
   prefix: "/dev"
-  s3cfg: <%= user_home_relative_path '.s3cfg' %>
-  access_key_id: "<%= password 'aws_access_key_id' %>"
-  secret_access_key: "<%= password 'aws_secret_access_key' %>"
+  #s3cfg: <%= user_home_relative_path '.s3cfg' %>
+  #access_key_id: "<%= password 'aws_access_key_id' %>"
+  #secret_access_key: "<%= password 'aws_secret_access_key' %>"
   #master_symmetric_key: "12345678901234567890123456789012"
+  iam_role: "arn:aws:iam::789035092620:role/RedshiftDWHTeamS3Access"
 
 mysql:
   type: mysql

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.16.9
+  version: 5.17.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg