terrafying 1.3.7 → 1.3.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/terrafying/aws.rb +7 -3
  3. data/lib/terrafying/generator.rb +6 -0
  4. data/lib/terrafying/version.rb +1 -1
  5. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c3d1869a05f52acab96a763495e1495282025a959a21e09e598e9185668761a3
4
- data.tar.gz: 02aa4fe423da668e87381c1531dd786795f6511b2226535cf07f2783121a7fa6
3
+ metadata.gz: 9e6481bd6044da3928b6fc430c8768707ed970dd49edee915b5dd593fce66a4e
4
+ data.tar.gz: 35497673b5552537ee43123d181009020b18c68e3704fa7051ac7bca39b5d586
5
5
  SHA512:
6
- metadata.gz: 38bc2c757e930f90048aead01911a35376eb4431db1ee940dd1c0910dfeafdb7178bf7a040b37634ce461657614ee8ad1af7355ec8af3aca2c2106ad88ca53f0
7
- data.tar.gz: 2faacf94a1d33910f982293174f2382d62da0dd7257e1c5fa1deec90ef955b92aad6b28593f28d9508e0923206eba192fecd811fe317f1b9a52bdb8352d19d8d
6
+ metadata.gz: d5f64fde12c84938b1efc1c1379dbeeb998a26880dfbf3a0bc5d55e42cdb103c55a22f8e858c988709800438d2718b3020ba63d32f6aa4d91e726ba3053e5c12
7
+ data.tar.gz: 481266d263093769d9e840c0282d34e1652a32952b50b21c647da73ff1bd039eaf87c4513a80023336c6784fedb99818c067571fe5de4b8ac7a9385733436e7a
data/lib/terrafying/aws.rb CHANGED
@@ -9,13 +9,17 @@ module Terrafying
9
9
  attr_reader :region
10
10
 
11
11
  def initialize(region)
12
- full_jitter = lambda { |c| Kernel.sleep(Kernel.rand(0..[2, (0.3 * 2**c.retries)].min)) }
12
+ half_jitter = lambda { |c|
13
+ sleep_time = 0.5 * (2**c.retries)
14
+ Kernel.sleep(Kernel.rand((sleep_time / 2)..sleep_time))
15
+ }
13
16
 
14
17
  ::Aws.config.update({
15
18
  region: region,
16
- retry_limit: 5,
17
- retry_backoff: full_jitter
19
+ retry_limit: 7,
20
+ retry_backoff: half_jitter
18
21
  })
22
+
19
23
  @autoscaling_client = ::Aws::AutoScaling::Client.new
20
24
  @ec2_resource = ::Aws::EC2::Resource.new
21
25
  @ec2_client = ::Aws::EC2::Client.new
data/lib/terrafying/generator.rb CHANGED
@@ -63,6 +63,12 @@ module Terrafying
63
63
  def provider(name, spec)
64
64
  @output["provider"] ||= {}
65
65
  @output["provider"][name] = spec
66
+
67
+ if spec[:alias]
68
+ "#{name}.#{spec[:alias]}"
69
+ else
70
+ name.to_s
71
+ end
66
72
  end
67
73
 
68
74
  def data(type, name, spec)
data/lib/terrafying/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Terrafying
2
- VERSION = "1.3.7" # will be inserted by Drone
2
+ VERSION = "1.3.8" # will be inserted by Drone
3
3
  CLI_VERSION = "0.11.7"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: terrafying
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.7
4
+ version: 1.3.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - uSwitch Limited
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-17 00:00:00.000000000 Z
11
+ date: 2018-05-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -72,56 +72,56 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '2'
75
+ version: '3'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '2'
82
+ version: '3'
83
83
  - !ruby/object:Gem::Dependency
84
- name: thor
84
+ name: deep_merge
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 0.19.1
89
+ version: 1.1.1
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 0.19.1
96
+ version: 1.1.1
97
97
  - !ruby/object:Gem::Dependency
98
- name: deep_merge
98
+ name: netaddr
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.1.1
103
+ version: '1.5'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.1.1
110
+ version: '1.5'
111
111
  - !ruby/object:Gem::Dependency
112
- name: netaddr
112
+ name: thor
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '1.5'
117
+ version: 0.19.1
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '1.5'
124
+ version: 0.19.1
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: xxhash
127
127
  requirement: !ruby/object:Gem::Requirement