Merge pull request #2 from markcowl/disablevpn

Update to latest and fix on-demand issue

Author: hyonholee

src/Common/Commands.Common.Graph.RBAC/ActiveDirectory/ActiveDirectoryBaseCmdlet.cs

@@ -53,22 +53,19 @@ private void HandleException(Exception exception)
 
             if (graphEx != null)
             {
-                if (graphEx.Body != null)
-                {
+                if (graphEx.Body != null && graphEx.Body.Message != null && graphEx.Body.Code != null) {
                     WriteDebug(String.Format(ProjectResources.GraphException, graphEx.Body.Code, graphEx.Body.Message));
                     targetEx = new Exception(graphEx.Body.Message);
                     targetErrorId = graphEx.Body.Code;
+                } else {
+                    if (graphEx.Response != null && graphEx.Response.StatusCode == HttpStatusCode.NotFound) {
+                        targetErrorCategory = ErrorCategory.InvalidArgument;
+                    } else {
+                        targetErrorCategory = ErrorCategory.InvalidOperation;
+                    }
+                    Exception parsedException = ParseResponse(graphEx);
+                    targetEx = parsedException != null? parsedException : targetEx;
                 }
-
-                if (graphEx.Response != null && graphEx.Response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    targetErrorCategory = ErrorCategory.InvalidArgument;
-                }
-                else
-                {
-                    targetErrorCategory = ErrorCategory.InvalidOperation;
-                }
-
                 var errorRecord = new ErrorRecord(targetEx, targetErrorId, targetErrorCategory, null);
                 WriteError(errorRecord);
             }
@@ -77,6 +74,19 @@ private void HandleException(Exception exception)
                 throw exception;
             }
         }
+        
+
+        private Exception ParseResponse(GraphErrorException graphEx) {
+            int exceptionMessageIndex = graphEx.Response.Content.IndexOf("\"value\":", StringComparison.CurrentCultureIgnoreCase);
+            if (exceptionMessageIndex > 0) 
+            {
+                string substring = graphEx.Response.Content.Substring(exceptionMessageIndex+9);
+                // the start index is added 9, so as to remove the delimiter \"value\":\
+                string exceptionDetails = substring.Substring(0,substring.IndexOf("\"}"));
+                return new Exception(exceptionDetails);
+            }
+            return null;
+        }
 
         protected void ExecutionBlock(Action execAction)
         {

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -18,6 +18,10 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added a new dataplane commandlet to allow synchronization of databases from read-write instance to read-only instances 
+    - Included help file for the commandlet
+    - Added in-memory tests and a scenario test (only live)
+* Fixed bugs in Add-AzureAsAccount commandlet 
 
 ## Version 0.4.4
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/AnalysisServicesDataplaneStartup.ps1

@@ -13,6 +13,7 @@
 # ----------------------------------------------------------------------------------
 
 @{
-    "Login-AzureAsAccount" = "Restart-AzureAnalysisServicesInstance";
-    "Restart-AzureAsInstance" = "Set-AzureRmContext";
+    "Login-AzureAsAccount" = "Add-AzureAnalysisServicesAccount";
+    "Restart-AzureAsInstance" = "Restart-AzureAnalysisServicesInstance";
+	"Sync-AzureAsInstance" = "Sync-AzureAnalysisServicesInstance";
 }.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"

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

@@ -67,7 +67,8 @@ FunctionsToExport = '*'
 # Cmdlets to export from this module  
 CmdletsToExport = 'Add-AzureAnalysisServicesAccount',
                 'Restart-AzureAnalysisServicesInstance',
-                'Export-AzureAnalysisServicesInstanceLog'
+                'Export-AzureAnalysisServicesInstanceLog',
+                'Sync-AzureAnalysisServicesInstance'
 
 # Variables to export from this module  
 VariablesToExport = '*'  

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.csproj

@@ -89,6 +89,7 @@
   <ItemGroup>
     <Compile Include="Commands\AddAzureASAccount.cs" />
     <Compile Include="Commands\Export-AzureAsInstanceLog.cs" />
+    <Compile Include="Commands\Synchronize-AzureASInstance.cs" />
     <Compile Include="Models\AsAzureAccount.cs" />
     <Compile Include="Models\AsAzureClientSession.cs" />
     <Compile Include="Models\ASAzureContext.cs" />
@@ -97,6 +98,11 @@
     <Compile Include="Models\AsAzureProfile.cs" />
     <Compile Include="Commands\Restart-AzureAsInstance.cs" />
     <Compile Include="Models\AsAzureAuthenticationProvider.cs" />
+    <Compile Include="Models\DatabaseSyncState.cs" />
+    <Compile Include="Models\ScaleOutServerDatabaseSyncDetail.cs" />
+    <Compile Include="Models\ClusterResolutionResult.cs" />
+    <Compile Include="Models\ScaleOutServerDatabaseSyncResult.cs" />
+    <Compile Include="Models\SynchronizationFailedException.cs" />
     <Compile Include="Models\TokenCacheItemProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/AddAzureASAccount.cs

@@ -96,7 +96,8 @@ protected override string DataCollectionWarning
 
         protected override void BeginProcessing()
         {
-            base.BeginProcessing();
+            this._dataCollectionProfile = new AzurePSDataCollectionProfile(false);
+
             if (string.IsNullOrEmpty(RolloutEnvironment))
             {
                 RolloutEnvironment = AsAzureClientSession.GetDefaultEnvironmentName();
@@ -110,6 +111,7 @@ protected override void BeginProcessing()
             {
                 AsEnvironment = AsAzureClientSession.Instance.Profile.CreateEnvironment(RolloutEnvironment);
             }
+            base.BeginProcessing();
         }
 
         protected override void InitializeQosEvent()