Merge pull request #367 from cloudify-cosmo/RD-28960-EBS-Fix

fix issue introduced in last change

CHANGELOG.txt

@@ -150,3 +150,5 @@
 2.12.1:
     - Support group deployment creation for 5.2.4.
     - Support passing fn arguments to detach ebs.
+2.12.2:
+    - Fix issue introduced in the detach ebs change.

cloudify_aws/ec2/resources/ebs.py

@@ -178,10 +178,14 @@ def _detach_ebs(iface, volume_id, **kwargs):
     :param volume_id:
     """
     deleted_params = {'VolumeId': volume_id}
-    deleted_params['Device'] = kwargs.get('Device')
-    deleted_params['Force'] = kwargs.get('Force')
-    deleted_params['InstanceId'] = kwargs.get('InstanceId')
-    deleted_params['DryRun'] = kwargs.get('DryRun')
+    if 'Device' in kwargs:
+        deleted_params['Device'] = kwargs['Device']
+    if 'Force' in kwargs:
+        deleted_params['Force'] = kwargs['Force']
+    if 'InstanceId' in kwargs:
+        deleted_params['InstanceId'] = kwargs['InstanceId']
+    if 'DryRun' in kwargs:
+        deleted_params['DryRun'] = kwargs['DryRun']
     iface.delete(deleted_params)
 
 

plugin.yaml

@@ -2,9 +2,9 @@ plugins:
 
   aws:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.12.1.zip
+    source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.12.2.zip
     package_name: cloudify-aws-plugin
-    package_version: '2.12.1'
+    package_version: '2.12.2'
 
 data_types: