Merge branch 'release-5.0.0' into shiv-test-switch

Author: cormacpayne

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
-  <?define productName="Microsoft Azure PowerShell - October 2017" ?>
+  <?define productName="Microsoft Azure PowerShell - November 2017" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="4.4.1" ?>
+  <?define version="5.0.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

src/Common/Commands.Common/AzurePowerShell.cs

@@ -26,9 +26,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "4.4.1";
+        public const string AssemblyVersion = "5.0.0";
 
-        public const string AssemblyFileVersion = "4.4.1";
+        public const string AssemblyFileVersion = "5.0.0";
 
         public const string ProfileFile = "AzureProfile.json";
 

src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'PSGet_AzureRM.AnalysisServices'
 #
 # Generated by: Microsoft Corporation
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.4.7'
+ModuleVersion = '0.5.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -27,7 +27,7 @@ Author = 'Microsoft Corporation'
 CompanyName = 'Microsoft Corporation'
 
 # Copyright statement for this module
-Copyright = '© Microsoft Corporation. All rights reserved.'
+Copyright = '© Microsoft Corporation. All rights reserved.'
 
 # Description of the functionality provided by this module
 Description = 'Microsoft Azure PowerShell - Analysis Services'
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.4.1'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed Synchronize-AzureAsInstance command to work with new AsAzure REST API for sync
 
 ## Version 0.4.7
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.4.7'
+ModuleVersion = '0.5.0'
 
 # ID used to uniquely identify this module  
 GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'  

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Synchronize-AzureASInstance.cs

@@ -142,7 +142,8 @@ public override void ExecuteCmdlet()
                 AsAzureClientSession.Instance.Login(context);
                 WriteProgress(new ProgressRecord(0, "Sync-AzureAnalysisServicesInstance.", string.Format("Authenticating user for '{0}' environment.", context.Environment.Name)));
                 var clusterResolveResult = ClusterResolve(context, serverName);
-                if (!clusterResolveResult.CoreServerName.Equals(serverName) || !clusterResolveResult.CoreServerName.EndsWith(":rw"))
+                var virtualServerName = clusterResolveResult.CoreServerName.Split(":".ToCharArray())[0];
+                if (!serverName.Equals(virtualServerName) && !clusterResolveResult.CoreServerName.EndsWith(":rw"))
                 {
                     throw new SynchronizationFailedException("Sync request can only be sent to the management endpoint");
                 }
@@ -245,6 +246,7 @@ protected override void InitializeQosEvent()
         {
             // No data collection for this commandlet
         }
+
         protected override string DataCollectionWarning
         {
             get
@@ -275,8 +277,7 @@ private async Task<ScaleOutServerDatabaseSyncDetails> SynchronizeDatabaseAsync(
             {
                 try
                 {
-                    // pollingUrlAndRetryAfter = await PostSyncRequestAsync(context, syncBaseUri, databaseName, accessToken);
-                    var synchronize = string.Format((string)context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.SyncEndpoint], this.clusterResolveResult.CoreServerName, databaseName);
+                    var synchronize = string.Format((string)context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.SyncEndpoint], this.serverName, databaseName);
                     this.AsAzureHttpClient.resetHttpClient();
                     using (var message = await AsAzureHttpClient.CallPostAsync(
                         syncBaseUri,
@@ -381,70 +382,81 @@ private async Task<ScaleOutServerDatabaseSyncResult> PollSyncStatusWithRetryAsyn
             {
                 ScaleOutServerDatabaseSyncResult response = null;
                 var syncCompleted = false;
-                do
+                var retryCount = 0;
+
+                while (!syncCompleted && retryCount < maxNumberOfAttempts)
                 {
-                    var retryCount = 0;
-                    while (retryCount < maxNumberOfAttempts)
+                    // Wait for specified polling interval other than retries.
+                    if (retryCount == 0)
                     {
-                        // Wait for specified polling interval other than retries.
-                        if (retryCount == 0)
-                        {
-                            // WriteInformation(new InformationRecord(string.Format("Synchronize database {0}. Attempt #{1}. Waiting for {2} seconds to get sync results...", databaseName, retryCount, pollingInterval.TotalSeconds), string.Empty));
-                            await Task.Delay(pollingInterval);
-                        }
-                        else
-                        {
-                            await Task.Delay(DefaultRetryIntervalForPolling);
-                        }
+                        await Task.Delay(pollingInterval);
+                    }
+                    else
+                    {
+                        await Task.Delay(DefaultRetryIntervalForPolling);
+                    }
 
-                        this.AsAzureHttpClient.resetHttpClient();
-                        using (HttpResponseMessage message = await AsAzureHttpClient.CallGetAsync(
-                            pollingUrl,
-                            string.Empty,
-                            accessToken,
-                            correlationId))
+                    this.AsAzureHttpClient.resetHttpClient();
+                    using (HttpResponseMessage message = await AsAzureHttpClient.CallGetAsync(
+                        pollingUrl,
+                        string.Empty,
+                        accessToken,
+                        correlationId))
+                    {
+                        bool shouldRetry = false;
+                        if (message.IsSuccessStatusCode && message.Content != null)
                         {
-                            syncCompleted = !message.StatusCode.Equals(HttpStatusCode.SeeOther);
-                            if (syncCompleted)
+                            var responseString = await message.Content.ReadAsStringAsync();
+                            response = JsonConvert.DeserializeObject<ScaleOutServerDatabaseSyncResult>(responseString);
+
+                            if (response != null)
                             {
-                                if (message.IsSuccessStatusCode)
+                                var state = response.SyncState;
+                                if (state == DatabaseSyncState.Completed || state == DatabaseSyncState.Failed)
                                 {
-                                    var responseString = await message.Content.ReadAsStringAsync();
-                                    response = JsonConvert.DeserializeObject<ScaleOutServerDatabaseSyncResult>(responseString);
-                                    break;
+                                    syncCompleted = true;
                                 }
                                 else
                                 {
-                                    retryCount++;
-                                    if (response == null)
-                                    {
-                                        response = new ScaleOutServerDatabaseSyncResult()
-                                        {
-                                            Database = databaseName,
-                                            SyncState = DatabaseSyncState.Invalid
-                                        };
-
-                                        response.Details = string.Format(
-                                            "Http Error code: {0}. {1}", 
-                                            message.StatusCode.ToString(), 
-                                            message.Content != null ? await message.Content.ReadAsStringAsync() : string.Empty);
-                                    }
-
-                                    if (message.StatusCode >= (HttpStatusCode)400 && message.StatusCode <= (HttpStatusCode)499)
-                                    {
-                                        break;   
-                                    }
+                                    pollingUrl = message.Headers.Location ?? pollingUrl;
+                                    pollingInterval = message.Headers.RetryAfter.Delta ?? pollingInterval;
                                 }
                             }
                             else
                             {
-                                pollingUrl = message.Headers.Location;
-                                pollingInterval = message.Headers.RetryAfter.Delta ?? pollingInterval;
+                                shouldRetry = true;
                             }
                         }
+                        else
+                        {
+                            shouldRetry = true;
+                        }
+
+                        if(shouldRetry)
+                        {
+                            retryCount++;
+                            response = new ScaleOutServerDatabaseSyncResult()
+                            {
+                                Database = databaseName,
+                                SyncState = DatabaseSyncState.Invalid
+                            };
+
+                            response.Details = string.Format(
+                                "Http Error code: {0}. Message: {1}",
+                                message.StatusCode.ToString(),
+                                message.Content != null ? await message.Content.ReadAsStringAsync() : string.Empty);
+
+                            if (message.StatusCode >= (HttpStatusCode)400 && message.StatusCode <= (HttpStatusCode)499)
+                            {
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            retryCount = 0;
+                        }
                     }
                 }
-                while (!syncCompleted);
 
                 return response;
             });

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Models/AsAzureClientSession.cs

@@ -29,7 +29,7 @@ public class AsAzureClientSession
     {
         public const string RestartEndpointPathFormat = "/webapi/servers/{0}/restart?api-version=2016-10-01";
         public const string LogfileEndpointPathFormat = "/webapi/servers/{0}/logfileHere";
-        public const string SynchronizeEndpointPathFormat = "/webapi/servers/{0}/databases/{1}/sync";
+        public const string SynchronizeEndpointPathFormat = "/servers/{0}/models/{1}/sync";
         public const string AsAzureClientId = "cf710c6e-dfcc-4fa8-a093-d47294e44c66";
         public static readonly Uri RedirectUri = new Uri("urn:ietf:wg:oauth:2.0:oob");
         public static string DefaultRolloutEnvironmentKey = "asazure.windows.net";

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Properties/AssemblyInfo.cs

@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("0.4.7")]
-[assembly: AssemblyFileVersion("0.4.7")]
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/InMemoryTests/DataPlaneCommandTests.cs

@@ -390,7 +390,7 @@ public void SynchronizeAzureASInstance_SingleDB_Succeeds()
 
             // set up sync respnose
             var postResponse = new HttpResponseMessage(HttpStatusCode.Accepted);
-            postResponse.Headers.Location = new Uri("https://1");
+            postResponse.Headers.Location = new Uri("https://done");
             postResponse.Headers.RetryAfter = new RetryConditionHeaderValue(TimeSpan.FromMilliseconds(500));
             postResponse.Headers.Add("x-ms-root-activity-id", Guid.NewGuid().ToString());
             postResponse.Headers.Add("x-ms-current-utc-date", Guid.NewGuid().ToString());

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 
 [assembly: Guid("37af97fd-d603-4d52-a7a6-0885004a57fe")]
 
-[assembly: AssemblyVersion("0.4.7")]
-[assembly: AssemblyFileVersion("0.4.7")]
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Properties/AssemblyInfo.cs

@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.4.7")]
-[assembly: AssemblyFileVersion("0.4.7")]
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]

src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'PSGet_AzureRM.ApiManagement'
 #
 # Generated by: Microsoft Corporation
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.4.1'
+ModuleVersion = '5.0.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.4.1'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs

@@ -42,5 +42,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("4.4.1")]
-[assembly: AssemblyFileVersion("4.4.1")]
+[assembly: AssemblyVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs

@@ -41,5 +41,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("4.4.1")]
-[assembly: AssemblyFileVersion("4.4.1")]
+[assembly: AssemblyVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]

src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs

@@ -41,5 +41,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("4.4.1")]
-[assembly: AssemblyFileVersion("4.4.1")]
+[assembly: AssemblyVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]

src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Properties/AssemblyInfo.cs

@@ -42,6 +42,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("4.4.1")]
-[assembly: AssemblyFileVersion("4.4.1")]
+[assembly: AssemblyVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]

src/ResourceManager/ApplicationInsights/AzureRM.ApplicationInsights.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'PSGet_AzureRM.ApplicationInsights'
 #
 # Generated by: Microsoft Corporation
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.4.1'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Microsoft.Azure.Commands.ApplicationInsights.dll-Help.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'Microsoft.Azure.Commands.ApplicationInsights'
 #
 # Generated by: Microsoft Corporation

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Microsoft.Azure.Commands.ApplicationInsights.format.ps1xml

@@ -176,4 +176,4 @@
       </TableControl>
     </View>
   </ViewDefinitions>
-</Configuration>
+</Configuration>

src/ResourceManager/Automation/AzureRM.Automation.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'PSGet_AzureRM.Automation'
 #
 # Generated by: Microsoft Corporation
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '3.4.1'
+ModuleVersion = '4.0.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.4.1'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/Automation/Commands.Automation.Test/Properties/AssemblyInfo.cs

@@ -43,7 +43,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("3.4.1")]
-[assembly: AssemblyFileVersion("3.4.1")]
+[assembly: AssemblyVersion("4.0.0")]
+[assembly: AssemblyFileVersion("4.0.0")]
 [assembly: CLSCompliant(false)]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]