Merge ~xiaofengw/cloud-init:xiaofengw-post-script-bug-fix into cloud-init:master

[Xiaofeng Wang]

guestcust_util: handle special characters in config file

Handle the special characters when reading VM Tools configure file.
For example, the key and value may contain _, - and . etc.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:0aac863b18d2bc4681c3ff0fd7b3626ca4093396
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1167/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1167//rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

Thanks this looks good. I've pointed CI at this branch.

[Ryan Harper (raharper)]

The CI failure is unrelated to your changes, it was a pylint failure. We'll fix that up and resubmit the CI job.

[Ryan Harper (raharper)]

Hi, please rebase this branch to master, we've landed a fix for the CI failures

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:0aac863b18d2bc4681c3ff0fd7b3626ca4093396
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1175/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1175//rebuild

review: Needs Fixing (continuous-integration)

[Xiaofeng Wang (xiaofengw)]

> Hi, please rebase this branch to master, we've landed a fix for the CI
> failures
Hi Ryan,
I tried to rebase from master and found there is nothing to merge. Could you check? Thanks.

cc@Xiaofeng-UBUNTU1604-cloudInit:~/cloud-init-tmp/cloud-init$ git branch
* xiaofengw-post-script-bug-fix
cc@Xiaofeng-UBUNTU1604-cloudInit:~/cloud-init-tmp/cloud-init$ git remote add upstream https://git.launchpad.net/cloud-init
fatal: remote upstream already exists.
cc@Xiaofeng-UBUNTU1604-cloudInit:~/cloud-init-tmp/cloud-init$ git fetch upstream
cc@Xiaofeng-UBUNTU1604-cloudInit:~/cloud-init-tmp/cloud-init$ git rebase -i origin/master
Successfully rebased and updated refs/heads/xiaofengw-post-script-bug-fix.
cc@Xiaofeng-UBUNTU1604-cloudInit:~/cloud-init-tmp/cloud-init$ git status
On branch xiaofengw-post-script-bug-fix
Your branch is up-to-date with 'origin/xiaofengw-post-script-bug-fix'.
nothing to commit, working directory clean
cc@Xiaofeng-UBUNTU1604-cloudInit:~/cloud-init-tmp/cloud-init$

[Dan Watkins (oddbloke)]

I think your rebase command needs to use "upstream/master" instead of "origin/master".

[Xiaofeng Wang (xiaofengw)]

> I think your rebase command needs to use "upstream/master" instead of
> "origin/master".

It's the same if I use "upstream/master". I wonder if there is anyone could help me check on this branch. Do I still need to rebase? Thanks.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:c7f9308e16a2978d528b7770e5a884c1d8a690c8
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1187/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1187//rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Thanks for the fix!

review: Approve

[Xiaofeng Wang (xiaofengw)]

> Thanks for the fix!

The status is still Approve but not merged. Is there anything I could do? Thanks.

[Ryan Harper (raharper)]

Sorry for the delay.

[Server Team CI bot (server-team-bot)]

Commit message lints:
- Line #0 has 52 too many characters. Line starts with: "Handle the special characters"...

review: Needs Fixing

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
index eb78172..3d369d0 100644
--- a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
+++ b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
@@ -138,7 +138,7 @@ def get_tools_config(section, key, defaultVal):
 
     try:
         (outText, _) = util.subp(cmd)
-        m = re.match(r'([a-zA-Z0-9 ]+)=(.*)', outText)
+        m = re.match(r'([^=]+)=(.*)', outText)
         if m:
             retValue = m.group(2).strip()
             logger.debug("Get tools config: [%s] %s = %s",
diff --git a/tests/unittests/test_vmware/test_guestcust_util.py b/tests/unittests/test_vmware/test_guestcust_util.py
index b8fa994..b175a99 100644
--- a/tests/unittests/test_vmware/test_guestcust_util.py
+++ b/tests/unittests/test_vmware/test_guestcust_util.py
@@ -62,4 +62,11 @@ class TestGuestCustUtil(CiTestCase):
                     get_tools_config('section', 'key', 'defaultVal'),
                     'Bar=Wark')
 
+            # value contains specific characters
+            with mock.patch.object(util, 'subp',
+                                   return_value=('[a] b.c_d=e-f', b'')):
+                self.assertEqual(
+                    get_tools_config('section', 'key', 'defaultVal'),
+                    'e-f')
+
 # vi: ts=4 expandtab