Handle leading '?' in SAS token. Strip names when splitting "sinks".

Diagnostic/Utils/LadDiagnosticUtil.py

@@ -92,7 +92,7 @@ def getSinkList(feature_config):
     :rtype: [str]
     """
     if feature_config and 'sinks' in feature_config and feature_config['sinks']:
-        return map(str.strip, feature_config['sinks'].split(','))
+        return [sink_name.strip() for sink_name in feature_config['sinks'].split(',')]
     return []
 
 

Diagnostic/lad_config_all.py

@@ -456,7 +456,9 @@ class LadConfigAll:
         account = self._ext_settings.read_protected_config('storageAccountName')
         if not account:
             return False, "Empty storageAccountName"
-        token = self._ext_settings.read_protected_config('storageAccountSasToken')
+        token = self._ext_settings.read_protected_config('storageAccountSasToken').strip()
+        if '?' == token[0]:
+            token = token[1:]
         if not token:
             return False, "Empty storageAccountSasToken"
         endpoint = get_storage_endpoint_with_account(account,

Diagnostic/tests/var_lib_waagent/lad_dir/config/lad_settings_metric.json

@@ -4,7 +4,7 @@
       "handlerSettings": {
         "protectedSettings": {
           "storageAccountEndPoint": "https://core.windows.net/",
-          "storageAccountSasToken": "NOT_A_REAL_TOKEN",
+          "storageAccountSasToken": "?NOT_A_REAL_TOKEN",
           "storageAccountName": "ladunittestfakeaccount",
           "sinksConfig": {
             "sink": [