Merge pull request #14 from mspnp/andrew/ext-settings

Add support for protectedSettings on VM extensions

templates/buildingBlocks/multi-vm-n-nic-m-storage/scenarios/vms-multiple-nics-dataDisks-extensions.parameters.json

@@ -82,7 +82,8 @@
                 "Paths": "c:\\test",
                 "Processes": "test.exe"
               }
-            }
+            },
+            "protectedSettingsConfig": { }
           },
           {
             "name": "malware",
@@ -92,7 +93,8 @@
             "autoUpgradeMinorVersion": true,
             "settingsConfigMapperUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates/resources/Microsoft.Compute/virtualMachines/extensions/vm-extension-passthrough-settings-mapper.json",
             "settingsConfig": {
-            }
+            },
+            "protectedSettingsConfig": { }
           }
 
         ],

templates/buildingBlocks/virtualMachine-extensions/scenarios/multiple-extensions-on-vms.parameters.json

@@ -33,7 +33,8 @@
                   "Paths": "c:\\test",
                   "Processes": "test.exe"
                 }
-              }
+              },
+              "protectedSettingsConfig": { }
             },
             {
               "name": "malware",
@@ -43,7 +44,8 @@
               "autoUpgradeMinorVersion": true,
               "settingsConfigMapperUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates/resources/Microsoft.Compute/virtualMachines/extensions/vm-extension-passthrough-settings-mapper.json",
               "settingsConfig": {
-              }
+              },
+              "protectedSettingsConfig": { }
             }
           ]
         },
@@ -55,8 +57,8 @@
               "publisher": "Microsoft.Azure.Security",
               "type": "IaaSAntimalware",
               "typeHandlerVersion": "1.3",
-              "settingsMapperUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates/resources/Microsoft.Compute/virtualMachines/extensions/vm-extension-passthrough-settings-mapper.json",
-              "properties": {
+              "settingsConfigMapperUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates/resources/Microsoft.Compute/virtualMachines/extensions/vm-extension-passthrough-settings-mapper.json",
+              "settingsConfig": {
                 "AntimalwareEnabled": true,
                 "RealtimeProtectionEnabled": "false",
                 "ScheduledScanSettings": {
@@ -70,7 +72,8 @@
                   "Paths": "c:\\test",
                   "Processes": "test.exe"
                 }
-              }
+              },
+              "protectedSettingsConfig": { }
             }
           ]
         }

templates/resources/Microsoft.Compute/virtualMachines/extensions/vm-extension-passthrough-settings-mapper.json

@@ -8,8 +8,8 @@
   },
   "variables": {
     "instance": {
-      "settings": "[parameters('source')]",
-      "protectedSettings": { }
+      "settings": "[parameters('source').settingsConfig]",
+      "protectedSettings": "[parameters('source').protectedSettingsConfig]"
     }
 
   },

templates/resources/Microsoft.Compute/virtualMachines/extensions/vm-extension-settings-helper.json

@@ -33,7 +33,7 @@
               "parentTemplateUniqueString": "[concat(variables('templateUniqueString'), '-setting', parameters('iteration'))]"
             }
           },
-          "source": { "value": "[parameters('source').settingsConfig]" },
+          "source": { "value": "[parameters('source')]" },
           "context": { "value": "[parameters('context')]" }
         }
       }