Fixing file URLs for WinRMExtension (#5485)

Fixing file URLs for WinRMExtension

Author: thesattiraju

Tasks/AzureFileCopy/Tests/L0AddAzureVMCustomScriptExtension.ps1

@@ -28,7 +28,7 @@ Assert-Throws {
 # Test 4 "Should fail to provision winrm custom script extension and remove the failed extension"
 $extensionName="WinRMCustomScriptExtension"
 Register-Mock Set-AzureMachineCustomScriptExtension {
-    return Set-AzureMachineCustomScriptExtension -resourceGroupName $resourceGroupName -vmName $vmName -name $extensionName -fileUri $configWinRMScriptFile, $makeCertFile, $winrmConfFile  -run $invalidCustomScriptName -argument $dnsName -location $location 
+    return Set-AzureMachineCustomScriptExtension -resourceGroupName $resourceGroupName -vmName $vmName -name $extensionName -fileUri $configWinRMScriptFile, $makeCertFile  -run $invalidCustomScriptName -argument $dnsName -location $location 
 } -ParametersEvaluator { $run -eq $scriptToRun }
 
 Assert-Throws {

Tasks/AzureFileCopy/Tests/MockHelper.ps1

@@ -566,11 +566,6 @@ function Set-AzureMachineCustomScriptExtension
                     throw "Cannot validate argument on parameter 'Location'. The argument is null or empty."
                 }
 
-                if($fileUri.Count -eq 2)
-                {
-                    $extensions[0]["SubStatuses"][1]["Message"]="'.\winrmconf.cmd' is not recognized as an internal or external command,\noperable program or batch file."
-                    $response["Status"]="Succeeded"
-                }
                 elseif($run -eq $invalidCustomScriptName)
                 {
                     $extensions[0]["SubStatuses"][1]["Message"]="The argument '$invalidCustomScriptName' to the -File parameter does not exist. Provide the path to an existing '.ps1' file as an argument to the -File parameter."

Tasks/AzureFileCopy/Utility.ps1

@@ -1290,9 +1290,8 @@ function Add-AzureVMCustomScriptExtension
           [string]$location,
           [string]$connectedServiceName)
 
-    $configWinRMScriptFile="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vm-winrm-windows/ConfigureWinRM.ps1"
-    $makeCertFile="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vm-winrm-windows/makecert.exe"
-    $winrmConfFile="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vm-winrm-windows/winrmconf.cmd"
+    $configWinRMScriptFile="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/501dc7d24537e820df7c80bce51aba9674233b2b/201-vm-winrm-windows/ConfigureWinRM.ps1"
+    $makeCertFile="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/501dc7d24537e820df7c80bce51aba9674233b2b/201-vm-winrm-windows/makecert.exe"
     $scriptToRun="ConfigureWinRM.ps1"
     $extensionName="WinRMCustomScriptExtension"
     $ruleName = "VSO-Custom-WinRM-Https-Port"
@@ -1317,7 +1316,7 @@ function Add-AzureVMCustomScriptExtension
             return
         }
 
-        $result = Set-AzureMachineCustomScriptExtension -resourceGroupName $resourceGroupName -vmName $vmName -name $extensionName -fileUri $configWinRMScriptFile, $makeCertFile, $winrmConfFile  -run $scriptToRun -argument $dnsName -location $location
+        $result = Set-AzureMachineCustomScriptExtension -resourceGroupName $resourceGroupName -vmName $vmName -name $extensionName -fileUri $configWinRMScriptFile, $makeCertFile  -run $scriptToRun -argument $dnsName -location $location
         $resultDetails = $result | ConvertTo-Json
         Write-Verbose "Set-AzureMachineCustomScriptExtension completed with response : $resultDetails"
 

Tasks/AzureFileCopy/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "azureps"
@@ -326,4 +326,4 @@
         "AFC_BlobStorageNotFound": "Storage account: {0} not found. Please specify existing storage account",
         "AFC_RootContainerAndDirectory": "'/S' option is not valid for $root containers."
     }
-}
+}

Tasks/AzureFileCopy/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "azureps"

Tasks/AzureResourceGroupDeployment/Tests/mock_node_modules/azure-arm-compute/lib/operations/virtualMachineExtensions.js

@@ -289,10 +289,9 @@ export class WinRMExtensionHelper {
 
     private async AddWinRMExtension(vmId: string, vmName: string, dnsName: string, location: string) {
         var extensionName: string = "WinRMCustomScriptExtension";
-        var configWinRMScriptFile: string = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vm-winrm-windows/ConfigureWinRM.ps1";
-        var makeCertFile: string = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vm-winrm-windows/makecert.exe";
-        var winrmConfFile: string = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vm-winrm-windows/winrmconf.cmd";
-        var fileUris = [configWinRMScriptFile, makeCertFile, winrmConfFile];
+        var configWinRMScriptFile: string = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/501dc7d24537e820df7c80bce51aba9674233b2b/201-vm-winrm-windows/ConfigureWinRM.ps1";
+        var makeCertFile: string = "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/501dc7d24537e820df7c80bce51aba9674233b2b/201-vm-winrm-windows/makecert.exe";
+        var fileUris = [configWinRMScriptFile, makeCertFile];
 
         tl.debug("Adding custom script extension for virtual machine " + vmName);
         tl.debug("VM Location: " + location);

Tasks/AzureResourceGroupDeployment/operations/WinRMExtensionHelper.ts

@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 2,
-        "Patch": 7
+        "Patch": 8
     },
     "demands": [],
     "minimumAgentVersion": "2.119.1",

Tasks/AzureResourceGroupDeployment/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 2,
-    "Patch": 7
+    "Patch": 8
   },
   "demands": [],
   "minimumAgentVersion": "2.119.1",