diff options
| author | Max Illfelder <illfelder@google.com> | 2016-06-06 12:58:51 -0700 |
|---|---|---|
| committer | Max Illfelder <illfelder@google.com> | 2016-06-06 12:58:51 -0700 |
| commit | 9b2a1e769b987c822f36381695f0235074996177 (patch) | |
| tree | f633823368284cea392084ffeae16388fa918bcb | |
| parent | 4e5ac58d4b4f0a556bc4dea645c0a3fd6e9c2def (diff) | |
| download | google-compute-image-packages-9b2a1e769b987c822f36381695f0235074996177.tar.gz | |
Trim leading whitespace in metadata scripts.
| -rw-r--r-- | google_compute_engine/metadata_scripts/script_retriever.py | 2 | ||||
| -rw-r--r-- | google_compute_engine/metadata_scripts/tests/script_retriever_test.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/google_compute_engine/metadata_scripts/script_retriever.py b/google_compute_engine/metadata_scripts/script_retriever.py index 19ffd1d..a5c77a5 100644 --- a/google_compute_engine/metadata_scripts/script_retriever.py +++ b/google_compute_engine/metadata_scripts/script_retriever.py @@ -164,7 +164,7 @@ class ScriptRetriever(object): self.logger.info('Found %s in metadata.' % metadata_key) with tempfile.NamedTemporaryFile( mode='w', dir=dest_dir, delete=False) as dest: - dest.write(metadata_value) + dest.write(metadata_value.lstrip()) script_dict[metadata_key] = dest.name metadata_key = '%s-script-url' % self.script_type diff --git a/google_compute_engine/metadata_scripts/tests/script_retriever_test.py b/google_compute_engine/metadata_scripts/tests/script_retriever_test.py index f251a8b..9fa1e79 100644 --- a/google_compute_engine/metadata_scripts/tests/script_retriever_test.py +++ b/google_compute_engine/metadata_scripts/tests/script_retriever_test.py @@ -174,12 +174,12 @@ class ScriptRetrieverTest(unittest.TestCase): @mock.patch('google_compute_engine.metadata_scripts.script_retriever.tempfile.NamedTemporaryFile') def testGetAttributeScripts(self, mock_tempfile): - script = 'echo Hello World.' + script = 'echo Hello World.\n' script_dest = '/tmp/script' script_url = 'gs://fake/url' script_url_dest = '/tmp/script_url' attribute_data = { - '%s-script' % self.script_type: script, + '%s-script' % self.script_type: '\n%s' % script, '%s-script-url' % self.script_type: script_url, } expected_data = { |