Merge pull request Azure#9360 from afedyashov/Az.StorageSync.20190301

Az.StorageSync Package - Support for InvokeChangeDetection and API version 2019-03-01 in Az.StorageSync

Author: markcowl

src/StorageSync/StorageSync.Test/ScenarioTests/CloudEndpointTests.ps1

@@ -38,6 +38,28 @@ Cleans the created resource groups
 function Clean-ResourceGroup($rgname)
 {
     if ((Get-StorageTestMode) -ne 'Playback') {
+        try 
+        {
+            Write-Verbose "Attempting to remove StorageSync resources from resource group $rgname"
+            $syncServices = Get-AzStorageSyncService -ResourceGroup $rgname
+            foreach ($syncService in $syncServices)
+            {                
+                Get-AzStorageSyncServer -ParentObject $syncService | Unregister-AzStorageSyncServer -Force
+                
+                $syncGroups = Get-AzStorageSyncGroup -ParentObject $syncService
+                foreach ($syncGroup in $syncGroups)
+                {
+                    Get-AzStorageSyncCloudEndpoint -ParentObject $syncGroup | Remove-AzStorageSyncCloudEndpoint -Force
+                }
+                $syncGroups | Remove-AzStorageSyncGroup -Force
+            }
+            $syncServices | Remove-AzStorageSyncService -Force
+        }
+        catch
+        {
+            Write-Verbose "Exception $($_.Exception.ToString())"
+        }
+        Write-Verbose "Attempting to remove resource group $rgname"
         Remove-AzResourceGroup -Name $rgname -Force
     }
 }
@@ -236,15 +258,121 @@ function IsLive
 .SYNOPSIS
 Create Azure file share if recording else return given azure file share name.
 #>
-function Ensure-AzureFileShareName
+function Create-StorageShare
 {
+    param (
+        [Parameter(Position = 0)]
+        $Name, 
+        [Parameter(Position = 1)]
+        $Context)
+    
+    if ([string]::IsNullOrEmpty($Name))
+    {
+        throw "Invalid argument: Name"
+    }
+
     if(IsLive)
     {
-        $azureFileShare = New-AzureStorageShare -Name $azureFileShareName -Context $context
+        if ($null -eq $Context)
+        {
+            throw "Invalid argument: Context"
+        }
+
+        $azureFileShare = $null
+        if (gcm New-AzStorageShare -ErrorAction SilentlyContinue)
+        {
+            Write-Verbose "Using New-AzStorageShare cmdlet to create share: $($Name) in storage account: $($Context.StorageAccountName)"
+            $azureFileShare = New-AzStorageShare -Name $Name -Context $Context
+        }
+        elseif (gcm New-AzureStorageShare -ErrorAction SilentlyContinue)
+        {
+            Write-Verbose "Using New-AzureStorageShare cmdlet to create share: $($Name) in storage account: $($Context.StorageAccountName)"
+            $azureFileShare = New-AzureStorageShare -Name $Name -Context $Context            
+        }
+        else 
+        {
+            throw "Neither New-AzStorageShare nor New-AzureStorageShare cmdlet is available"
+        }
         return $azureFileShare.Name
     }
     else 
     {
         return $azureFileShareName
     }
+}
+
+function Remove-StorageShare
+{
+    param (
+        [Parameter(Position = 0)]
+        $Name, 
+        [Parameter(Position = 1)]
+        $Context)
+    
+    if ([string]::IsNullOrEmpty($Name))
+    {
+        throw "Invalid argument: Name"
+    }
+    
+    if(IsLive)
+    {
+        if ($null -eq $Context)
+        {
+            throw "Invalid argument: Context"
+        }
+
+        $result = $null
+        if (gcm Remove-AzStorageShare -ErrorAction SilentlyContinue)
+        {
+            Write-Verbose "Using Remove-AzStorageShare cmdlet"
+            $result = Remove-AzStorageShare -Name $Name -Context $Context -Force
+        }
+        elseif (gcm Remove-AzureStorageShare -ErrorAction SilentlyContinue)
+        {
+            Write-Verbose "Using Remove-AzureStorageShare cmdlet"
+            $result = Remove-AzureStorageShare -Name $Name -Context $Context -Force
+        }
+        else 
+        {
+            throw "Neither Remove-AzStorageShare nor Remove-AzureStorageShare cmdlet is available"
+        }
+        return $result
+    }
+}
+
+function Create-StorageContext
+{
+    param ($StorageAccountName, $StorageAccountKey)
+
+    if ([string]::IsNullOrEmpty($StorageAccountName))
+    {
+        throw "Invalid argument: StorageAccountName"
+    }
+
+    if ([string]::IsNullOrEmpty($StorageAccountKey))
+    {
+        throw "Invalid argument: StorageAccountKey"
+    }
+
+    $result = $null
+
+    if(IsLive)
+    {
+        if (gcm New-AzStorageContext -ErrorAction SilentlyContinue)
+        {
+            Write-Verbose "Using New-AzStorageContext cmdlet"
+            $result = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey -Protocol https -Endpoint core.windows.net
+        }
+        elseif (gcm New-AzureStorageContext -ErrorAction SilentlyContinue)
+        {
+            Write-Verbose "Using New-AzureStorageContext cmdlet"
+            $result = New-AzureStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey -Protocol https -Endpoint core.windows.net
+        }
+        else 
+        {
+            throw "Neither New-AzStorageContext nor New-AzureStorageContext cmdlet is available"
+        }
+    }
+    
+    return $result
 }

src/StorageSync/StorageSync.Test/ScenarioTests/Common.ps1

@@ -55,10 +55,10 @@ function Test-ServerEndpoint2
         Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
         $storageAccount = New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
         $key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
-        $context = $storageAccount.Context
+        $context = Create-StorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $key[0].Value
         Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
 
-        $azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
+        $azureFileShareName = Create-StorageShare -Name $AzureFileShareName -Context $context
         $storageAccountResourceId = $storageAccount.Id
 
         Write-Verbose "Resource: $cloudEndpointName | Loc: $resourceLocation | Type : CloudEndpoint"
@@ -163,7 +163,7 @@ function Test-ServerEndpoint2
         if(IsLive)
         {
             Write-Verbose "Removing: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
-            $azureFileShare = Remove-AzureStorageShare -Name $AzureFileShareName -Context $context -Force
+            Remove-StorageShare -Name $AzureFileShareName -Context $context | Out-Null
         }
 
         Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
@@ -197,7 +197,7 @@ function Test-ServerEndpoint
         $storageAccountTenantId = (Get-AzTenant).Id
         # NOTE: Check the local server drives where we are performing registration.
         $serverLocalPath = "D:\" + $serverEndpointName
-        $offlineDataTransferShareName = "http://dummy"
+        $offlineDataTransferShareName = "dummy"
         $tierFilesOlderThanDays = 10
         $volumeFreeSpacePercent = 60
         $volumeFreeSpacePercent2 = 80
@@ -216,21 +216,14 @@ function Test-ServerEndpoint
         $storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
 
         $key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
-        $context = $storageAccount.Context
+        $context = Create-StorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $key[0].Value
         Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
 
-        if(IsLive)
-        {
-            $azureFileShare = New-AzureStorageShare -Name $AzureFileShareName -Context $context
-            $azureFileShareName = $azureFileShare.Name 
-        }
-        else 
-        {
-            $azureFileShareName = $AzureFileShareName
-        }
-
+        $azureFileShareName = Create-StorageShare -Name $AzureFileShareName -Context $context
         $storageAccountResourceId = $storageAccount.Id
 
+        Create-StorageShare -Name $offlineDataTransferShareName -Context $context | Out-Null
+
         Write-Verbose "Resource: $cloudEndpointName | Loc: $resourceLocation | Type : CloudEndpoint"
         $job = New-AzStorageSyncCloudEndpoint -ParentObject $syncGroup -Name $cloudEndpointName -StorageAccountResourceId $storageAccountResourceId -AzureFileShareName $azureFileShareName -StorageAccountTenantId $StorageAccountTenantId -AsJob 
         $job | Wait-Job
@@ -246,7 +239,7 @@ function Test-ServerEndpoint
         $job | Wait-Job
         $serverEndpoint = get-job -Id $job.Id | receive-job -Keep
 
-       Write-Verbose "Removing ServerEndpoint: $serverEndpointName"
+        Write-Verbose "Removing ServerEndpoint: $serverEndpointName"
         Remove-AzStorageSyncServerEndpoint -Force -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -SyncGroupName $syncGroupName -Name $serverEndpointName -AsJob | Wait-Job
 
         Write-Verbose "Unregister Server: $($registeredServer.ServerId)"
@@ -264,7 +257,10 @@ function Test-ServerEndpoint
         if(IsLive)
         {
             Write-Verbose "Removing: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
-            $azureFileShare = Remove-AzureStorageShare -Name $AzureFileShareName -Context $context -Force
+            Remove-StorageShare -Name $AzureFileShareName -Context $context | Out-Null
+
+            Write-Verbose "Removing: $offlineDataTransferShareName | Loc: $resourceLocation | Type : AzureStorageShare"
+            Remove-StorageShare -Name $offlineDataTransferShareName -Context $context | Out-Null
         }
 
         Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"

src/StorageSync/StorageSync.Test/ScenarioTests/ServerEndpointTests.ps1

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.StorageSync" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.StorageSync" Version="3.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="11.0.0" />
     <PackageReference Include="System.Management" Version="4.5.0" />
   </ItemGroup>

src/StorageSync/StorageSync.Test/SessionRecords/StorageSyncTests.CloudEndpointTests/TestCloudEndpoint.json

@@ -84,7 +84,8 @@ CmdletsToExport = 'Invoke-AzStorageSyncCompatibilityCheck',
                'Remove-AzStorageSyncServerEndpoint', 
                'Set-AzStorageSyncServerEndpoint', 'Invoke-AzStorageSyncFileRecall', 
                'Register-AzStorageSyncServer', 'Unregister-AzStorageSyncServer', 
-               'Get-AzStorageSyncServer', 'Reset-AzStorageSyncServerCertificate'
+               'Get-AzStorageSyncServer', 'Reset-AzStorageSyncServerCertificate',
+               'Invoke-AzStorageSyncChangeDetection'
 
 # Variables to export from this module
 # VariablesToExport = @()