fastly_nsq 1.17.0 → 1.17.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.git-blame-ignore-revs +6 -0
- data/.ruby-version +1 -1
- data/.travis.yml +4 -2
- data/ChangeLog.md +8 -1
- data/Gemfile +8 -8
- data/README.md +1 -1
- data/Rakefile +10 -11
- data/fastly_nsq.gemspec +26 -26
- data/lib/fastly_nsq/cli.rb +43 -50
- data/lib/fastly_nsq/consumer.rb +6 -6
- data/lib/fastly_nsq/feeder.rb +5 -7
- data/lib/fastly_nsq/http/nsqd.rb +28 -28
- data/lib/fastly_nsq/http/nsqlookupd.rb +11 -11
- data/lib/fastly_nsq/http.rb +4 -4
- data/lib/fastly_nsq/launcher.rb +16 -16
- data/lib/fastly_nsq/listener.rb +16 -16
- data/lib/fastly_nsq/manager.rb +13 -12
- data/lib/fastly_nsq/message.rb +4 -4
- data/lib/fastly_nsq/messenger.rb +7 -7
- data/lib/fastly_nsq/new_relic.rb +8 -8
- data/lib/fastly_nsq/priority_queue.rb +2 -2
- data/lib/fastly_nsq/priority_thread_pool.rb +3 -3
- data/lib/fastly_nsq/producer.rb +7 -7
- data/lib/fastly_nsq/safe_thread.rb +1 -1
- data/lib/fastly_nsq/testing.rb +4 -3
- data/lib/fastly_nsq/tls_options.rb +6 -6
- data/lib/fastly_nsq/version.rb +1 -1
- data/lib/fastly_nsq.rb +27 -29
- data/spec/cli_spec.rb +2 -2
- data/spec/consumer_spec.rb +12 -12
- data/spec/fastly_nsq_spec.rb +31 -31
- data/spec/feeder_spec.rb +4 -4
- data/spec/http/nsqd_spec.rb +23 -23
- data/spec/http/nsqlookupd_spec.rb +19 -19
- data/spec/http_spec.rb +22 -22
- data/spec/integration_spec.rb +10 -10
- data/spec/launcher_spec.rb +21 -21
- data/spec/listener_spec.rb +50 -50
- data/spec/manager_spec.rb +27 -27
- data/spec/matchers/delegate.rb +4 -4
- data/spec/message_spec.rb +19 -19
- data/spec/messenger_spec.rb +63 -64
- data/spec/new_relic.rb +27 -27
- data/spec/priority_thread_pool_spec.rb +2 -2
- data/spec/producer_spec.rb +30 -30
- data/spec/spec_helper.rb +12 -12
- data/spec/support/http.rb +2 -2
- data/spec/support/webmock.rb +1 -1
- data/spec/testing_spec.rb +12 -12
- data/spec/tls_options_spec.rb +47 -47
- metadata +7 -8
- data/.rubocop.yml +0 -68
data/spec/tls_options_spec.rb
CHANGED
@@ -1,39 +1,39 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require
|
3
|
+
require "spec_helper"
|
4
4
|
|
5
5
|
RSpec.describe FastlyNsq::TlsOptions do
|
6
|
-
describe
|
7
|
-
describe
|
8
|
-
it
|
6
|
+
describe "when SSL ENV variables are not set" do
|
7
|
+
describe ".to_h" do
|
8
|
+
it "returns nil when initialized without parameters" do
|
9
9
|
context = FastlyNsq::TlsOptions.new
|
10
10
|
|
11
11
|
expect(context.to_h).to eq({})
|
12
12
|
end
|
13
13
|
|
14
|
-
it
|
14
|
+
it "returns an equivalent hash when all variables are defined" do
|
15
15
|
tls_options_hash = {
|
16
|
-
key:
|
17
|
-
certificate:
|
18
|
-
ca_certificate:
|
16
|
+
key: "key",
|
17
|
+
certificate: "certificate",
|
18
|
+
ca_certificate: "ca_certificate"
|
19
19
|
}
|
20
20
|
context = FastlyNsq::TlsOptions.new(tls_options_hash)
|
21
21
|
|
22
22
|
expected_output = {
|
23
23
|
tls_v1: true,
|
24
24
|
tls_options: {
|
25
|
-
key:
|
26
|
-
certificate:
|
27
|
-
ca_certificate:
|
28
|
-
}
|
25
|
+
key: "key",
|
26
|
+
certificate: "certificate",
|
27
|
+
ca_certificate: "ca_certificate"
|
28
|
+
}
|
29
29
|
}
|
30
30
|
expect(context.to_h).to eq(expected_output)
|
31
31
|
end
|
32
32
|
|
33
|
-
it
|
33
|
+
it "does not add keys with nil values" do
|
34
34
|
tls_options_hash = {
|
35
|
-
key:
|
36
|
-
certificate:
|
35
|
+
key: "key",
|
36
|
+
certificate: "certificate"
|
37
37
|
}
|
38
38
|
context = FastlyNsq::TlsOptions.new(tls_options_hash)
|
39
39
|
ca_certificate = context.to_h[:ca_certificate]
|
@@ -43,60 +43,60 @@ RSpec.describe FastlyNsq::TlsOptions do
|
|
43
43
|
end
|
44
44
|
end
|
45
45
|
|
46
|
-
describe
|
46
|
+
describe "when SSL ENV variables are set" do
|
47
47
|
before do
|
48
|
-
ENV[
|
49
|
-
ENV[
|
50
|
-
ENV[
|
51
|
-
ENV[
|
48
|
+
ENV["NSQ_SSL_KEY"] = "/some/key"
|
49
|
+
ENV["NSQ_SSL_CERTIFICATE"] = "/some/certificate"
|
50
|
+
ENV["NSQ_SSL_CA_CERTIFICATE"] = "/some/ca_certificate"
|
51
|
+
ENV["NSQ_SSL_VERIFY_MODE"] = "value"
|
52
52
|
end
|
53
53
|
|
54
54
|
after do
|
55
|
-
ENV[
|
56
|
-
ENV[
|
57
|
-
ENV[
|
58
|
-
ENV[
|
55
|
+
ENV["NSQ_SSL_KEY"] = nil
|
56
|
+
ENV["NSQ_SSL_CERTIFICATE"] = nil
|
57
|
+
ENV["NSQ_SSL_CA_CERTIFICATE"] = nil
|
58
|
+
ENV["NSQ_SSL_VERIFY_MODE"] = nil
|
59
59
|
end
|
60
60
|
|
61
|
-
describe
|
62
|
-
it
|
61
|
+
describe ".to_h" do
|
62
|
+
it "returns a hash of the env variables when no parameters are passed" do
|
63
63
|
expected_hash = {
|
64
64
|
tls_v1: true,
|
65
65
|
tls_options: {
|
66
|
-
key: ENV[
|
67
|
-
certificate: ENV[
|
68
|
-
ca_certificate: ENV[
|
69
|
-
verify_mode: ENV[
|
70
|
-
}
|
66
|
+
key: ENV["NSQ_SSL_KEY"],
|
67
|
+
certificate: ENV["NSQ_SSL_CERTIFICATE"],
|
68
|
+
ca_certificate: ENV["NSQ_SSL_CA_CERTIFICATE"],
|
69
|
+
verify_mode: ENV["NSQ_SSL_VERIFY_MODE"]
|
70
|
+
}
|
71
71
|
}
|
72
72
|
context = FastlyNsq::TlsOptions.new
|
73
73
|
|
74
74
|
expect(context.to_h).to eq(expected_hash)
|
75
75
|
end
|
76
76
|
|
77
|
-
it
|
78
|
-
passed_certificate =
|
77
|
+
it "merges passed parameters and env variables" do
|
78
|
+
passed_certificate = "/passed/certificate"
|
79
79
|
expected_hash = {
|
80
80
|
tls_v1: true,
|
81
81
|
tls_options: {
|
82
|
-
key: ENV[
|
82
|
+
key: ENV["NSQ_SSL_KEY"],
|
83
83
|
certificate: passed_certificate,
|
84
|
-
ca_certificate: ENV[
|
85
|
-
verify_mode: ENV[
|
86
|
-
}
|
84
|
+
ca_certificate: ENV["NSQ_SSL_CA_CERTIFICATE"],
|
85
|
+
verify_mode: ENV["NSQ_SSL_VERIFY_MODE"]
|
86
|
+
}
|
87
87
|
}
|
88
88
|
context = FastlyNsq::TlsOptions.new(certificate: passed_certificate)
|
89
89
|
|
90
90
|
expect(context.to_h).to eq(expected_hash)
|
91
91
|
end
|
92
92
|
|
93
|
-
it
|
93
|
+
it "removes keys that are nil" do
|
94
94
|
expected_hash = {
|
95
95
|
tls_v1: true,
|
96
96
|
tls_options: {
|
97
|
-
ca_certificate: ENV[
|
98
|
-
verify_mode: ENV[
|
99
|
-
}
|
97
|
+
ca_certificate: ENV["NSQ_SSL_CA_CERTIFICATE"],
|
98
|
+
verify_mode: ENV["NSQ_SSL_VERIFY_MODE"]
|
99
|
+
}
|
100
100
|
}
|
101
101
|
context = FastlyNsq::TlsOptions.new(key: nil, certificate: nil)
|
102
102
|
|
@@ -105,16 +105,16 @@ RSpec.describe FastlyNsq::TlsOptions do
|
|
105
105
|
end
|
106
106
|
end
|
107
107
|
|
108
|
-
describe
|
109
|
-
it
|
108
|
+
describe "as_hash" do
|
109
|
+
it "returns an tls_options hash" do
|
110
110
|
expected_hash = {
|
111
111
|
tls_v1: true,
|
112
112
|
tls_options: {
|
113
|
-
key:
|
114
|
-
certificate:
|
115
|
-
}
|
113
|
+
key: "joe",
|
114
|
+
certificate: "biden"
|
115
|
+
}
|
116
116
|
}
|
117
|
-
output_hash = FastlyNsq::TlsOptions.as_hash(key:
|
117
|
+
output_hash = FastlyNsq::TlsOptions.as_hash(key: "joe", certificate: "biden")
|
118
118
|
expect(output_hash).to eq(expected_hash)
|
119
119
|
end
|
120
120
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fastly_nsq
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.17.
|
4
|
+
version: 1.17.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tommy O'Neil
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date:
|
16
|
+
date: 2022-02-23 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: awesome_print
|
@@ -156,19 +156,19 @@ dependencies:
|
|
156
156
|
- !ruby/object:Gem::Version
|
157
157
|
version: '1.0'
|
158
158
|
- !ruby/object:Gem::Dependency
|
159
|
-
name: nsq-ruby
|
159
|
+
name: nsq-ruby-fastly
|
160
160
|
requirement: !ruby/object:Gem::Requirement
|
161
161
|
requirements:
|
162
162
|
- - "~>"
|
163
163
|
- !ruby/object:Gem::Version
|
164
|
-
version: '2.
|
164
|
+
version: '2.4'
|
165
165
|
type: :runtime
|
166
166
|
prerelease: false
|
167
167
|
version_requirements: !ruby/object:Gem::Requirement
|
168
168
|
requirements:
|
169
169
|
- - "~>"
|
170
170
|
- !ruby/object:Gem::Version
|
171
|
-
version: '2.
|
171
|
+
version: '2.4'
|
172
172
|
- !ruby/object:Gem::Dependency
|
173
173
|
name: priority_queue_cxx
|
174
174
|
requirement: !ruby/object:Gem::Requirement
|
@@ -192,11 +192,11 @@ extra_rdoc_files: []
|
|
192
192
|
files:
|
193
193
|
- ".document"
|
194
194
|
- ".env"
|
195
|
+
- ".git-blame-ignore-revs"
|
195
196
|
- ".github/PULL_REQUEST_TEMPLATE.md"
|
196
197
|
- ".gitignore"
|
197
198
|
- ".overcommit.yml"
|
198
199
|
- ".rdoc_options"
|
199
|
-
- ".rubocop.yml"
|
200
200
|
- ".ruby-version"
|
201
201
|
- ".travis.yml"
|
202
202
|
- ChangeLog.md
|
@@ -269,8 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
269
269
|
- !ruby/object:Gem::Version
|
270
270
|
version: '0'
|
271
271
|
requirements: []
|
272
|
-
|
273
|
-
rubygems_version: 2.7.9
|
272
|
+
rubygems_version: 3.2.32
|
274
273
|
signing_key:
|
275
274
|
specification_version: 4
|
276
275
|
summary: Fastly NSQ Adapter
|
data/.rubocop.yml
DELETED
@@ -1,68 +0,0 @@
|
|
1
|
-
AllCops:
|
2
|
-
Include:
|
3
|
-
- '**/Rakefile'
|
4
|
-
Exclude:
|
5
|
-
- 'db/schema.rb'
|
6
|
-
- 'vendor/**/*'
|
7
|
-
- 'Gemfile'
|
8
|
-
TargetRubyVersion: 2.4
|
9
|
-
|
10
|
-
Layout/DotPosition:
|
11
|
-
Enabled: true
|
12
|
-
EnforcedStyle: trailing
|
13
|
-
SupportedStyles:
|
14
|
-
- leading
|
15
|
-
- trailing
|
16
|
-
|
17
|
-
Lint/AmbiguousBlockAssociation:
|
18
|
-
Exclude:
|
19
|
-
- 'spec/**/*'
|
20
|
-
|
21
|
-
Lint/RescueWithoutErrorClass:
|
22
|
-
Enabled: false
|
23
|
-
|
24
|
-
Metrics/MethodLength:
|
25
|
-
Enabled: false
|
26
|
-
|
27
|
-
Metrics/AbcSize:
|
28
|
-
Enabled: false
|
29
|
-
|
30
|
-
Metrics/LineLength:
|
31
|
-
Enabled: false
|
32
|
-
|
33
|
-
Metrics/ParameterLists:
|
34
|
-
Enabled: false
|
35
|
-
|
36
|
-
Metrics/BlockLength:
|
37
|
-
ExcludedMethods: [describe, context, configure]
|
38
|
-
|
39
|
-
Style/ClassAndModuleChildren:
|
40
|
-
Enabled: false
|
41
|
-
|
42
|
-
Style/ClassVars:
|
43
|
-
Description: 'Avoid the use of class variables.'
|
44
|
-
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-class-vars'
|
45
|
-
Enabled: false
|
46
|
-
|
47
|
-
Style/Documentation:
|
48
|
-
Enabled: false
|
49
|
-
|
50
|
-
Style/GuardClause:
|
51
|
-
Enabled: false
|
52
|
-
|
53
|
-
Style/IfUnlessModifier:
|
54
|
-
Enabled: false
|
55
|
-
|
56
|
-
Style/RegexpLiteral:
|
57
|
-
Enabled: false
|
58
|
-
|
59
|
-
Style/SignalException:
|
60
|
-
EnforcedStyle: only_raise
|
61
|
-
|
62
|
-
Style/TrailingCommaInArguments:
|
63
|
-
EnforcedStyleForMultiline: comma
|
64
|
-
Enabled: true
|
65
|
-
|
66
|
-
Style/TrailingCommaInLiteral:
|
67
|
-
EnforcedStyleForMultiline: comma
|
68
|
-
Enabled: true
|