Fixing build failure in analysisservices dataplane apis

Author: athipp

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.ServiceManagement/AzureRM.AnalysisServices.ServiceManagement.psd1

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

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

@@ -44,7 +44,7 @@ protected override AzureContext DefaultContext
         {
             get
             {
-                // Nothing to do with Azure Resource Managment APIs
+                // Nothing to do with Azure Resource Managment context
                 return null;
             }
         }
@@ -108,10 +108,6 @@ public override void ExecuteCmdlet()
                 }
 
                 var asAzureProfile = AsAzureClientSession.Instance.Login(currentProfile.Context, password);
-                if (!currentProfile.Environments.ContainsKey(EnvironmentName))
-                {
-                    currentProfile.Environments.Add(AsEnvironment.Name, AsEnvironment);
-                }
 
                 WriteObject(asAzureProfile);
             }

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.ServiceManagement/Commands/Restart-AzureAsInstance.cs

@@ -13,7 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Linq;
 using System.Management.Automation;
+using System.Management.Instrumentation;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
@@ -32,11 +34,20 @@ namespace Microsoft.Azure.Commands.AnalysisServices.ServiceManagement
     [OutputType(typeof(AsAzureProfile))]
     public class RestartAzureAnalysisServer: AzurePSCmdlet, IModuleAssemblyInitializer
     {
+        private string serverName;
+
         [Parameter(Mandatory = true, HelpMessage = "Name of the Azure Analysis Services server to restart")]
         [ValidateNotNullOrEmpty]
         public string Instance { get; set; }
 
-        protected override AzureContext DefaultContext { get; }
+        protected override AzureContext DefaultContext
+        {
+            get
+            {
+                // Nothing to do with Azure Resource Managment context
+                return null;
+            }
+        }
 
         protected override void SaveDataCollectionProfile()
         {
@@ -55,13 +66,30 @@ protected override void BeginProcessing()
 #pragma warning disable 0618
             if (Instance == null)
             {
-                throw new PSArgumentNullException(nameof(Instance));
+                throw new PSArgumentNullException(nameof(Instance), "Name of Azure Analysis Services server not specified");
             }
 
             if (AsAzureClientSession.Instance.Profile.Environments.Count == 0)
             {
                 throw new PSInvalidOperationException(string.Format(Resources.NotLoggedInMessage, ""));
             }
+
+            serverName = Instance;
+            Uri uriResult;
+
+            // if the user specifies the FQN of the server, then extract the servername out of that.
+            // and set the current context
+            if (Uri.TryCreate(Instance, UriKind.Absolute, out uriResult) && uriResult.Scheme == "asazure")
+            {
+                serverName = uriResult.PathAndQuery.Trim('/');
+                if (string.Compare(AsAzureClientSession.Instance.Profile.Context.Environment.Name, uriResult.DnsSafeHost, StringComparison.InvariantCultureIgnoreCase) != 0)
+                {
+                    AsAzureClientSession.Instance.SetCurrentContext(
+                        new AsAzureAccount(),
+                        AsAzureClientSession.Instance.Profile.CreateEnvironment(uriResult.DnsSafeHost));
+                }
+            }
+
 #pragma warning restore 0618
         }
 
@@ -72,33 +100,28 @@ protected override void InitializeQosEvent()
 
         public override void ExecuteCmdlet()
         {
-            if (!string.IsNullOrEmpty(Instance))
+            if (ShouldProcess(Instance, Resources.RestartingAnalysisServicesServer))
             {
-                if (ShouldProcess(Instance, Resources.RestartingAnalysisServicesServer))
+                var context = AsAzureClientSession.Instance.Profile.Context;
+                AsAzureClientSession.Instance.Login(context, null);
+                TokenCacheItem tokenCacheItem = AsAzureClientSession.TokenCache.ReadItems()
+                    .FirstOrDefault(tokenItem => tokenItem.TenantId.Equals(context.Account.Tenant));
+
+                if (tokenCacheItem == null || string.IsNullOrEmpty(tokenCacheItem.AccessToken))
                 {
-                    var context = AsAzureClientSession.Instance.Profile.Context;
-                    var restartEndpoint = string.Format(context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.RestartEndpointFormat], Instance);
-                    string restartBaseUri = string.Format("https://{0}", context.Environment.Name);
-                    var accessToken = AsAzureClientSession.GetAadAuthenticatedToken(
-                        context,
-                        null,
-                        PromptBehavior.Auto,
-                        AsAzureClientSession.AsAzureClientId,
-                        restartBaseUri,
-                        AsAzureClientSession.RedirectUri);
-
-                    using (HttpResponseMessage message = CallPostAsync(
-                        new Uri(restartBaseUri),
-                        restartEndpoint,
-                        accessToken).Result)
-                    {
-                        message.EnsureSuccessStatusCode();
-                    }
+                    throw new PSInvalidOperationException(string.Format(Resources.NotLoggedInMessage, ""));
+                }
+
+                Uri restartBaseUri = new Uri(string.Format("{0}{1}{2}", Uri.UriSchemeHttps, Uri.SchemeDelimiter, context.Environment.Name));
+
+                var restartEndpoint = string.Format(context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.RestartEndpointFormat], serverName);
+                using (HttpResponseMessage message = CallPostAsync(
+                    restartBaseUri,
+                    restartEndpoint,
+                    tokenCacheItem.AccessToken).Result)
+                {
+                    message.EnsureSuccessStatusCode();
                 }
-            }
-            else
-            {
-                WriteExceptionError(new PSArgumentNullException(nameof(Instance), "Name of Azure Analysis Services server not specified"));
             }
         }
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.ServiceManagement/Microsoft.Azure.Commands.AnalysisServices.ServiceManagement.dll-help.psd1

@@ -70,6 +70,11 @@ public AsAzureProfile Login(AsAzureContext asAzureContext, SecureString password
 
             _profile.Context.TokenCache = AsAzureClientSession.TokenCache.Serialize();
 
+            if (!_profile.Environments.ContainsKey(asAzureContext.Environment.Name))
+            {
+                _profile.Environments.Add(asAzureContext.Environment.Name, asAzureContext.Environment);
+            }
+
             return _profile;
         }
 

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

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