cfncli 0.9.0 → 0.9.1

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 +5 -13
  2. data/lib/cfncli/cli.rb +20 -2
  3. data/lib/cfncli/cloudformation.rb +23 -2
  4. data/lib/cfncli/version.rb +1 -1
  5. metadata +35 -35
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MjdmMzcxODZjNWVmZWViNjUxYmM5MjBhNDRiNjA5YjMxM2ZhMWZlNw==
5
- data.tar.gz: !binary |-
6
- MzEzMzFjZmI1MDdiYWVlNTQyYzNhODQ1MWQ4YTdlZDExYzAxMzhjZg==
2
+ SHA1:
3
+ metadata.gz: 73842ad29b74b94c7c05b61a745a4d4ce1d2b2cd
4
+ data.tar.gz: 7dc1baa57e714055dcd79985a2d6c61f9d363c4e
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ODc5NzhjYTA5NTc3NTZhZmVmMDBiYjU3OWIyOWVkYjY5MmNkYjJjY2FjYmUz
10
- MDFmNDFjZjZiMmY3MDM5OGM2YmZiMWZmNGZmY2M4MjM2NjU2YjEzMmMwZGUz
11
- NzY4MjlkNDUyMjEzZDQ2OTUyMmViMmI5YWUyZjMxNjA1YzVkZmI=
12
- data.tar.gz: !binary |-
13
- MDI5YTVkMzk2ZjkzYjgwODUyNDFkOTA1ODkzOTUwN2Y2OTdlOGNmYTRiYjIz
14
- ZTlkZjZlYTlhNThhMzJlMWRhNjhkMGY1YzhlYmU2ODY3MmIyMmQxMTNkMTlm
15
- Mzc4NGRlNzQyZDRkZDE2MzZhYjNmZjFmMzcwYzMwZDdhZTUwYWQ=
6
+ metadata.gz: 3eca39ce4ed5e5130a51f035d0fa4286945183a21af3446777fa0992e2618963db114d497ea14718e5ee946858dd6fbf68267760474bd0805d44ce5849c4e794
7
+ data.tar.gz: 54fe45fe8109e3c18427ceef95ae306366b6f831a9b975e91f4af4bc556f0c7faf00092903423c435c39b032a23ff072f830f7dbaf0a5709239acabfb9f2c00e
data/lib/cfncli/cli.rb CHANGED
@@ -213,6 +213,17 @@ module CfnCli
213
213
  desc: 'Name or ID of the Cloudformation stack'
214
214
 
215
215
  # Application options.
216
+ method_option 'list_events',
217
+ alias: '-l',
218
+ type: :boolean,
219
+ default: true,
220
+ desc: 'List the stack events during the operation'
221
+
222
+ method_option 'list_nested_events',
223
+ type: :boolean,
224
+ default: true,
225
+ desc: 'List events from nested stacks'
226
+
216
227
  method_option 'interval',
217
228
  type: :numeric,
218
229
  default: 10,
@@ -235,6 +246,7 @@ module CfnCli
235
246
 
236
247
  fail ArgumentError, 'stack_name is required' unless stack_name
237
248
 
249
+ list_events = consume_option(opts, 'list_events')
238
250
  interval = consume_option(opts, 'interval')
239
251
  timeout = consume_option(opts, 'timeout')
240
252
  retry_limit = consume_option(opts, 'timeout')
@@ -242,8 +254,14 @@ module CfnCli
242
254
  consume_option(opts, 'config_file')
243
255
  retries = timeout / interval
244
256
 
245
- config = Config::CfnClient.new(interval, retries, retry_limit)
246
- cfn.delete_stack(opts, config)
257
+ client_config = Config::CfnClient.new(interval, retries, retry_limit)
258
+
259
+ if list_events
260
+ stack = cfn.delete_and_list_events(opts, client_config)
261
+ res = ExitCode::STACK_ERROR unless cfn.stack_successful? stack.stack_id
262
+ else
263
+ cfn.delete_stack(opts, client_config)
264
+ end
247
265
  end
248
266
 
249
267
  method_option 'verbose',
data/lib/cfncli/cloudformation.rb CHANGED
@@ -53,6 +53,8 @@ module CfnCli
53
53
  Waiting.wait(interval: config.interval || default_config.interval, max_attempts: config.retries || default_config.retries) do |waiter|
54
54
  waiter.done if stack.finished? && !stack.listing_events?
55
55
  end
56
+
57
+ stack
56
58
  end
57
59
 
58
60
  # List stack events
@@ -70,11 +72,30 @@ module CfnCli
70
72
  end
71
73
 
72
74
  # Delete a stack
73
- def delete_stack(options, config)
75
+ def delete_stack(options, config = nil)
74
76
  stack = create_stack_obj(options['stack_name'], config)
75
77
  options['stack_name'] = stack.stack_id
76
78
  stack.delete(options, config)
77
- events(stack.stack_id, config)
79
+ stack
80
+ end
81
+
82
+ def delete_and_list_events(options, config = nil)
83
+ # Create/update the stack
84
+ logger.debug "Deleting stack #{options['stack_name']}"
85
+ list_nested_events = options['list_nested_events']
86
+ options.delete 'list_nested_events'
87
+ stack = delete_stack(options, config)
88
+
89
+ events(stack.stack_id, config, list_nested_events)
90
+
91
+ interval = config.interval if config
92
+ interval = default_config.interval unless interval
93
+ Waiting.wait(interval: interval, max_attempts: config.retries || default_config.retries) do |waiter|
94
+ waiter.done if stack.finished? && !stack.listing_events?
95
+ sleep 1
96
+ end
97
+
98
+ stack
78
99
  end
79
100
 
80
101
  # Returns the stack status
data/lib/cfncli/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CfnCli
2
- VERSION = "0.9.0"
2
+ VERSION = "0.9.1"
3
3
  end
metadata CHANGED
@@ -1,201 +1,201 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cfncli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - lethalpaga
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-10-11 00:00:00.000000000 Z
11
+ date: 2016-11-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.10'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.10'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '10.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ! '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ! '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec-its
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.2'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.2'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cucumber
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '2'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '2'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: guard
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '2'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '2'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: guard-rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ! '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ! '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: thor
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ! '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
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
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: aws-sdk
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: '2'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: '2'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: waiting
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ~>
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ~>
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: activesupport
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ! '>='
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: '4'
160
- - - <
160
+ - - "<"
161
161
  - !ruby/object:Gem::Version
162
162
  version: '6'
163
163
  type: :runtime
164
164
  prerelease: false
165
165
  version_requirements: !ruby/object:Gem::Requirement
166
166
  requirements:
167
- - - ! '>='
167
+ - - ">="
168
168
  - !ruby/object:Gem::Version
169
169
  version: '4'
170
- - - <
170
+ - - "<"
171
171
  - !ruby/object:Gem::Version
172
172
  version: '6'
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: colorize
175
175
  requirement: !ruby/object:Gem::Requirement
176
176
  requirements:
177
- - - ~>
177
+ - - "~>"
178
178
  - !ruby/object:Gem::Version
179
179
  version: '0'
180
180
  type: :runtime
181
181
  prerelease: false
182
182
  version_requirements: !ruby/object:Gem::Requirement
183
183
  requirements:
184
- - - ~>
184
+ - - "~>"
185
185
  - !ruby/object:Gem::Version
186
186
  version: '0'
187
187
  - !ruby/object:Gem::Dependency
188
188
  name: concurrent-ruby
189
189
  requirement: !ruby/object:Gem::Requirement
190
190
  requirements:
191
- - - ~>
191
+ - - "~>"
192
192
  - !ruby/object:Gem::Version
193
193
  version: '1.0'
194
194
  type: :runtime
195
195
  prerelease: false
196
196
  version_requirements: !ruby/object:Gem::Requirement
197
197
  requirements:
198
- - - ~>
198
+ - - "~>"
199
199
  - !ruby/object:Gem::Version
200
200
  version: '1.0'
201
201
  description: Creates a Cloudformation stack synchronously
@@ -206,9 +206,9 @@ executables:
206
206
  extensions: []
207
207
  extra_rdoc_files: []
208
208
  files:
209
- - .gitignore
210
- - .rspec
211
- - .travis.yml
209
+ - ".gitignore"
210
+ - ".rspec"
211
+ - ".travis.yml"
212
212
  - Gemfile
213
213
  - Guardfile
214
214
  - README.md
@@ -239,12 +239,12 @@ require_paths:
239
239
  - lib
240
240
  required_ruby_version: !ruby/object:Gem::Requirement
241
241
  requirements:
242
- - - ! '>='
242
+ - - ">="
243
243
  - !ruby/object:Gem::Version
244
244
  version: '0'
245
245
  required_rubygems_version: !ruby/object:Gem::Requirement
246
246
  requirements:
247
- - - ! '>='
247
+ - - ">="
248
248
  - !ruby/object:Gem::Version
249
249
  version: '0'
250
250
  requirements: []