bosh_aws_cpi 1.2969.0 → 1.2972.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcde551d05372c1632aa0700f220bf35a2349a24
-  data.tar.gz: e53bfe4f18026b2ca4050868d9d53e6cd6195c7d
+  metadata.gz: 8e06d17c1465acf4c2d05fe7b746b75e7835d683
+  data.tar.gz: 5ed9c3c800c500a7f07657b107de9629599d36ab
 SHA512:
-  metadata.gz: dc59fc528e9049e0c21ed879ad32a206c5f43e0dcead227311292a4a15b114dc132b7354290a6698a4c4d15fc44795c375cc7177f5692568f94516a89fe147b4
-  data.tar.gz: 5941409c18a8f643e1ce4e44fdd36fbad8e4108e7a15afc50e6320feffd9b21a445f42c66f146dbb694dbe11418953300c3430b4680783456bce90e77165e0da
+  metadata.gz: f660a88e715614d77a2e6e73385b0c5fddb662d913458690b7ea4892205519afd6eda7c92085d4111210d2da22d0b6eadac769e8e39305df6ae5b88567da6d53
+  data.tar.gz: e9ff55052f5ff610401a32c596acf6c6a63b2494e37e85c83513918eea4ee6840e21f8260654964193c9deb9e33a0f72422ab5f3879c031e6eeee68da1958d8a

data/lib/cloud/aws/cloud.rb

@@ -245,7 +245,13 @@ module Bosh::AwsCloud
         errors = [AWS::EC2::Errors::VolumeInUse, AWS::EC2::Errors::RequestLimitExceeded]
 
         Bosh::Common.retryable(tries: tries, sleep: sleep_cb, on: errors, ensure: ensure_cb) do
-          volume.delete
+          begin
+            volume.delete
+          rescue AWS::EC2::Errors::InvalidVolume::NotFound => e
+            logger.warn("Failed to delete disk '#{disk_id}' because it was not found: #{e.inspect}")
+            raise Bosh::Clouds::DiskNotFound, "Disk '#{disk_id}' not found"
+          end
+
           true # return true to only retry on Exceptions
         end
 
@@ -319,21 +325,23 @@ module Bosh::AwsCloud
     # @param [String] disk_id disk id of the disk to take the snapshot of
     # @return [String] snapshot id
     def snapshot_disk(disk_id, metadata)
+      metadata = Hash[metadata.map{|key,value| [key.to_s, value] }]
+
       with_thread_name("snapshot_disk(#{disk_id})") do
         volume = @ec2.volumes[disk_id]
         devices = []
         volume.attachments.each {|attachment| devices << attachment.device}
 
-        name = [:deployment, :job, :index].collect { |key| metadata[key] }
+        name = ['deployment', 'job', 'index'].collect { |key| metadata[key] }
         name << devices.first.split('/').last unless devices.empty?
 
         snapshot = volume.create_snapshot(name.join('/'))
         logger.info("snapshot '#{snapshot.id}' of volume '#{disk_id}' created")
 
-        [:agent_id, :instance_id, :director_name, :director_uuid].each do |key|
+        ['agent_id', 'instance_id', 'director_name', 'director_uuid'].each do |key|
           TagManager.tag(snapshot, key, metadata[key])
         end
-        TagManager.tag(snapshot, :device, devices.first) unless devices.empty?
+        TagManager.tag(snapshot, 'device', devices.first) unless devices.empty?
         TagManager.tag(snapshot, 'Name', name.join('/'))
 
         ResourceWait.for_snapshot(snapshot: snapshot, state: :completed)
@@ -482,19 +490,21 @@ module Bosh::AwsCloud
     # @param [Hash] metadata metadata key/value pairs
     # @return [void]
     def set_vm_metadata(vm, metadata)
+      metadata = Hash[metadata.map{|key,value| [key.to_s, value] }]
+
       instance = @ec2.instances[vm]
 
       metadata.each_pair do |key, value|
         TagManager.tag(instance, key, value)
       end
 
-      job = metadata[:job]
-      index = metadata[:index]
+      job = metadata['job']
+      index = metadata['index']
 
       if job && index
         name = "#{job}/#{index}"
-      elsif metadata[:compiling]
-        name = "compiling/#{metadata[:compiling]}"
+      elsif metadata['compiling']
+        name = "compiling/#{metadata['compiling']}"
       end
       TagManager.tag(instance, "Name", name) if name
     rescue AWS::EC2::Errors::TagLimitExceeded => e

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2969.0'
+    VERSION = '1.2972.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2969.0
+  version: 1.2972.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH AWS CPI
-  a2411c
+  a6d1e9
 email: support@cloudfoundry.com
 executables:
 - aws_cpi