Revert "Fixed complaint on Managed instance's system database for vulnerability assessment"

src/Sql/Sql/ChangeLog.md

@@ -18,7 +18,6 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Fixed complaint on Managed instance's system database for vulnerability assessment
 * Added warning for BackupStorageRedundancy configuration in select regions in `New-AzSqlDatabase` (Ignore Case for BackupStorageRedundancy configuration input)
 * Fixed for bug in `New-AzSqlDatabaseExport`
 * Removed case sensitivity for BackupStorageRedundancy parameter for `New-AzSqlInstance`

src/Sql/Sql/Properties/Resources.resx

@@ -450,6 +450,9 @@
   <data name="RetrievingStorageAccountKeysFailed" xml:space="preserve">
     <value>Failed retrieving keys of storage '{0}'.</value>
   </data>
+  <data name="VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase" xml:space="preserve">
+    <value>Vulnerability Assessment operation is not available on managed instance system database. Skipping...</value>
+  </data>
   <data name="KeyIdNotFoundForAzureKeyVaultEncryptionProtectorError" xml:space="preserve">
     <value>KeyId parameter is required for encryption protector type AzureKeyVault</value>
   </data>

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentRuleBaseline/ManagedDatabase/ClearSqlManagedDatabaseVulnerabilityAssessmentRuleBaseline.cs

@@ -102,5 +102,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentRu
         {
             return new ManagedDatabaseVulnerabilityAssessmentRuleBaselineModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentRuleBaseline/ManagedDatabase/GetAzureSqlManagedDatabaseVulnerabilityAssessmentRuleBaseline.cs

@@ -102,5 +102,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentRu
         {
             return new ManagedDatabaseVulnerabilityAssessmentRuleBaselineModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentRuleBaseline/ManagedDatabase/SetAzureSqlManagedDatabaseVulnerabilityAssessmentRuleBaseline.cs

@@ -112,5 +112,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentRu
         {
             return new ManagedDatabaseVulnerabilityAssessmentRuleBaselineModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentScan/ManagedDatabase/ConvertAzureSqlManagedDatabaseVulnerabilityAssessmentScan.cs

@@ -112,5 +112,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentSc
         {
             return new ManagedDatabaseVulnerabilityAssessmentScanExportModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentScan/ManagedDatabase/GetAzureSqlManagedDatabaseVulnerabilityAssessmentScanRecord.cs

@@ -104,5 +104,20 @@ protected override object TransformModelToOutputObject(IEnumerable<Vulnerability
         {
             return models.Select(model => new ManagedDatabaseVulnerabilityAssessmentScanRecordModel(model, GetServerName(), GetDatabaseName()));
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentScan/ManagedDatabase/StartAzureSqlManagedDatabaseVulnerabilityAssessmentScan.cs

@@ -102,5 +102,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentSc
         {
             return new ManagedDatabaseVulnerabilityAssessmentScanRecordModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentSettings/ManagedDatabase/ClearSqlManagedDatabaseVulnerabilityAssessmentSettings.cs

@@ -102,5 +102,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentSe
         {
             return new ManagedDatabaseVulnerabilityAssessmentSettingsModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentSettings/ManagedDatabase/GetAzureSqlManagedDatabaseVulnerabilityAssessmentSettings.cs

@@ -102,5 +102,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentSe
         {
             return new ManagedDatabaseVulnerabilityAssessmentSettingsModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }

src/Sql/Sql/VulnerabilityAssessment/Cmdlet/VulnerabilityAssessmentSettings/ManagedDatabase/UpdateAzureSqlManagedDatabaseVulnerabilityAssessmentSettings.cs

@@ -68,5 +68,20 @@ protected override object TransformModelToOutputObject(VulnerabilityAssessmentSe
         {
             return new ManagedDatabaseVulnerabilityAssessmentSettingsModel(model, GetServerName(), GetDatabaseName());
         }
+
+        /// <summary>
+        /// Overriding to add warning message in case cmdlet is on master
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            var database = GetDatabaseName();
+            if (database == "master" || database == "msdb" || database == "model")
+            {
+                WriteWarning(Resources.VulnerabilityAssessmentOperationIsNotAvailableOnManagedInstanceSystemDatabase);
+                return;
+            }
+
+            base.ExecuteCmdlet();
+        }
     }
 }