[Audit policy] Set-AzSqlDatabaseAudit - support Hyperscale database

src/Sql/Sql/Auditing/Services/SqlAuditAdapter.cs

@@ -21,6 +21,7 @@
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace Microsoft.Azure.Commands.Sql.Auditing.Services
@@ -257,10 +258,7 @@ private static void DetermineTargetsState(
 
         private bool SetAudit(DatabaseAuditModel model)
         {
-            if (!IsDatabaseInServiceTierForPolicy(model.ResourceGroupName, model.ServerName, model.DatabaseName))
-            {
-                throw new Exception(Properties.Resources.DatabaseNotInServiceTierForAuditingPolicy);
-            }
+            ValidateDatabaseInServiceTierForPolicy(model.ResourceGroupName, model.ServerName, model.DatabaseName);
 
             if (string.IsNullOrEmpty(model.PredicateExpression))
             {
@@ -394,13 +392,21 @@ internal bool RemoveFirstDiagnosticSettings(dynamic model)
             return true;
         }
 
-        private bool IsDatabaseInServiceTierForPolicy(string resourceGroupName, string serverName, string databaseName)
+        private void ValidateDatabaseInServiceTierForPolicy(string resourceGroupName, string serverName, string databaseName)
         {
             var dbCommunicator = new AzureSqlDatabaseCommunicator(Context);
             var database = dbCommunicator.Get(resourceGroupName, serverName, databaseName);
-            Enum.TryParse(database.Edition, true, out Database.Model.DatabaseEdition edition);
-            return edition != Database.Model.DatabaseEdition.None &&
-                edition != Database.Model.DatabaseEdition.Free;
+
+            if (!Enum.TryParse(database.Edition, true, out Database.Model.DatabaseEdition edition))
+            {
+                throw new Exception(string.Format(CultureInfo.InvariantCulture,
+                    Properties.Resources.UnsupportedDatabaseEditionForAuditingPolicy, database.Edition));
+            }
+
+            if (edition == Database.Model.DatabaseEdition.None || edition == Database.Model.DatabaseEdition.Free)
+            {
+                throw new Exception(Properties.Resources.DatabaseNotInServiceTierForAuditingPolicy);
+            }
         }
 
         private void PolicizeAuditModel(ServerAuditModel model, dynamic policy)

src/Sql/Sql/ChangeLog.md

@@ -18,10 +18,11 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed issues where Set-AzSqlDatabaseAudit were not support Hyperscale database and database edition cannot be determined
 * Added DiffBackupIntervalInHours to `Set-AzSqlDatabaseBackupShortTermRetentionPolicy` 
 * Fixed issue where New-AzSqlDatabaseExport fails if networkIsolation not specified [#13097]
 * Fixed issue where New-AzSqlDatabaseExport and New-AzSqlDatabaseImport were not returning OperationStatusLink in the result object [#13097]
-* Update Azure Paired Regions URL in Backup Storage Redundancy Warnings 
+* Update Azure Paired Regions URL in Backup Storage Redundancy Warnings
 
 ## Version 2.11.0
 * Added BackupStorageRedundancy to the following: 

src/Sql/Sql/Database/Model/DatabaseEdition.cs

@@ -68,6 +68,11 @@ public enum DatabaseEdition
         /// Business Critical edition for SqlAzure database
         /// </summary>
         BusinessCritical = 11,
+
+        /// <summary>
+        /// Hyperscale edition for SqlAzure database
+        /// </summary>
+        Hyperscale = 12
     }
 }
 

src/Sql/Sql/Properties/Resources.resx

@@ -652,4 +652,7 @@
   <data name="BackupRedundancyNotChosenTakeSourceWarning" xml:space="preserve">
     <value>You have not specified the value for backup storage redundancy which will default to the source's backup storage redundancy. To learn more about Azure Paired Regions visit aka.ms/azure-ragrs-regions.</value>
   </data>
+  <data name="UnsupportedDatabaseEditionForAuditingPolicy" xml:space="preserve">
+    <value>Auditing policy cannot be defined for database edition {0}</value>
+  </data>
 </root>