Fix bug with storing aws_resource_id when using external resource flag (

#103)

* Fix bug with storing aws_resource_id when using external resource flag

* adding to plugin yaml version

CHANGELOG.txt

@@ -1,3 +1,10 @@
+1.2.0.1:
+- Fix bug with empty runtime properties for node when ``use_external_resource``
+ is set True
+
+1.2.0:
+- VPC Peering.
+
 1.0.1:
 - Add ECS support (Cluster, Service, Task Definition) + Blueprint Example.
 - Fix several bugs with ELBv2.

cloudify_awssdk/common/decorators.py

@@ -17,8 +17,10 @@
  ~~~~~~~~~~~~~~~~~
  AWS decorators
 '''
-# Cloudify
+# Cloudify imports
 from cloudify.exceptions import (OperationRetry, NonRecoverableError)
+
+# Local imports
 from cloudify_awssdk.common import utils
 from cloudify_awssdk.common.constants import (
  EXTERNAL_RESOURCE_ARN as EXT_RES_ARN,
@@ -96,6 +98,8 @@ def wrapper_inner(**kwargs):
  resource_id=utils.get_resource_id(
  node=ctx.node,
  instance=ctx.instance)) if class_decl else None
+
+ resource_config = None
  if not ignore_properties:
  # Normalize resource_config property
  resource_config = props.get('resource_config') or dict()
@@ -115,6 +119,7 @@ def wrapper_inner(**kwargs):
  and runtime_instance_properties.get('resource_config'):
  kwargs['resource_config'] =\
  runtime_instance_properties['resource_config']
+ resource_config = kwargs['resource_config']
 
  # Check if using external
  if ctx.node.properties.get('use_external_resource', False):
@@ -123,6 +128,13 @@ def wrapper_inner(**kwargs):
  ctx.logger.info('%s ID# "%s" is user-provided.'
  % (resource_type, resource_id))
  if not kwargs.get('force_operation', False):
+ # If ``force_operation`` is not set then we need to make
+ # sure that runtime properties for node instance are
+ # setting correctly
+ # Set ``resource_config`` and ``EXT_RES_ID``
+ ctx.instance.runtime_properties[
+ 'resource_config'] = resource_config
+ ctx.instance.runtime_properties[EXT_RES_ID] = resource_id
  return
  ctx.logger.warn('%s ID# "%s" has force_operation set.'
  % (resource_type, resource_id))

cloudify_awssdk/common/tests/test_decorators.py

@@ -280,7 +280,7 @@ def test_with_mock(*args, **kwargs):
  {'aws_resource_arn': 'res_id',
  'aws_resource_id': 'aws_id',
  'a': 'b',
- 'resource_config': {}})
+ 'resource_config': {'c': 'd'}})
 
  mock_func.assert_not_called()
 

plugin.yaml

@@ -2,9 +2,9 @@ plugins:
 
  awssdk:
  executor: central_deployment_agent
- source: https://github.com//cloudify-incubator/cloudify-awssdk-plugin/archive/1.2.0.zip
+ source: https://github.com//cloudify-incubator/cloudify-awssdk-plugin/archive/1.2.0.1.zip
  package_name: cloudify-awssdk-plugin
- package_version: '1.2.0'
+ package_version: '1.2.0.1'
 
 data_types:
 

setup.py

@@ -20,7 +20,7 @@
 
 setup(
  name='cloudify-awssdk-plugin',
- version='1.2.0',
+ version='1.2.0.1',
  license='LICENSE',
  packages=find_packages(exclude=['tests*']),
  description='A Cloudify plugin for AWS',