Merge pull request #355 from cloudify-cosmo/fix-encode-user-data

Fix encode user data

Author: AdarShaked

.circleci/test_examples.py

@@ -31,6 +31,8 @@
     'openstack_region': False,
     'base_image_id': False,
     'base_flavor_id': False,
+    'openstack_user_domain_name': False,
+    'openstack_project_domain_name': False,
 }
 
 prepare_test(secrets=SECRETS_TO_CREATE)

openstack_plugin/tests/test_utils.py

@@ -18,7 +18,6 @@
 import copy
 import logging
 import base64
-import binascii
 import inspect
 import re
 
@@ -34,7 +33,7 @@
 from cloudify.constants import NODE_INSTANCE, RELATIONSHIP_INSTANCE
 
 # Py2/3 compatibility
-from openstack_sdk._compat import text_type, PY2
+from openstack_sdk._compat import text_type
 
 
 # Local imports
@@ -213,17 +212,6 @@ def resolve_ctx(_ctx):
     return _ctx
 
 
-def is_userdata_encoded(userdata_string):
-    try:
-        if PY2:
-            base64.decodestring(userdata_string)
-        else:
-            base64.decodebytes(userdata_string.encode('utf-8'))
-    except binascii.Error:
-        return False
-    return True
-
-
 def handle_userdata(existing_userdata):
     """
     This method will be responsible for handle user data provided by the
@@ -247,7 +235,7 @@ def handle_userdata(existing_userdata):
 
     if not existing_userdata:
         existing_userdata = ''
-    elif is_userdata_encoded(existing_userdata):
+    elif not ctx.node.properties['encode_user_data']:
         return existing_userdata
 
     if install_agent_userdata and os_family == 'windows':
@@ -290,7 +278,8 @@ def handle_userdata(existing_userdata):
         final_userdata = compute.create_multi_mimetype_userdata(
             [existing_userdata, install_agent_userdata])
 
-    final_userdata = base64.b64encode(final_userdata)
+    final_userdata = base64.b64encode(final_userdata.encode('utf-8')).decode(
+        'ascii')
     return final_userdata
 
 

openstack_plugin/utils.py

@@ -2,9 +2,9 @@ plugins:
 
   openstack:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/3.2.14.zip
+    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/3.2.15.zip
     package_name: cloudify-openstack-plugin
-    package_version: '3.2.14'
+    package_version: '3.2.15'
 
 dsl_definitions:
 
@@ -391,6 +391,7 @@ data_types:
           Must be Base64 encoded. Restricted to 65535 bytes.
         required: false
         type: string
+
       metadata:
         description: >
           Metadata key and value pairs.
@@ -1047,6 +1048,13 @@ node_types:
         type: cloudify.types.openstack.Server
         description: A dictionary that may contain these keys https://developer.openstack.org/api-ref/compute/?expanded=create-server-detail
         required: true
+      encode_user_data:
+        required: false
+        type: boolean
+        default: true
+        description: >
+          A boolean describing if the plugin will encode the user_data given in resource_config.
+          if the user data is bae64 encoded and this flag is false, the user_data that accepted will be sent as the server user_data.
       use_password:
         type: boolean
         default: false

plugin.yaml

@@ -20,7 +20,7 @@
 
 setup(
     name='cloudify-openstack-plugin',
-    version='3.2.14',
+    version='3.2.15',
     author='Cloudify',
     author_email='[email protected]',
     license='LICENSE',