Fixed what-if functionality with -QueryString parameter

src/Resources/ResourceManager/SdkModels/Deployments/PSDeploymentWhatIfCmdletParameters.cs

@@ -102,6 +102,11 @@ public DeploymentWhatIf ToDeploymentWhatIf()
             else if (Uri.IsWellFormedUriString(this.TemplateUri, UriKind.Absolute))
             {
                 properties.TemplateLink = new TemplateLink(this.TemplateUri);
+
+                if (!string.IsNullOrEmpty(this.QueryString))
+                {
+                    properties.TemplateLink.QueryString = this.QueryString;
+                }
             }
             else
             {

src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs

@@ -201,5 +201,12 @@ public void TestTestDeploymentFromBicepFile()
         {
             TestRunner.RunTestScript("Test-TestDeploymentFromBicepFile");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestWhatIfWithQueryString()
+        {
+            TestRunner.RunTestScript("Test-WhatIfWithQueryString");
+        }
     }
 }

src/Resources/Resources.Test/ScenarioTests/DeploymentTests.ps1

@@ -797,17 +797,36 @@ function Test-NewDeploymentWithQueryString
 	# Setup
     $rgname = Get-ResourceGroupName
     $rname = Get-ResourceName
+	$saname = "querystringpstests"
     $rglocation = "West US 2"
     $subId = (Get-AzContext).Subscription.SubscriptionId
 
 	try
 	{
-		# Prepare our RG and basic template spec:
-
+		# Prepare our RG
         New-AzResourceGroup -Name $rgname -Location $rglocation
 
+		#Prepare our Storage Account
+		$account = New-AzStorageAccount -ResourceGroupName $rgname -AccountName $saname -Location $rglocation -SkuName "Standard_LRS"
+
+		#Get StorageAccountKey
+		$key = (Get-AzStorageAccountKey -ResourceGroupName $rgname -AccountName $saname)| Where-Object {$_.KeyName -eq "key1"}
+
+		#Get StorageAccount context
+		$context = New-AzStorageContext -StorageAccountName $saname -StorageAccountKey $key.Value
+
+		#Create FileShare
+		New-AzStorageShare -Name "querystringshare" -Context $context
+
+		#Upload files to the StorageAccount
+		Set-AzStorageFileContent -ShareName "querystringshare" -Source "sampleLinkedTemplateParent.json" -Path "sampleLinkedTemplateParent.json" -Context $context
+		Set-AzStorageFileContent -ShareName "querystringshare" -Source "sampleLinkedTemplateChild.json" -Path "sampleLinkedTemplateChild.json" -Context $context
+
+		#Get SAStoken
+		$token = New-AzStorageAccountSASToken -Service File -ResourceType Service,Container,Object -Permission "r" -Context $context -ExpiryTime (Get-Date).AddMinutes(2)
+
 		#Create deployment
-		$deployment =New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateUri "https://querystringtesting.blob.core.windows.net/testqsblob/linkedTemplateParent.json" -QueryString "foo"
+		$deployment =New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateUri "https://querystringpstests.file.core.windows.net/querystringshare/sampleLinkedTemplateParent.json" -QueryString $token.Substring(1)
 
 		# Assert
 		Assert-AreEqual Succeeded $deployment.ProvisioningState
@@ -816,6 +835,7 @@ function Test-NewDeploymentWithQueryString
 	finally
     {
         # Cleanup
+		Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $saname;
         Clean-ResourceGroup $rgname
     }
 }
@@ -884,4 +904,62 @@ function Test-TestDeploymentFromBicepFile
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Tests what-if on a deployment from a template in a storage account using a query string.
+#>
+function Test-WhatIfWithQueryString
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+	$saname = "querystringpstests"
+    $rglocation = "West US 2"
+    $subId = (Get-AzContext).Subscription.SubscriptionId
+
+	try
+	{
+		# Prepare our RG
+        New-AzResourceGroup -Name $rgname -Location $rglocation
+
+		#Prepare our Storage Account
+		$account = New-AzStorageAccount -ResourceGroupName $rgname -AccountName $saname -Location $rglocation -SkuName "Standard_LRS"
+
+		#Get StorageAccountKey
+		$key = (Get-AzStorageAccountKey -ResourceGroupName $rgname -AccountName $saname)| Where-Object {$_.KeyName -eq "key1"}
+
+		#Get StorageAccount context
+		$context = New-AzStorageContext -StorageAccountName $saname -StorageAccountKey $key.Value
+
+		#Create FileShare
+		New-AzStorageShare -Name "querystringshare" -Context $context
+
+		#Upload files to the StorageAccount
+		Set-AzStorageFileContent -ShareName "querystringshare" -Source "sampleLinkedTemplateParent.json" -Path "sampleLinkedTemplateParent.json" -Context $context
+		Set-AzStorageFileContent -ShareName "querystringshare" -Source "sampleLinkedTemplateChild.json" -Path "sampleLinkedTemplateChild.json" -Context $context
+
+		#Get SAStoken
+		$token = New-AzStorageAccountSASToken -Service File -ResourceType Service,Container,Object -Permission "r" -Context $context -ExpiryTime (Get-Date).AddMinutes(3)
+
+		#Create deployment
+		$deployment =New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateUri "https://querystringpstests.file.core.windows.net/querystringshare/sampleLinkedTemplateParent.json" -QueryString $token.Substring(1)
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+		#Run What-if
+		$result =  New-AzResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateUri "https://querystringpstests.file.core.windows.net/querystringshare/sampleLinkedTemplateParent.json" -QueryString $token.Substring(1) -WhatIf
+
+		#assert that nothing has changed.
+		Assert-AreEqual 0 ($result).Count
+	}
+
+	finally
+    {
+        # Cleanup
+		Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $saname;
+        Clean-ResourceGroup $rgname
+    }
 }

src/Resources/Resources.Test/ScenarioTests/ResourceTestRunner.cs

@@ -43,7 +43,8 @@ protected ResourceTestRunner(ITestOutputHelper output)
                 .WithExtraRmModules(helper => new[]
                 {
                     helper.RMResourceModule,
-                    helper.GetRMModulePath("AzureRM.Monitor.psd1")
+                    helper.GetRMModulePath("AzureRM.Monitor.psd1"),
+                    helper.GetRMModulePath("AzureRM.Storage.psd1")
                 })
                 .WithRecordMatcher(
                     (ignoreResourcesClient, resourceProviders, userAgentsToIgnore) =>