Merge branch 'release-2020-03-10' into master

Author: wyunchi-ms

src/ApiManagement/ApiManagement/ChangeLog.md

@@ -18,27 +18,15 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Added support for retrieving and configuring Custom Domain on the DeveloperPortal Endpoint
-    https://github.com/Azure/azure-powershell/issues/11007
-
-* **Export-AzApiManagementApi** Added support for downloading Api Definition in Json format
-    https://github.com/Azure/azure-powershell/issues/9987
-
-* **Import-AzApiManagementApi** Added support for importing OpenApi 3.0 definition from Json document
-
-* **New-AzApiManagementIdentityProvider** and **Set-AzApiManagementIdentityProvider** Added support for configuring `Signin Tenant` for AAD B2C Provider
-    https://github.com/Azure/azure-powershell/issues/9784
-
+* Added support for retrieving and configuring Custom Domain on the DeveloperPortal Endpoint [#11007]
+* `Export-AzApiManagementApi` Added support for downloading Api Definition in Json format [#9987]
+* `Import-AzApiManagementApi` Added support for importing OpenApi 3.0 definition from Json document
+* `New-AzApiManagementIdentityProvider` and `Set-AzApiManagementIdentityProvider` Added support for configuring `Signin Tenant` for AAD B2C Provider [#9784]
 
 ## Version 1.3.4
-* **Get-AzApiManagementApiSchema** Fixed getting Open-Api Schema associated with an API
-    https://github.com/Azure/azure-powershell/issues/10626
-
-* **New-AzApiManagementProduct*** and **Set-AzApiManagementProduct**
-  - Fix documentation for https://github.com/Azure/azure-powershell/issues/10472
-
-* **Set-AzApiManagementApi**
-    Added example to show how to update the ServiceUrl using the cmdlet
+* `Get-AzApiManagementApiSchema` Fixed getting Open-Api Schema associated with an API [#10626]
+* `New-AzApiManagementProduct` and `Set-AzApiManagementProduct` Fixed documentation for [#10472]
+* `Set-AzApiManagementApi` Added example to show how to update the ServiceUrl using the cmdlet
 
 ## Version 1.3.3
 * Update references in .psd1 to use relative path

src/Blueprint/Blueprint/ChangeLog.md

@@ -18,8 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Show DependsOn property value in the table view
-* Add support to accept PolicyDefinitionParameter empty 
+* Showed DependsOn property value in the table view
+* Added support to accept PolicyDefinitionParameter empty 
 
 ## Version 0.2.10
 * Added support to include subfolders when deploying blueprints with artifacts

src/DataLakeStore/DataLakeStore/ChangeLog.md

@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Add reference to System.Buffers explicitly in csproj and psd1.
+* Added reference to System.Buffers explicitly in csproj and psd1.
 
 ## Version 1.2.6
 * Update references in .psd1 to use relative path

src/IotHub/IotHub/ChangeLog.md

@@ -18,22 +18,22 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Add support to manage devices in an Iot Hub. New Cmdlets are:
-	- Add-AzIotHubDevice
-	- Get-AzIotHubDevice
-	- Remove-AzIotHubDevice
-	- Set-AzIotHubDevice
-* Add support to manage modules on a target Iot device in an Iot Hub. New Cmdlets are:
-	- Add-AzIotHubModule
-	- Get-AzIotHubModule
-	- Remove-AzIotHubModule
-	- Set-AzIotHubModule
-* Add cmdlet to get the connection string of a target IoT device in an Iot Hub.
-* Add cmdlet to get the connection string of a module on a target IoT device in an Iot Hub.
-* Add support to get/set parent device of an IoT device. New Cmdlets are:
-    - Get-AzIotHubDeviceParent
-    - Set-AzIotHubDeviceParent
-* Add support to manage device parent-child relationship.
+* Added support to manage devices in an Iot Hub. New Cmdlets are:
+	- `Add-AzIotHubDevice`
+	- `Get-AzIotHubDevice`
+	- `Remove-AzIotHubDevice`
+	- `Set-AzIotHubDevice`
+* Added support to manage modules on a target Iot device in an Iot Hub. New Cmdlets are:
+	- `Add-AzIotHubModule`
+	- `Get-AzIotHubModule`
+	- `Remove-AzIotHubModule`
+	- `Set-AzIotHubModule`
+* Added cmdlet to get the connection string of a target IoT device in an Iot Hub.
+* Added cmdlet to get the connection string of a module on a target IoT device in an Iot Hub.
+* Added support to get/set parent device of an IoT device. New Cmdlets are:
+    - `Get-AzIotHubDeviceParent`
+    - `Set-AzIotHubDeviceParent`
+* Added support to manage device parent-child relationship.
 
 ## Version 2.1.0
 * Added support to manage devices in an Iot Hub. New Cmdlets are:

src/Maintenance/Maintenance/ChangeLog.md

@@ -19,7 +19,7 @@
 -->
 
 ## Upcoming Release
-* Get Az-MaintenanceConfiguration will honor filters while listing maintenance configurations
+* Got `Az-MaintenanceConfiguration` will honor filters while listing maintenance configurations
 
 ## Version 0.1.2
 * Update command will display pending updates by default

src/Sql/Sql/Az.Sql.psd1

@@ -252,7 +252,8 @@ CmdletsToExport = 'Get-AzSqlDatabaseTransparentDataEncryption',
                'Enable-AzSqlDatabaseSensitivityRecommendation', 
                'Disable-AzSqlDatabaseSensitivityRecommendation', 
                'Enable-AzSqlInstanceDatabaseSensitivityRecommendation', 
-               'Disable-AzSqlInstanceDatabaseSensitivityRecommendation'
+               'Disable-AzSqlInstanceDatabaseSensitivityRecommendation',
+               'Disable-AzSqlServerActiveDirectoryOnlyAuthentication'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/Sql/Sql/ChangeLog.md

@@ -27,6 +27,7 @@
 * Added support for cross subscription point in time restore on Managed Instances.
 * Added support for changing existing Sql Managed Instance hardware generation
 * Fixed `Update-AzSqlServerVulnerabilityAssessmentSetting` help examples: parameter/property output - EmailAdmins
+* Updating Azure SQL Server Active Azure administrator API to use 2019-06-01-preview api version.
 
 ## Version 2.2.0
 Fix New-AzSqlDatabaseSecondary cmdlet to check for PartnerDatabaseName existence instead of DatabaseName existence.

src/Sql/Sql/ServerActiveDirectoryAdministrator/Cmdlet/AzureSqlServerActiveDirectoryAdministratorCmdletBase.cs

@@ -12,8 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Commands.Sql.ServerActiveDirectoryAdministrator.Model;

src/Sql/Sql/ServerActiveDirectoryAdministrator/Cmdlet/SetAzureSqlServerActiveDirectoryAdministrator.cs

@@ -11,9 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // ----------------------------------------------------------------------------------
-
-using Hyak.Common;
 using Microsoft.Azure.Commands.Sql.ServerActiveDirectoryAdministrator.Model;
+using Microsoft.Rest.Azure;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,7 +23,7 @@ namespace Microsoft.Azure.Commands.Sql.ServerActiveDirectoryAdministrator.Cmdlet
     /// <summary>
     /// Cmdlet to create a new Azure SQL Server Active Directory administrator
     /// </summary>
-    [Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlServerActiveDirectoryAdministrator",ConfirmImpact = ConfirmImpact.Medium, SupportsShouldProcess = true), OutputType(typeof(AzureSqlServerActiveDirectoryAdministratorModel))]
+    [Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SqlServerActiveDirectoryAdministrator", ConfirmImpact = ConfirmImpact.Medium, SupportsShouldProcess = true), OutputType(typeof(AzureSqlServerActiveDirectoryAdministratorModel))]
     public class SetAzureSqlServerActiveDirectoryAdministrator : AzureSqlServerActiveDirectoryAdministratorCmdletBase
     {
         /// <summary>
@@ -47,19 +46,33 @@ public class SetAzureSqlServerActiveDirectoryAdministrator : AzureSqlServerActiv
         [ValidateNotNullOrEmpty()]
         public Guid ObjectId { get; set; }
 
+        /// <summary>
+        /// Only Azure Active Directory authentication allowed
+        /// </summary>
+        [Parameter(Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            Position = 4,
+            HelpMessage = "Specifies if only Azure Active Directory authentication is allowed.")]
+        [ValidateNotNullOrEmpty()]
+        public bool? IsAzureOnlyAuthentication { get; set; }
+
         /// <summary>
         /// Get the entities from the service
         /// </summary>
         /// <returns>The list of entities</returns>
         protected override IEnumerable<AzureSqlServerActiveDirectoryAdministratorModel> GetEntity()
         {
             List<AzureSqlServerActiveDirectoryAdministratorModel> currentActiveDirectoryAdmins = null;
+
             try
             {
-                currentActiveDirectoryAdmins = new List<AzureSqlServerActiveDirectoryAdministratorModel>()
+                AzureSqlServerActiveDirectoryAdministratorModel model = ModelAdapter.GetServerActiveDirectoryAdministrator(this.ResourceGroupName, this.ServerName);
+
+                if (model != null)
                 {
-                    ModelAdapter.GetServerActiveDirectoryAdministrator(this.ResourceGroupName, this.ServerName),
-                };
+                    currentActiveDirectoryAdmins = new List<AzureSqlServerActiveDirectoryAdministratorModel>();
+                    currentActiveDirectoryAdmins.Add(model);
+                }
             }
             catch (CloudException ex)
             {
@@ -69,6 +82,14 @@ protected override IEnumerable<AzureSqlServerActiveDirectoryAdministratorModel>
                     throw;
                 }
             }
+            catch (Exception ex)
+            {
+                if ((ex.InnerException is CloudException ex1) &&
+                     ex1.Response.StatusCode != System.Net.HttpStatusCode.NotFound)
+                {
+                    throw ex.InnerException ?? ex;
+                }
+            }
 
             return currentActiveDirectoryAdmins;
         }
@@ -80,13 +101,14 @@ protected override IEnumerable<AzureSqlServerActiveDirectoryAdministratorModel>
         /// <returns>A list of models that was passed in</returns>
         protected override IEnumerable<AzureSqlServerActiveDirectoryAdministratorModel> ApplyUserInputToModel(IEnumerable<AzureSqlServerActiveDirectoryAdministratorModel> model)
         {
-            List<Model.AzureSqlServerActiveDirectoryAdministratorModel> newEntity = new List<AzureSqlServerActiveDirectoryAdministratorModel>();
+            List<Model.AzureSqlServerActiveDirectoryAdministratorModel> newEntity  = new List<AzureSqlServerActiveDirectoryAdministratorModel>();
             newEntity.Add(new AzureSqlServerActiveDirectoryAdministratorModel()
             {
                 ResourceGroupName = ResourceGroupName,
                 ServerName = ServerName,
                 DisplayName = DisplayName,
                 ObjectId = ObjectId,
+                IsAzureADOnlyAuthentication = IsAzureOnlyAuthentication,
             });
             return newEntity;
         }

src/Sql/Sql/ServerActiveDirectoryAdministrator/Model/AzureSqlServerActiveDirectoryAdministratorModel.cs

@@ -40,5 +40,10 @@ public class AzureSqlServerActiveDirectoryAdministratorModel
         /// Gets or sets the unique ID of the Azure SQL Server Active administrator admin object id
         /// </summary>
         public Guid ObjectId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value to indicate if only Azure AD Only authentication is allowed
+        /// </summary>
+        public bool? IsAzureADOnlyAuthentication { get; set; }
     }
 }

src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs

@@ -14,8 +14,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Sql.ServerActiveDirectoryAdministrator.Model;
-using Microsoft.Azure.Commands.Sql.Services;
-using Microsoft.Azure.Management.Sql.LegacySdk.Models;
+using Microsoft.Azure.Management.Sql.Models;
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
 using System;
 using System.Collections.Generic;
@@ -113,10 +112,7 @@ internal ICollection<AzureSqlServerActiveDirectoryAdministratorModel> ListServer
         /// <returns>The upserted Azure SQL Server Active Directory administrator</returns>
         internal AzureSqlServerActiveDirectoryAdministratorModel UpsertServerActiveDirectoryAdministrator(string resourceGroup, string serverName, AzureSqlServerActiveDirectoryAdministratorModel model)
         {
-            var resp = Communicator.CreateOrUpdate(resourceGroup, serverName, new ServerAdministratorCreateOrUpdateParameters()
-            {
-                Properties = GetActiveDirectoryInformation(model.DisplayName, model.ObjectId)
-            });
+            var resp = Communicator.CreateOrUpdate(resourceGroup, serverName, GetActiveDirectoryInformation(model.DisplayName, model.ObjectId, model.IsAzureADOnlyAuthentication));
 
             return CreateServerActiveDirectoryAdministratorModelFromResponse(resourceGroup, serverName, resp);
         }
@@ -131,40 +127,59 @@ public void RemoveServerActiveDirectoryAdministrator(string resourceGroupName, s
             Communicator.Remove(resourceGroupName, serverName);
         }
 
+        /// <summary>
+        /// Disable Azure Active Directory only authentication on a Azure SQL Server
+        /// </summary>
+        /// <param name="resourceGroup">The name of the resource group</param>
+        /// <param name="serverName">The name of the Azure Sql ServerActiveDirectoryAdministrator Server</param>
+        /// <returns>The upserted Azure SQL Server Active Directory administrator</returns>
+        internal AzureSqlServerActiveDirectoryAdministratorModel DisableAzureADOnlyAuthenticaion(string resourceGroup, string serverName)
+        {
+            var resp = Communicator.Disable(resourceGroup, serverName);
+
+            return CreateServerActiveDirectoryAdministratorModelFromResponse(resourceGroup, serverName, resp);
+        }
+
         /// <summary>
         /// Converts the response from the service to a powershell database object
         /// </summary>
         /// <param name="resourceGroupName">The resource group the server is in</param>
         /// <param name="serverName">The name of the Azure Sql ServerActiveDirectoryAdministrator Server</param>
         /// <param name="admin">The service response</param>
         /// <returns>The converted model</returns>
-        public static AzureSqlServerActiveDirectoryAdministratorModel CreateServerActiveDirectoryAdministratorModelFromResponse(string resourceGroup, string serverName, Management.Sql.LegacySdk.Models.ServerAdministrator admin)
+        public static AzureSqlServerActiveDirectoryAdministratorModel CreateServerActiveDirectoryAdministratorModelFromResponse(string resourceGroup, string serverName, Management.Sql.Models.ServerAzureADAdministrator admin)
         {
-            AzureSqlServerActiveDirectoryAdministratorModel model = new AzureSqlServerActiveDirectoryAdministratorModel();
-
-            model.ResourceGroupName = resourceGroup;
-            model.ServerName = serverName;
-            model.DisplayName = admin.Properties.Login;
-            model.ObjectId = admin.Properties.Sid;
+            if (admin != null)
+            {
+                AzureSqlServerActiveDirectoryAdministratorModel model = new AzureSqlServerActiveDirectoryAdministratorModel();
+
+                model.ResourceGroupName = resourceGroup;
+                model.ServerName = serverName;
+                model.DisplayName = admin.Login;
+                model.ObjectId = admin.Sid;
+                model.IsAzureADOnlyAuthentication = admin.AzureADOnlyAuthentication;
+                return model;
+            }
 
-            return model;
+            return null;
         }
 
         /// <summary>
         /// Verifies that the Azure Active Directory user or group exists, and will get the object id if it is not set.
         /// </summary>
         /// <param name="displayName">Azure Active Directory user or group display name</param>
         /// <param name="objectId">Azure Active Directory user or group object id</param>
+        /// <param name="isAzureADOnlyAuthentication">Allow only Azure Active Directory authentication</param>
         /// <returns></returns>
-        protected ServerAdministratorCreateOrUpdateProperties GetActiveDirectoryInformation(string displayName, Guid objectId)
+        protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displayName, Guid objectId, bool? isAzureADOnlyAuthentication)
         {
             // Gets the default Tenant id for the subscriptions
             Guid tenantId = GetTenantId();
 
             // Check for a Azure Active Directory group. Recommended to always use group.
             IEnumerable<PSADGroup> groupList = null;
 
-            var filter = new ADObjectFilterOptions()
+                        var filter = new ADObjectFilterOptions()
             {
                 Id = (objectId != null && objectId != Guid.Empty) ? objectId.ToString() : null,
                 SearchString = displayName,
@@ -190,11 +205,13 @@ protected ServerAdministratorCreateOrUpdateProperties GetActiveDirectoryInformat
                     throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.InvalidADGroupNotSecurity, displayName));
                 }
 
-                return new ServerAdministratorCreateOrUpdateProperties()
+
+                return new ServerAzureADAdministrator()
                 {
                     Login = group.DisplayName,
                     Sid = group.Id,
                     TenantId = tenantId,
+                    AzureADOnlyAuthentication = isAzureADOnlyAuthentication,
                 };
             }
 
@@ -238,11 +255,12 @@ protected ServerAdministratorCreateOrUpdateProperties GetActiveDirectoryInformat
                 // Only one user was found. Get the user display name and object id
                 var obj = userList.First();
 
-                return new ServerAdministratorCreateOrUpdateProperties()
+                return new ServerAzureADAdministrator()
                 {
                     Login = displayName,
                     Sid = obj.Id,
                     TenantId = tenantId,
+                    AzureADOnlyAuthentication = isAzureADOnlyAuthentication,
                 };
             }
         }