aws-cleaner 2.3.0 → 2.4.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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/aws_cleaner.rb +6 -3
  3. data/lib/aws-cleaner.rb +4 -0
  4. metadata +19 -20
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a6b8b2239ddd24083d572e06d8a61da41b97696ac578480da008828e5eebd9dc
4
- data.tar.gz: 5c040b5b2a48e959d38f85ef4f4c89968089e90ce3da31bf995dc9db32eaea39
3
+ metadata.gz: 82eb0534b15563d341447daf04082161d61ca6ef4ca738b26f583762554cb8f2
4
+ data.tar.gz: 85514fd0d1e61c53043eb2839b772cdc0a70ed6a5e6807ef9f1019c2b9108fee
5
5
  SHA512:
6
- metadata.gz: 76a725cc5c9f598cef66301ec03d288c80e226a03340af20678b942eecbf62f5fea7dd45eee42738d2ee43efb8f5370bc5dcee95ada2ddec19f5db9c736a8c2a
7
- data.tar.gz: b008599496fb63ecfb5b8acf81b633184e0a6d65fdf13f5bf67be540e37e2576a3177e3e21b37c9cf8957b298851cbc5e324b0a24666ba5ed3174a433d48a40f
6
+ metadata.gz: 5576f65b412d9eb0260a5553613a863ff523fc450b8e93312c45e65803addd094e72b3ca4fc21a680489d342e35fc1e4d01938f8edf2beda17fa29574dbd52cd
7
+ data.tar.gz: 174d57e866695f609b9b5eea5bf50af966d99f1c5194d2ae199d44e81784cea46cdb26adc4c9c25de38834f2075fffd80a4960d13fccf08e77f1a874807b817a
data/bin/aws_cleaner.rb CHANGED
@@ -1,4 +1,6 @@
1
1
  #!/usr/bin/env ruby
2
+ # frozen_string_literal: true
3
+
2
4
  #
3
5
  # Listen for AWS CloudWatch Events EC2 termination events delivered via SQS
4
6
  # and remove the node from Chef and Sensu and send a notification
@@ -12,11 +14,11 @@
12
14
  begin
13
15
  require 'json'
14
16
  require 'yaml'
15
- require 'aws-sdk-core'
17
+ require 'aws-sdk-sqs'
16
18
  require 'chef-api'
17
19
  require 'hipchat'
18
20
  require 'rest-client'
19
- require 'trollop'
21
+ require 'optimist'
20
22
  require 'slack/poster'
21
23
  require 'logger'
22
24
  rescue LoadError => e
@@ -90,6 +92,7 @@ end
90
92
 
91
93
  def sensu(id, instance_id, chef_node)
92
94
  return unless @config[:sensu][:enable]
95
+
93
96
  if AwsCleaner::Sensu.in_sensu?(chef_node, @config)
94
97
  if AwsCleaner::Sensu.remove_from_sensu(chef_node, @config)
95
98
  @logger.info("Removed #{chef_node} from Sensu")
@@ -106,7 +109,7 @@ def closelog(message)
106
109
  end
107
110
 
108
111
  # get options
109
- opts = Trollop.options do
112
+ opts = Optimist.options do
110
113
  opt :config, 'Path to config file', type: :string, default: 'config.yml'
111
114
  end
112
115
 
data/lib/aws-cleaner.rb CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # main aws_cleaner lib
2
4
  class AwsCleaner
3
5
  # SQS related stuff
@@ -32,6 +34,7 @@ class AwsCleaner
32
34
  chef = client(config)
33
35
  results = chef.search.query(:node, "ec2_instance_id:#{instance_id} OR chef_provisioning_reference_server_id:#{instance_id}")
34
36
  return false if results.rows.empty?
37
+
35
38
  results.rows.first['name']
36
39
  end
37
40
 
@@ -40,6 +43,7 @@ class AwsCleaner
40
43
  chef = client(config)
41
44
  results = chef.search.query(:node, "ec2_instance_id:#{instance_id} OR chef_provisioning_reference_server_id:#{instance_id}")
42
45
  return false if results.rows.empty?
46
+
43
47
  results.rows.first['automatic']['fqdn']
44
48
  end
45
49
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aws-cleaner
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Heydrick
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-03-28 00:00:00.000000000 Z
11
+ date: 2019-08-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.12'
19
+ version: '2.0'
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
- version: '1.12'
26
+ version: '2.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.52.1
61
+ version: 0.73.0
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
- version: 0.52.1
68
+ version: 0.73.0
69
69
  - !ruby/object:Gem::Dependency
70
- name: aws-sdk-core
70
+ name: aws-sdk-sqs
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '2.0'
75
+ version: '1'
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.0'
82
+ version: '1'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: chef-api
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -109,47 +109,47 @@ dependencies:
109
109
  - !ruby/object:Gem::Version
110
110
  version: '1.5'
111
111
  - !ruby/object:Gem::Dependency
112
- name: rest-client
112
+ name: optimist
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '2'
117
+ version: '3.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
- version: '2'
124
+ version: '3.0'
125
125
  - !ruby/object:Gem::Dependency
126
- name: slack-poster
126
+ name: rest-client
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '2.2'
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
- version: '2.2'
138
+ version: '2'
139
139
  - !ruby/object:Gem::Dependency
140
- name: trollop
140
+ name: slack-poster
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '2.1'
145
+ version: '2.2'
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
- version: '2.1'
152
+ version: '2.2'
153
153
  description: AWS Cleaner cleans up after EC2 instances are terminated
154
154
  email: eheydrick@gmail.com
155
155
  executables:
@@ -178,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
178
178
  - !ruby/object:Gem::Version
179
179
  version: '0'
180
180
  requirements: []
181
- rubyforge_project:
182
- rubygems_version: 2.7.5
181
+ rubygems_version: 3.0.4
183
182
  signing_key:
184
183
  specification_version: 4
185
184
  summary: AWS Cleaner cleans up after EC2 instances are terminated