bricolage 5.16.9 → 5.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bricolage/s3datasource.rb +18 -8
  3. data/lib/bricolage/version.rb +1 -1
  4. data/test/home/Gemfile.lock +8 -8
  5. data/test/home/config/development/database.yml +4 -3
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8ed1736cc4dd6aeefde5325779a37d3c6e3d8019
4
- data.tar.gz: 612b7ea80708ebd02b783360a9334b8cd1ed5526
3
+ metadata.gz: 05fc1225db07602f098fbcd2271156076265a888
4
+ data.tar.gz: 11e34d16227dfcdb02bd1d51043d99897ca0f133
5
5
  SHA512:
6
- metadata.gz: f283a64d7553787d518181ae2a15b1f3ce66f0caccf1107f83389cfbc010f483e700d16c50bc29065536d153befc18335e85f9e86aa4195b15b19632bcdf2ed0
7
- data.tar.gz: 46aded67b24fcf0066ccacf402cf380ee6cc5d9fe137e7bc0dd7cc3d3c61f3df1c13c212fd2596c38997e0c6424a9cc8098a1a7fbb0b98ae83c72a97ddf75c76
6
+ metadata.gz: 516296b703b34e4dc187f78d38d6087f01ae69867717677530ef49cf7e31e8a38ece329fc273af73891aec30d76887b1b61eda977fb26985ecb4d242aceb3fd1
7
+ data.tar.gz: af04b494591374c139e1a66fce78704722ff522ee3b948c72039048d4decbd283d85710ab9da203d4a89ca4dac5b212aadb7b62f3bb986539f37cb616c3d9d78
data/lib/bricolage/s3datasource.rb CHANGED
@@ -11,16 +11,22 @@ module Bricolage
11
11
  def initialize(
12
12
  endpoint: 's3-ap-northeast-1.amazonaws.com',
13
13
  region: 'ap-northeast-1',
14
- bucket: nil, prefix: nil,
15
- access_key_id: nil, secret_access_key: nil, master_symmetric_key: nil,
14
+ bucket: nil,
15
+ prefix: nil,
16
+ access_key_id: nil,
17
+ secret_access_key: nil,
18
+ iam_role: nil,
19
+ master_symmetric_key: nil,
16
20
  encryption: nil,
17
- s3cfg: nil)
21
+ s3cfg: nil
22
+ )
18
23
  @endpoint = (/\Ahttps?:/ =~ endpoint) ? endpoint : "https://#{endpoint}"
19
24
  @region = region
20
25
  @bucket_name = bucket
21
26
  @prefix = (prefix && prefix.empty?) ? nil : prefix
22
27
  @access_key_id = access_key_id
23
28
  @secret_access_key = secret_access_key
29
+ @iam_role = iam_role
24
30
  @master_symmetric_key = master_symmetric_key
25
31
  @encryption = encryption
26
32
  @s3cfg = s3cfg
@@ -38,11 +44,15 @@ module Bricolage
38
44
 
39
45
  # For Redshift
40
46
  def credential_string
41
- [
42
- "aws_access_key_id=#{access_key}",
43
- "aws_secret_access_key=#{secret_key}",
44
- (@master_symmetric_key && "master_symmetric_key=#{@master_symmetric_key}")
45
- ].compact.join(';')
47
+ if @iam_role
48
+ "aws_iam_role=#{@iam_role}"
49
+ else
50
+ [
51
+ "aws_access_key_id=#{access_key}",
52
+ "aws_secret_access_key=#{secret_key}",
53
+ (@master_symmetric_key && "master_symmetric_key=#{@master_symmetric_key}")
54
+ ].compact.join(';')
55
+ end
46
56
  end
47
57
 
48
58
  def access_key
data/lib/bricolage/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Bricolage
2
2
  APPLICATION_NAME = 'Bricolage'
3
- VERSION = '5.16.9'
3
+ VERSION = '5.17.0'
4
4
  end
data/test/home/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ../..
3
3
  specs:
4
- bricolage (5.16.9)
4
+ bricolage (5.17.0)
5
5
  aws-sdk (~> 2)
6
6
  mysql2
7
7
  pg
@@ -11,17 +11,17 @@ PATH
11
11
  GEM
12
12
  remote: https://rubygems.org/
13
13
  specs:
14
- aws-sdk (2.5.6)
15
- aws-sdk-resources (= 2.5.6)
16
- aws-sdk-core (2.5.6)
14
+ aws-sdk (2.6.0)
15
+ aws-sdk-resources (= 2.6.0)
16
+ aws-sdk-core (2.6.0)
17
17
  jmespath (~> 1.0)
18
- aws-sdk-resources (2.5.6)
19
- aws-sdk-core (= 2.5.6)
18
+ aws-sdk-resources (2.6.0)
19
+ aws-sdk-core (= 2.6.0)
20
20
  coderay (1.1.0)
21
21
  fluent-logger (0.5.1)
22
22
  msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
23
23
  hirb (0.7.3)
24
- httpclient (2.8.2.2)
24
+ httpclient (2.8.2.4)
25
25
  jmespath (1.3.1)
26
26
  json (2.0.2)
27
27
  method_source (0.8.2)
@@ -37,7 +37,7 @@ GEM
37
37
  ruby-progressbar (1.7.5)
38
38
  rubyzip (1.1.7)
39
39
  slop (3.6.0)
40
- td (0.14.1)
40
+ td (0.15.0)
41
41
  hirb (>= 0.4.5)
42
42
  msgpack (>= 0.4.4, < 0.8.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
43
43
  parallel (~> 1.8.0)
data/test/home/config/development/database.yml CHANGED
@@ -48,10 +48,11 @@ s3:
48
48
  region: "ap-northeast-1"
49
49
  bucket: tabemiru-data.ap-northeast-1
50
50
  prefix: "/dev"
51
- s3cfg: <%= user_home_relative_path '.s3cfg' %>
52
- access_key_id: "<%= password 'aws_access_key_id' %>"
53
- secret_access_key: "<%= password 'aws_secret_access_key' %>"
51
+ #s3cfg: <%= user_home_relative_path '.s3cfg' %>
52
+ #access_key_id: "<%= password 'aws_access_key_id' %>"
53
+ #secret_access_key: "<%= password 'aws_secret_access_key' %>"
54
54
  #master_symmetric_key: "12345678901234567890123456789012"
55
+ iam_role: "arn:aws:iam::789035092620:role/RedshiftDWHTeamS3Access"
55
56
 
56
57
  mysql:
57
58
  type: mysql
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bricolage
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.16.9
4
+ version: 5.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Minero Aoki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-02 00:00:00.000000000 Z
11
+ date: 2016-09-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg