Skip to content

Commit

Permalink
update aws-sdk to fix issue with encrypted blobs
Browse files Browse the repository at this point in the history
AWS upgraded OpenSSL and introduced a regression for aws-sdk
blobs using encryption.

"These issues have existed in the code for some time, but negative
effects were only recently realized when a change in OpenSSL behavior
resulted in empty packets being sent over the wire - yielding these
caused exceptions downstream, rather than waiting for the content to be
sent. That issue should no longer occur"

See aws/aws-sdk-ruby#557 (comment)
for upstream bug and fix.

aws/aws-sdk-ruby@0898b0c
is the patch we need. This patch is applied to v1.44.0.

Thanks @frodenas for bug hunting with me.
  • Loading branch information
drnic authored and Adam Stegman committed Jul 1, 2014
1 parent 03f604f commit 610827d
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 10 deletions.
11 changes: 5 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PATH
remote: blobstore_client
specs:
blobstore_client (1.2619.0)
aws-sdk (= 1.32.0)
aws-sdk (= 1.44.0)
bosh_common (~> 1.2619.0)
fog (~> 1.14.0)
httpclient (= 2.2.4)
Expand Down Expand Up @@ -88,7 +88,7 @@ PATH
remote: bosh-monitor
specs:
bosh-monitor (1.2619.0)
aws-sdk (= 1.32.0)
aws-sdk (= 1.44.0)
dogapi (~> 1.6.0)
em-http-request (~> 0.3.0)
eventmachine (~> 1.0.0)
Expand All @@ -103,7 +103,7 @@ PATH
remote: bosh-registry
specs:
bosh-registry (1.2619.0)
aws-sdk (= 1.32.0)
aws-sdk (= 1.44.0)
fog (~> 1.14.0)
sequel (~> 3.43.0)
sinatra (~> 1.4.2)
Expand Down Expand Up @@ -147,7 +147,7 @@ PATH
remote: bosh_aws_cpi
specs:
bosh_aws_cpi (1.2619.0)
aws-sdk (= 1.32.0)
aws-sdk (= 1.44.0)
bosh-registry (~> 1.2619.0)
bosh_common (~> 1.2619.0)
bosh_cpi (~> 1.2619.0)
Expand Down Expand Up @@ -257,10 +257,9 @@ GEM
specs:
addressable (2.3.4)
ast (2.0.0)
aws-sdk (1.32.0)
aws-sdk (1.44.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
bcrypt-ruby (3.0.1)
beefcake (0.3.7)
bosh_vcloud_cpi (0.5.4)
Expand Down
2 changes: 1 addition & 1 deletion blobstore_client/blobstore_client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.bindir = 'bin'
s.executables = %w(blobstore_client_console)

s.add_dependency 'aws-sdk', '1.32.0'
s.add_dependency 'aws-sdk', '1.44.0'
s.add_dependency 'fog', '~>1.14.0'
s.add_dependency 'httpclient', '=2.2.4'
s.add_dependency 'multi_json', '~> 1.1'
Expand Down
2 changes: 1 addition & 1 deletion bosh-monitor/bosh-monitor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency 'yajl-ruby', '~>1.1.0'
s.add_dependency 'thin', '~>1.5.0'
s.add_dependency 'sinatra', '~>1.4.2'
s.add_dependency 'aws-sdk', '1.32.0'
s.add_dependency 'aws-sdk', '1.44.0'
s.add_dependency 'dogapi', '~> 1.6.0'
s.add_dependency 'uuidtools', '~> 2.1'

Expand Down
2 changes: 1 addition & 1 deletion bosh-registry/bosh-registry.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Gem::Specification.new do |s|
s.add_dependency 'thin', '~>1.5.0'
s.add_dependency 'yajl-ruby', '~>1.1.0'
s.add_dependency 'fog', '~>1.14.0'
s.add_dependency 'aws-sdk', '1.32.0'
s.add_dependency 'aws-sdk', '1.44.0'
end
2 changes: 1 addition & 1 deletion bosh_aws_cpi/bosh_aws_cpi.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.bindir = 'bin'
s.executables = %w(bosh_aws_console)

s.add_dependency 'aws-sdk', '1.32.0'
s.add_dependency 'aws-sdk', '1.44.0'
s.add_dependency 'bosh_common', "~>#{version}"
s.add_dependency 'bosh_cpi', "~>#{version}"
s.add_dependency 'bosh-registry', "~>#{version}"
Expand Down
Binary file removed vendor/cache/aws-sdk-1.32.0.gem
Binary file not shown.
Binary file added vendor/cache/aws-sdk-1.44.0.gem
Binary file not shown.

0 comments on commit 610827d

Please sign in to comment.