Convert arrays and dicts to strings

Refactor to request Syntax error Syntax error Syntax error
canonical · Mar 10, 2021 · 3f1b045 · 3f1b045
1 parent 9bd1964
commit 3f1b045
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
@@ -364,12 +364,12 @@ def update(self):
                             'userdata')
         self._store_processeddata(self.datasource.get_userdata(),
                                   'userdata')
-        self._store_rawdata(self.datasource.get_vendordata_raw(),
-                            'vendordata')
+        self._store_raw_vendordata(self.datasource.get_vendordata_raw(),
+                                   'vendordata')
         self._store_processeddata(self.datasource.get_vendordata(),
                                   'vendordata')
-        self._store_rawdata(self.datasource.get_vendordata2_raw(),
-                            'vendordata2')
+        self._store_raw_vendordata(self.datasource.get_vendordata2_raw(),
+                                   'vendordata2')
         self._store_processeddata(self.datasource.get_vendordata2(),
                                   'vendordata2')
 
@@ -397,6 +397,12 @@ def _store_rawdata(self, data, datasource):
             data = b''
         util.write_file(self._get_ipath('%s_raw' % datasource), data, 0o600)
 
+    def _store_raw_vendordata(self, data, datasource):
+        # This data may be a list or dict, convert it to a string if so
+        if type(data) is list:
+            data = util.json_dumps(data)
+        self._store_rawdata(data, datasource)
+
     def _store_processeddata(self, processed_data, datasource):
         # processed is a Mime message, so write as string.
         if processed_data is None:

diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
@@ -14,6 +14,7 @@ dankenigsberg
 dermotbradley
 dhensby
 eandersson
+eb3095
 emmanuelthome
 izzyleung
 johnsonshi