Restructure Analysis Services dataplane cmdlets to use Az module login.

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Updated Add-AzEnvironment and Set-AzEnvironment to accept parameter AzureAnalysisServicesEndpointResourceId
 * Bug fix for azure automation update management dynamic group
 
 ## Version 1.4.0

src/Accounts/Accounts/Environment/AddAzureRMEnvironment.cs

@@ -163,6 +163,10 @@ public string DataLakeAudience
            HelpMessage = "The endpoint to use when communicating with the Azure Log Analytics API.")]
         public string AzureAnalysisServicesEndpointSuffix { get; set; }
 
+        [Parameter(Mandatory = false,
+           HelpMessage = "The resource identifier of the Azure Analysis Services resource.")]
+        public string AzureAnalysisServicesEndpointResourceId { get; set; }
+
         protected override void BeginProcessing()
         {
             // do not call begin processing there is no context needed for this cmdlet
@@ -310,6 +314,8 @@ public override void ExecuteCmdlet()
                                     nameof(AzureOperationalInsightsEndpoint));
                                 SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix,
                                    nameof(AzureAnalysisServicesEndpointSuffix));
+                                SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId,
+                                   nameof(AzureAnalysisServicesEndpointResourceId));
                                 WriteObject(new PSAzureEnvironment(profileClient.AddOrSetEnvironment(newEnvironment)));
                             }
                         });

src/Accounts/Accounts/Environment/SetAzureRMEnvironment.cs

@@ -164,6 +164,10 @@ public string DataLakeAudience
           HelpMessage = "The endpoint to use when communicating with the Azure Log Analytics API.")]
         public string AzureAnalysisServicesEndpointSuffix { get; set; }
 
+        [Parameter(Mandatory = false,
+           HelpMessage = "The resource identifier of the Azure Analysis Services resource.")]
+        public string AzureAnalysisServicesEndpointResourceId { get; set; }
+
         protected override void BeginProcessing()
         {
             // do not call begin processing there is no context needed for this cmdlet
@@ -311,6 +315,8 @@ public override void ExecuteCmdlet()
                                     nameof(AzureOperationalInsightsEndpoint));
                                 SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix,
                                    nameof(AzureAnalysisServicesEndpointSuffix));
+                                SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId,
+                                   nameof(AzureAnalysisServicesEndpointResourceId));
                                 WriteObject(new PSAzureEnvironment(profileClient.AddOrSetEnvironment(newEnvironment)));
                             }
                         });

src/Accounts/Accounts/help/Add-AzEnvironment.md

@@ -25,8 +25,8 @@ Add-AzEnvironment [-Name] <String> [[-PublishSettingsFileUrl] <String>] [[-Servi
  [[-AdTenant] <String>] [[-GraphAudience] <String>] [[-DataLakeAudience] <String>]
  [[-BatchEndpointResourceId] <String>] [[-AzureOperationalInsightsEndpointResourceId] <String>]
  [[-AzureOperationalInsightsEndpoint] <String>] [-AzureAnalysisServicesEndpointSuffix <String>]
- [-Scope <ContextModificationScope>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
- [<CommonParameters>]
+ [-AzureAnalysisServicesEndpointResourceId <String>] [-Scope <ContextModificationScope>]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ARMEndpoint
@@ -35,8 +35,9 @@ Add-AzEnvironment [-Name] <String> [[-StorageEndpoint] <String>] [-ARMEndpoint]
  [[-AzureKeyVaultDnsSuffix] <String>] [[-AzureKeyVaultServiceEndpointResourceId] <String>]
  [[-DataLakeAudience] <String>] [[-BatchEndpointResourceId] <String>]
  [[-AzureOperationalInsightsEndpointResourceId] <String>] [[-AzureOperationalInsightsEndpoint] <String>]
- [-AzureAnalysisServicesEndpointSuffix <String>] [-Scope <ContextModificationScope>]
- [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-AzureAnalysisServicesEndpointSuffix <String>] [-AzureAnalysisServicesEndpointResourceId <String>]
+ [-Scope <ContextModificationScope>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -155,6 +156,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -AzureAnalysisServicesEndpointResourceId
+The resource identifier of the Azure Analysis Services resource.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AzureAnalysisServicesEndpointSuffix
 The endpoint to use when communicating with the Azure Log Analytics API.
 

src/Accounts/Accounts/help/Set-AzEnvironment.md

@@ -25,8 +25,8 @@ Set-AzEnvironment [-Name] <String> [[-PublishSettingsFileUrl] <String>] [[-Servi
  [[-AdTenant] <String>] [[-GraphAudience] <String>] [[-DataLakeAudience] <String>]
  [[-BatchEndpointResourceId] <String>] [[-AzureOperationalInsightsEndpointResourceId] <String>]
  [[-AzureOperationalInsightsEndpoint] <String>] [-AzureAnalysisServicesEndpointSuffix <String>]
- [-Scope <ContextModificationScope>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
- [<CommonParameters>]
+ [-AzureAnalysisServicesEndpointResourceId <String>] [-Scope <ContextModificationScope>]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ARMEndpoint
@@ -35,8 +35,9 @@ Set-AzEnvironment [-Name] <String> [[-StorageEndpoint] <String>] [-ARMEndpoint]
  [[-AzureKeyVaultDnsSuffix] <String>] [[-AzureKeyVaultServiceEndpointResourceId] <String>]
  [[-DataLakeAudience] <String>] [[-BatchEndpointResourceId] <String>]
  [[-AzureOperationalInsightsEndpointResourceId] <String>] [[-AzureOperationalInsightsEndpoint] <String>]
- [-AzureAnalysisServicesEndpointSuffix <String>] [-Scope <ContextModificationScope>]
- [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-AzureAnalysisServicesEndpointSuffix <String>] [-AzureAnalysisServicesEndpointResourceId <String>]
+ [-Scope <ContextModificationScope>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -149,6 +150,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -AzureAnalysisServicesEndpointResourceId
+The resource identifier of the Azure Analysis Services resource.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AzureAnalysisServicesEndpointSuffix
 The endpoint to use when communicating with the Azure Log Analytics API.
 

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

@@ -12,18 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Commands.Common.Authentication.Models;
-using System.IO;
 using System.Management.Automation;
-using System.Reflection;
-using System.Security;
 using Microsoft.Azure.Commands.AnalysisServices.Dataplane.Properties;
-using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using Microsoft.WindowsAzure.Commands.Common;
-using System;
 using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
 {
@@ -40,6 +33,7 @@ public class AddAzureASAccountCommand : AzurePSCmdlet
         private const string ServicePrincipalWithPasswordParameterSet = "ServicePrincipalWithPasswordParameterSetName";
         private const string ServicePrincipalWithCertificateParameterSet = "ServicePrincipalWithCertificateParameterSetName";
 
+        // This is ignored since we only support public cloud
         [Parameter(ParameterSetName = UserParameterSet,
             Mandatory = false, HelpMessage = "Name of the Azure Analysis Services environment to which to logon to", Position = 0)]
         [Parameter(ParameterSetName = ServicePrincipalWithPasswordParameterSet,
@@ -77,8 +71,6 @@ public class AddAzureASAccountCommand : AzurePSCmdlet
         [ValidateNotNullOrEmpty]
         public string CertificateThumbprint { get; set; }
 
-        protected AsAzureEnvironment AsEnvironment;
-
         protected override IAzureContext DefaultContext
         {
             get
@@ -96,106 +88,42 @@ protected override string DataCollectionWarning
             }
         }
 
-        protected override void BeginProcessing()
+        public override void ExecuteCmdlet()
         {
-            this._dataCollectionProfile = new AzurePSDataCollectionProfile(false);
+            System.Management.Automation.PowerShell ps = System.Management.Automation.PowerShell.Create();
+            ps.AddCommand("Connect-AzAccount");
 
-            if (string.IsNullOrEmpty(RolloutEnvironment))
+            if (MyInvocation.BoundParameters.ContainsKey(nameof(Credential)))
             {
-                RolloutEnvironment = AsAzureClientSession.GetDefaultEnvironmentName();
+                ps.AddParameter("Credential",  Credential);
             }
 
-            if (AsAzureClientSession.Instance.Profile.Environments.ContainsKey(RolloutEnvironment))
+            if (MyInvocation.BoundParameters.ContainsKey(nameof(ServicePrincipal)))
             {
-                AsEnvironment = (AsAzureEnvironment)AsAzureClientSession.Instance.Profile.Environments[RolloutEnvironment];
+                ps.AddParameter("ServicePrincipal", ServicePrincipal);
             }
-            else
-            {
-                AsEnvironment = AsAzureClientSession.Instance.Profile.CreateEnvironment(RolloutEnvironment);
-            }
-            base.BeginProcessing();
-        }
-
-        protected override void InitializeQosEvent()
-        {
-            // nothing to do here.
-        }
-
-        protected override void SetupDebuggingTraces()
-        {
-            // nothing to do here.
-        }
-
-        protected override void TearDownDebuggingTraces()
-        {
-            // nothing to do here.
-        }
-
-        protected override void SetupHttpClientPipeline()
-        {
-            // nothing to do here.
-        }
-
-        protected override void TearDownHttpClientPipeline()
-        {
-            // nothing to do here.
-        }
-
-        public override void ExecuteCmdlet()
-        {
-            var azureAccount = new AsAzureAccount
-            {
-                Type = ServicePrincipal ? AsAzureAccount.AccountType.ServicePrincipal : AsAzureAccount.AccountType.User
-            };
 
-            SecureString password = null;
-            if (Credential != null)
+            if (MyInvocation.BoundParameters.ContainsKey(nameof(TenantId)))
             {
-                azureAccount.Id = Credential.UserName;
-                password = Credential.Password;
+                ps.AddParameter("Tenant", TenantId);
             }
 
-            if (ServicePrincipal)
+            if (MyInvocation.BoundParameters.ContainsKey(nameof(ApplicationId)))
             {
-                azureAccount.Tenant = TenantId;
-
-                if (!string.IsNullOrEmpty(ApplicationId))
-                {
-                    azureAccount.Id = ApplicationId;
-                }
-                if (!string.IsNullOrEmpty(CertificateThumbprint))
-                {
-                    azureAccount.CertificateThumbprint = CertificateThumbprint;
-                }
+                ps.AddParameter("ApplicationId", ApplicationId);
             }
 
-            if (ShouldProcess(string.Format(Resources.LoginTarget, AsEnvironment.Name), "log in"))
+            if (MyInvocation.BoundParameters.ContainsKey(nameof(CertificateThumbprint)))
             {
-                var currentProfile = AsAzureClientSession.Instance.Profile;
-                var currentContext = currentProfile.Context;
-
-                // If there is no current context create one. If there is one already then
-                // if the current credentials (userid) match the one that is already in context then use it.
-                // if either the userid that is logging in or the environment to which login is happening is
-                // different than the one in the context then clear the current context and proceed to login.
-                // At any given point in time, we should only have one context i.e. one user logged in to one
-                // environment.
-                if (currentContext == null || Credential == null ||
-                    string.IsNullOrEmpty(currentContext.Account.Id) || 
-                    !currentContext.Account.Id.Equals(Credential.UserName) ||
-                    !RolloutEnvironment.Equals(currentContext.Environment.Name))
-                {
-                    AsAzureClientSession.Instance.SetCurrentContext(azureAccount, AsEnvironment);
-                }
-// TODO: Remove IfDef
-#if NETSTANDARD
-                var asAzureProfile = AsAzureClientSession.Instance.Login(currentProfile.Context, password, WriteWarning);
-#else
-                var asAzureProfile = AsAzureClientSession.Instance.Login(currentProfile.Context, password);
-#endif
-
-                WriteObject(asAzureProfile);
+                ps.AddParameter("CertificateThumbprint", CertificateThumbprint);
             }
+
+            ps.Invoke();
+        }
+
+        protected override void InitializeQosEvent()
+        {
+            // No data collection for this cmdlet
         }
     }
 }