diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceGCE.py | 11 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 59 |
3 files changed, 54 insertions, 17 deletions
@@ -15,6 +15,7 @@ for list, tuple, set, dict, string types and warning on other unexpected types - Update to use newer/better OMNIBUS_URL for chef module + - GCE: Allow base64 encoded user-data (LP: #1404311) [Wayne Witzell III] 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index 7091e3c1..92e5a28e 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -15,6 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +from base64 import b64decode + from cloudinit import log as logging from cloudinit import util from cloudinit import sources @@ -27,7 +29,6 @@ BUILTIN_DS_CONFIG = { } REQUIRED_FIELDS = ('instance-id', 'availability-zone', 'local-hostname') - class DataSourceGCE(sources.DataSource): def __init__(self, sys_cfg, distro, paths): sources.DataSource.__init__(self, sys_cfg, distro, paths) @@ -58,6 +59,7 @@ class DataSourceGCE(sources.DataSource): ('local-hostname', 'instance/hostname', True), ('public-keys', 'project/attributes/sshKeys', False), ('user-data', 'instance/attributes/user-data', False), + ('user-data-encoding', 'instance/attributes/user-data-encoding', False), ] # if we cannot resolve the metadata server, then no point in trying @@ -101,6 +103,13 @@ class DataSourceGCE(sources.DataSource): lines = self.metadata['public-keys'].splitlines() self.metadata['public-keys'] = [self._trim_key(k) for k in lines] + encoding = self.metadata.get('user-data-encoding') + if encoding: + if encoding == 'base64': + self.metadata['user-data'] = b64decode(self.metadata['user-data']) + else: + LOG.warn('unknown user-data-encoding: %s, ignoring', encoding) + return found @property diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index 842a72ba..89251b0e 100644 --- a/tests/unittests/test_datasource/test_gce.py +++ b/tests/unittests/test_datasource/test_gce.py @@ -18,6 +18,7 @@ import httpretty import re +from base64 import b64encode, b64decode from urlparse import urlparse from cloudinit import settings @@ -30,13 +31,22 @@ GCE_META = { 'instance/id': '123', 'instance/zone': 'foo/bar', 'project/attributes/sshKeys': 'user:ssh-rsa AA2..+aRD0fyVw== root@server', - 'instance/hostname': 'server.project-name.local', + 'instance/hostname': 'server.project-foo.local', 'instance/attributes/user-data': '/bin/echo foo\n', } GCE_META_PARTIAL = { - 'instance/id': '123', - 'instance/hostname': 'server.project-name.local', + 'instance/id': '1234', + 'instance/hostname': 'server.project-bar.local', + 'instance/zone': 'bar/baz', +} + +GCE_META_ENCODING = { + 'instance/id': '12345', + 'instance/hostname': 'server.project-baz.local', + 'instance/zone': 'baz/bang', + 'instance/attributes/user-data': b64encode('/bin/echo baz\n'), + 'instance/attributes/user-data-encoding': 'base64', } HEADERS = {'X-Google-Metadata-Request': 'True'} @@ -44,16 +54,22 @@ MD_URL_RE = re.compile( r'http://metadata.google.internal./computeMetadata/v1/.*') -def _request_callback(method, uri, headers): - url_path = urlparse(uri).path - if url_path.startswith('/computeMetadata/v1/'): - path = url_path.split('/computeMetadata/v1/')[1:][0] - else: - path = None - if path in GCE_META: - return (200, headers, GCE_META.get(path)) - else: - return (404, headers, '') +def _new_request_callback(gce_meta=None): + if not gce_meta: + gce_meta = GCE_META + + def _request_callback(method, uri, headers): + url_path = urlparse(uri).path + if url_path.startswith('/computeMetadata/v1/'): + path = url_path.split('/computeMetadata/v1/')[1:][0] + else: + path = None + if path in gce_meta: + return (200, headers, gce_meta.get(path)) + else: + return (404, headers, '') + + return _request_callback class TestDataSourceGCE(test_helpers.HttprettyTestCase): @@ -68,7 +84,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): def test_connection(self): httpretty.register_uri( httpretty.GET, MD_URL_RE, - body=_request_callback) + body=_new_request_callback()) success = self.ds.get_data() self.assertTrue(success) @@ -80,7 +96,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): def test_metadata(self): httpretty.register_uri( httpretty.GET, MD_URL_RE, - body=_request_callback) + body=_new_request_callback()) self.ds.get_data() self.assertEqual(GCE_META.get('instance/hostname'), @@ -104,7 +120,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): def test_metadata_partial(self): httpretty.register_uri( httpretty.GET, MD_URL_RE, - body=_request_callback) + body=_new_request_callback(GCE_META_PARTIAL)) self.ds.get_data() self.assertEqual(GCE_META_PARTIAL.get('instance/id'), @@ -112,3 +128,14 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): self.assertEqual(GCE_META_PARTIAL.get('instance/hostname'), self.ds.get_hostname()) + + @httpretty.activate + def test_metadata_encoding(self): + httpretty.register_uri( + httpretty.GET, MD_URL_RE, + body=_new_request_callback(GCE_META_ENCODING)) + self.ds.get_data() + + decoded = b64decode( + GCE_META_ENCODING.get('instance/attributes/user-data')) + self.assertEqual(decoded, self.ds.get_userdata_raw()) |