Skip to content

Commit ed55eab

Browse files
authored
Refactor: cleanup unused (old) method (logstash-plugins#217)
was used in V1 - no longer relevant with aws-sdk 2.x
1 parent 0f0e528 commit ed55eab

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

lib/logstash/outputs/s3.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,6 @@ def bucket_resource
326326
Aws::S3::Bucket.new(@bucket, full_options)
327327
end
328328

329-
def aws_service_endpoint(region)
330-
{ :s3_endpoint => region == 'us-east-1' ? 's3.amazonaws.com' : "s3-#{region}.amazonaws.com"}
331-
end
332-
333329
def rotate_if_needed(prefixes)
334330
prefixes.each do |prefix|
335331
# Each file access is thread safe,

spec/outputs/s3_spec.rb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,27 @@
204204
subject.multi_receive_encoded(events_and_encoded)
205205
end
206206
end
207+
208+
describe "aws service" do
209+
context 'us-east-1' do
210+
let(:region) { 'us-east-1' }
211+
it "sets endpoint" do
212+
expect( subject.send(:bucket_resource).client.config.endpoint.to_s ).to eql 'https://s3.us-east-1.amazonaws.com'
213+
end
214+
end
215+
216+
context 'ap-east-1' do
217+
let(:region) { 'ap-east-1' }
218+
it "sets endpoint" do
219+
expect( subject.send(:bucket_resource).client.config.endpoint.to_s ).to eql 'https://s3.ap-east-1.amazonaws.com'
220+
end
221+
end
222+
223+
context 'cn-northwest-1' do
224+
let(:region) { 'cn-northwest-1' }
225+
it "sets endpoint" do
226+
expect( subject.send(:bucket_resource).client.config.endpoint.to_s ).to eql 'https://s3.cn-northwest-1.amazonaws.com.cn'
227+
end
228+
end
229+
end
207230
end

0 commit comments

Comments
 (0)