logstash-input-s3-sns-sqs 2.1.3 → 2.2.0.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -0
  3. data/lib/logstash/inputs/s3snssqs.rb +3 -4
  4. data/logstash-input-s3-sns-sqs.gemspec +17 -5
  5. metadata +174 -22
  6. data/lib/logstash/inputs/s3sqs/patch.rb +0 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c42ccc1885923bc79a1f546a7be3b4ef2b1840c301905f0219e1cddf89266b9c
4
- data.tar.gz: 755b037e0a94be66863bf05f6ee6ea20816663de671de879c1642c7ba4a4cec0
3
+ metadata.gz: 9d5ea48e146f2c80413f41fa2be04ab09396ce2fd67f0275032d34641e0c6fd2
4
+ data.tar.gz: c4301ebe9b7abb940891bd06843de67b66b400cc6470bfa69b4a208320ef6387
5
5
  SHA512:
6
- metadata.gz: 982cd8b60721b89f56e9e013126ce39fc95c5d0747ab73d98224af2626182f789a6dcde8317e3539612dfac7824d75ab149bda75e0cf75435a06bdd2291e7a0a
7
- data.tar.gz: fbd220e56e392510d2bbe44b413afe458e7f0a8eb82c32cfa5024b8fc56629c61315e83ed31bb0ae581afe212a92f0cd4ccc6fd16bb32a27a996b09efd64bdd6
6
+ metadata.gz: 7c478aa632537f4db570327ff25df1102faab0f9480515bbb4991e52540e086cfb881935b29725e34b4bd5de65a06de77ef65d682ee6b7cc909fce72b5359080
7
+ data.tar.gz: 52cbe75d68326c5c29fdd5e2b13b3724e0c829664726667fb031c22c99318dfe04d950eb06524ee6d4d5cff76f3df13074db813c663b044f7f126907c8106a25
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
+ ##2.2.0
2
+ -AWS-SDK-3 update
1
3
  ##2.1.3
2
4
  -SECURITY: Raise MIXIN to a newer Version
5
+ -fix: runs now on logstash 7.16
3
6
  ##2.1.2
4
7
  - FEATURE: Now it´s possible to use queue urls and names.
5
8
  - FEATURE: Add sqs long polling config parameter: sqs_wait_time_seconds
data/lib/logstash/inputs/s3snssqs.rb CHANGED
@@ -5,8 +5,9 @@ require "logstash/timestamp"
5
5
  require "logstash/plugin_mixins/aws_config"
6
6
  require "logstash/shutdown_watcher"
7
7
  require "logstash/errors"
8
- require 'logstash/inputs/s3sqs/patch'
9
- require "aws-sdk"
8
+ require "aws-sdk-s3"
9
+ require "aws-sdk-sns"
10
+ require "aws-sdk-sqs"
10
11
 
11
12
  # "object-oriented interfaces on top of API clients"...
12
13
  # => Overhead. FIXME: needed?
@@ -35,8 +36,6 @@ require_relative 's3/downloader'
35
36
  require_relative 'codec_factory'
36
37
  require_relative 's3snssqs/log_processor'
37
38
 
38
- Aws.eager_autoload!
39
-
40
39
  # Get logs from AWS s3 buckets as issued by an object-created event via sqs.
41
40
  #
42
41
  # This plugin is based on the logstash-input-sqs plugin but doesn't log the sqs event itself.
data/logstash-input-s3-sns-sqs.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-input-s3-sns-sqs'
3
- s.version = '2.1.3'
3
+ s.version = '2.2.0.pre'
4
4
  s.licenses = ['Apache-2.0']
5
5
  s.summary = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> sqs."
6
6
  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,9 +20,21 @@ Gem::Specification.new do |s|
20
20
 
21
21
  # Gem dependencies
22
22
  s.add_runtime_dependency "logstash-core-plugin-api", ">= 2.1.12", "<= 2.99"
23
+ s.add_runtime_dependency "concurrent-ruby"
24
+ s.add_runtime_dependency "logstash-codec-json"
25
+ s.add_runtime_dependency "logstash-codec-plain"
26
+ s.add_runtime_dependency "aws-sdk-core", "~> 3"
27
+ s.add_runtime_dependency "aws-sdk-s3"
28
+ s.add_runtime_dependency "aws-sdk-sqs"
29
+ s.add_runtime_dependency "aws-sdk-sns"
30
+ s.add_runtime_dependency "aws-sdk-resourcegroups"
31
+
32
+ s.add_development_dependency "logstash-codec-json_lines"
33
+ s.add_development_dependency "logstash-codec-multiline"
34
+ s.add_development_dependency "logstash-codec-json"
35
+ s.add_development_dependency "logstash-codec-line"
36
+ s.add_development_dependency "logstash-devutils"
37
+ s.add_development_dependency "logstash-input-generator"
38
+ s.add_development_dependency "timecop"
23
39
 
24
- s.add_runtime_dependency 'logstash-codec-json', '~> 3.0'
25
- s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.3'
26
- s.add_development_dependency 'logstash-codec-json_stream', '~> 1.0'
27
- s.add_development_dependency 'logstash-devutils', '~> 1.3'
28
40
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-s3-sns-sqs
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.2.0.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Herweg
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-20 00:00:00.000000000 Z
11
+ date: 2022-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -33,59 +33,213 @@ dependencies:
33
33
  - !ruby/object:Gem::Dependency
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
- - - "~>"
36
+ - - ">="
37
37
  - !ruby/object:Gem::Version
38
- version: '3.0'
38
+ version: '0'
39
+ name: concurrent-ruby
40
+ prerelease: false
41
+ type: :runtime
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ - - ">="
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
47
+ - !ruby/object:Gem::Dependency
48
+ requirement: !ruby/object:Gem::Requirement
49
+ requirements:
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: '0'
39
53
  name: logstash-codec-json
40
54
  prerelease: false
41
55
  type: :runtime
42
56
  version_requirements: !ruby/object:Gem::Requirement
43
57
  requirements:
44
- - - "~>"
58
+ - - ">="
45
59
  - !ruby/object:Gem::Version
46
- version: '3.0'
60
+ version: '0'
47
61
  - !ruby/object:Gem::Dependency
48
62
  requirement: !ruby/object:Gem::Requirement
49
63
  requirements:
50
64
  - - ">="
51
65
  - !ruby/object:Gem::Version
52
- version: '4.3'
53
- name: logstash-mixin-aws
66
+ version: '0'
67
+ name: logstash-codec-plain
54
68
  prerelease: false
55
69
  type: :runtime
56
70
  version_requirements: !ruby/object:Gem::Requirement
57
71
  requirements:
58
72
  - - ">="
59
73
  - !ruby/object:Gem::Version
60
- version: '4.3'
74
+ version: '0'
61
75
  - !ruby/object:Gem::Dependency
62
76
  requirement: !ruby/object:Gem::Requirement
63
77
  requirements:
64
78
  - - "~>"
65
79
  - !ruby/object:Gem::Version
66
- version: '1.0'
67
- name: logstash-codec-json_stream
80
+ version: '3'
81
+ name: aws-sdk-core
68
82
  prerelease: false
69
- type: :development
83
+ type: :runtime
70
84
  version_requirements: !ruby/object:Gem::Requirement
71
85
  requirements:
72
86
  - - "~>"
73
87
  - !ruby/object:Gem::Version
74
- version: '1.0'
88
+ version: '3'
75
89
  - !ruby/object:Gem::Dependency
76
90
  requirement: !ruby/object:Gem::Requirement
77
91
  requirements:
78
- - - "~>"
92
+ - - ">="
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
95
+ name: aws-sdk-s3
96
+ prerelease: false
97
+ type: :runtime
98
+ version_requirements: !ruby/object:Gem::Requirement
99
+ requirements:
100
+ - - ">="
101
+ - !ruby/object:Gem::Version
102
+ version: '0'
103
+ - !ruby/object:Gem::Dependency
104
+ requirement: !ruby/object:Gem::Requirement
105
+ requirements:
106
+ - - ">="
107
+ - !ruby/object:Gem::Version
108
+ version: '0'
109
+ name: aws-sdk-sqs
110
+ prerelease: false
111
+ type: :runtime
112
+ version_requirements: !ruby/object:Gem::Requirement
113
+ requirements:
114
+ - - ">="
115
+ - !ruby/object:Gem::Version
116
+ version: '0'
117
+ - !ruby/object:Gem::Dependency
118
+ requirement: !ruby/object:Gem::Requirement
119
+ requirements:
120
+ - - ">="
121
+ - !ruby/object:Gem::Version
122
+ version: '0'
123
+ name: aws-sdk-sns
124
+ prerelease: false
125
+ type: :runtime
126
+ version_requirements: !ruby/object:Gem::Requirement
127
+ requirements:
128
+ - - ">="
129
+ - !ruby/object:Gem::Version
130
+ version: '0'
131
+ - !ruby/object:Gem::Dependency
132
+ requirement: !ruby/object:Gem::Requirement
133
+ requirements:
134
+ - - ">="
135
+ - !ruby/object:Gem::Version
136
+ version: '0'
137
+ name: aws-sdk-resourcegroups
138
+ prerelease: false
139
+ type: :runtime
140
+ version_requirements: !ruby/object:Gem::Requirement
141
+ requirements:
142
+ - - ">="
143
+ - !ruby/object:Gem::Version
144
+ version: '0'
145
+ - !ruby/object:Gem::Dependency
146
+ requirement: !ruby/object:Gem::Requirement
147
+ requirements:
148
+ - - ">="
149
+ - !ruby/object:Gem::Version
150
+ version: '0'
151
+ name: logstash-codec-json_lines
152
+ prerelease: false
153
+ type: :development
154
+ version_requirements: !ruby/object:Gem::Requirement
155
+ requirements:
156
+ - - ">="
157
+ - !ruby/object:Gem::Version
158
+ version: '0'
159
+ - !ruby/object:Gem::Dependency
160
+ requirement: !ruby/object:Gem::Requirement
161
+ requirements:
162
+ - - ">="
163
+ - !ruby/object:Gem::Version
164
+ version: '0'
165
+ name: logstash-codec-multiline
166
+ prerelease: false
167
+ type: :development
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ requirements:
170
+ - - ">="
171
+ - !ruby/object:Gem::Version
172
+ version: '0'
173
+ - !ruby/object:Gem::Dependency
174
+ requirement: !ruby/object:Gem::Requirement
175
+ requirements:
176
+ - - ">="
79
177
  - !ruby/object:Gem::Version
80
- version: '1.3'
178
+ version: '0'
179
+ name: logstash-codec-json
180
+ prerelease: false
181
+ type: :development
182
+ version_requirements: !ruby/object:Gem::Requirement
183
+ requirements:
184
+ - - ">="
185
+ - !ruby/object:Gem::Version
186
+ version: '0'
187
+ - !ruby/object:Gem::Dependency
188
+ requirement: !ruby/object:Gem::Requirement
189
+ requirements:
190
+ - - ">="
191
+ - !ruby/object:Gem::Version
192
+ version: '0'
193
+ name: logstash-codec-line
194
+ prerelease: false
195
+ type: :development
196
+ version_requirements: !ruby/object:Gem::Requirement
197
+ requirements:
198
+ - - ">="
199
+ - !ruby/object:Gem::Version
200
+ version: '0'
201
+ - !ruby/object:Gem::Dependency
202
+ requirement: !ruby/object:Gem::Requirement
203
+ requirements:
204
+ - - ">="
205
+ - !ruby/object:Gem::Version
206
+ version: '0'
81
207
  name: logstash-devutils
82
208
  prerelease: false
83
209
  type: :development
84
210
  version_requirements: !ruby/object:Gem::Requirement
85
211
  requirements:
86
- - - "~>"
212
+ - - ">="
87
213
  - !ruby/object:Gem::Version
88
- version: '1.3'
214
+ version: '0'
215
+ - !ruby/object:Gem::Dependency
216
+ requirement: !ruby/object:Gem::Requirement
217
+ requirements:
218
+ - - ">="
219
+ - !ruby/object:Gem::Version
220
+ version: '0'
221
+ name: logstash-input-generator
222
+ prerelease: false
223
+ type: :development
224
+ version_requirements: !ruby/object:Gem::Requirement
225
+ requirements:
226
+ - - ">="
227
+ - !ruby/object:Gem::Version
228
+ version: '0'
229
+ - !ruby/object:Gem::Dependency
230
+ requirement: !ruby/object:Gem::Requirement
231
+ requirements:
232
+ - - ">="
233
+ - !ruby/object:Gem::Version
234
+ version: '0'
235
+ name: timecop
236
+ prerelease: false
237
+ type: :development
238
+ version_requirements: !ruby/object:Gem::Requirement
239
+ requirements:
240
+ - - ">="
241
+ - !ruby/object:Gem::Version
242
+ version: '0'
89
243
  description: This gem is a logstash plugin required to be installed on top of the
90
244
  Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not
91
245
  a stand-alone program
@@ -106,7 +260,6 @@ files:
106
260
  - lib/logstash/inputs/s3/downloader.rb
107
261
  - lib/logstash/inputs/s3snssqs.rb
108
262
  - lib/logstash/inputs/s3snssqs/log_processor.rb
109
- - lib/logstash/inputs/s3sqs/patch.rb
110
263
  - lib/logstash/inputs/sqs/poller.rb
111
264
  - logstash-input-s3-sns-sqs.gemspec
112
265
  - spec/inputs/s3sqs_spec.rb
@@ -127,12 +280,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
127
280
  version: '0'
128
281
  required_rubygems_version: !ruby/object:Gem::Requirement
129
282
  requirements:
130
- - - ">="
283
+ - - ">"
131
284
  - !ruby/object:Gem::Version
132
- version: '0'
285
+ version: 1.3.1
133
286
  requirements: []
134
- rubyforge_project:
135
- rubygems_version: 2.6.13
287
+ rubygems_version: 3.1.6
136
288
  signing_key:
137
289
  specification_version: 4
138
290
  summary: Get logs from AWS s3 buckets as issued by an object-created event via sns
data/lib/logstash/inputs/s3sqs/patch.rb DELETED
@@ -1,22 +0,0 @@
1
- # This patch was stolen from logstash-plugins/logstash-output-s3#102.
2
- #
3
- # This patch is a workaround for a JRuby issue which has been fixed in JRuby
4
- # 9000, but not in JRuby 1.7. See https://github.com/jruby/jruby/issues/3645
5
- # and https://github.com/jruby/jruby/issues/3920. This is necessary because the
6
- # `aws-sdk` is doing tricky name discovery to generate the correct error class.
7
- #
8
- # As per https://github.com/aws/aws-sdk-ruby/issues/1301#issuecomment-261115960,
9
- # this patch may be short-lived anyway.
10
- require 'aws-sdk'
11
-
12
- begin
13
- old_stderr = $stderr
14
- $stderr = StringIO.new
15
-
16
- module Aws
17
- const_set(:S3, Aws::S3)
18
- const_set(:SQS, Aws::SQS)
19
- end
20
- ensure
21
- $stderr = old_stderr
22
- end