[AzureFileCopy] Use Get-AzureRmResource instead of Get-AzureRmStorageAccount (#13224) (#13227)

asranja · web-flow · commit ac421720c89d · 2020-07-03T12:58:30.000+05:30
* [AzureFileCopy] Use Get-AzureRmResource instead of Get-AzureRmStorageAccount

* Addressed review comments
diff --git a/Tasks/AzureFileCopyV2/AzureUtilityGTE1.0.ps1 b/Tasks/AzureFileCopyV2/AzureUtilityGTE1.0.ps1
@@ -24,7 +24,7 @@ function Get-AzureStorageAccountResourceGroupName
     if (-not [string]::IsNullOrEmpty($storageAccountName))
     {
         Write-Verbose "[Azure Call]Getting resource details for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"
-        $azureStorageAccountResourceDetails = Get-AzureRmStorageAccount -ErrorAction Stop | Where-Object { $_.StorageAccountName -eq $storageAccountName }
+        $azureStorageAccountResourceDetails = Get-AzureRmResource -ResourceType $ARMStorageAccountResourceType -Name $storageAccountName -ErrorAction Stop
         Write-Verbose "[Azure Call]Retrieved resource details successfully for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"
 
         $azureResourceGroupName = $azureStorageAccountResourceDetails.ResourceGroupName
diff --git a/Tasks/AzureFileCopyV2/task.json b/Tasks/AzureFileCopyV2/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 171,
-        "Patch": 1
+        "Patch": 2
     },
     "demands": [
         "azureps"
diff --git a/Tasks/AzureFileCopyV2/task.loc.json b/Tasks/AzureFileCopyV2/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 171,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [
     "azureps"
diff --git a/Tasks/AzureFileCopyV3/AzureUtilityARM.ps1 b/Tasks/AzureFileCopyV3/AzureUtilityARM.ps1
@@ -10,7 +10,7 @@ function Get-AzureStorageAccountResourceGroupName
     if (-not [string]::IsNullOrEmpty($storageAccountName))
     {
         Write-Verbose "[Azure Call]Getting resource details for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"
-        $azureStorageAccountResourceDetails = Get-AzureRmStorageAccount -ErrorAction Stop | Where-Object { $_.StorageAccountName -eq $storageAccountName }
+        $azureStorageAccountResourceDetails = Get-AzureRmResource -ResourceType $ARMStorageAccountResourceType -Name $storageAccountName -ErrorAction Stop
         Write-Verbose "[Azure Call]Retrieved resource details successfully for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"
 
         $azureResourceGroupName = $azureStorageAccountResourceDetails.ResourceGroupName
diff --git a/Tasks/AzureFileCopyV3/task.json b/Tasks/AzureFileCopyV3/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 3,
         "Minor": 171,
-        "Patch": 1
+        "Patch": 2
     },
     "demands": [
         "azureps"
diff --git a/Tasks/AzureFileCopyV3/task.loc.json b/Tasks/AzureFileCopyV3/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 3,
     "Minor": 171,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [
     "azureps"

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ function Get-AzureStorageAccountResourceGroupName`
`24`	`24`	`if (-not [string]::IsNullOrEmpty($storageAccountName))`
`25`	`25`	`{`
`26`	`26`	`Write-Verbose "[Azure Call]Getting resource details for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"`
`27`		`- $azureStorageAccountResourceDetails = Get-AzureRmStorageAccount -ErrorAction Stop \| Where-Object { $_.StorageAccountName -eq $storageAccountName }`
	`27`	`+ $azureStorageAccountResourceDetails = Get-AzureRmResource -ResourceType $ARMStorageAccountResourceType -Name $storageAccountName -ErrorAction Stop`
`28`	`28`	`Write-Verbose "[Azure Call]Retrieved resource details successfully for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"`
`29`	`29`
`30`	`30`	`$azureResourceGroupName = $azureStorageAccountResourceDetails.ResourceGroupName`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ function Get-AzureStorageAccountResourceGroupName`
`10`	`10`	`if (-not [string]::IsNullOrEmpty($storageAccountName))`
`11`	`11`	`{`
`12`	`12`	`Write-Verbose "[Azure Call]Getting resource details for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"`
`13`		`- $azureStorageAccountResourceDetails = Get-AzureRmStorageAccount -ErrorAction Stop \| Where-Object { $_.StorageAccountName -eq $storageAccountName }`
	`13`	`+ $azureStorageAccountResourceDetails = Get-AzureRmResource -ResourceType $ARMStorageAccountResourceType -Name $storageAccountName -ErrorAction Stop`
`14`	`14`	`Write-Verbose "[Azure Call]Retrieved resource details successfully for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"`
`15`	`15`
`16`	`16`	`$azureResourceGroupName = $azureStorageAccountResourceDetails.ResourceGroupName`