Update monitor cmdlet warning message (#17129)

* update monitor cmdlet warning message

* update the changelog.md

* update logic

* update some logic

Author: lijinpei2008

src/Monitor/Monitor/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Fixed an issue where users could not correctly ignore warning messages after setting environment variables [#17013]
 
 ## Version 3.0.0
 * Added new properties EventName, Category, ResourceProviderName, OperationName, Status, SubStatus with type string as output for command Get-AzLog [#15833]

src/Monitor/Monitor/MonitorCmdletBase.cs

@@ -60,20 +60,24 @@ protected string GetCmdletName()
         /// <param name="withTimeStamp">true if the message should include a timestamp, false (default) it no timestamp should be included</param>
         protected void WriteIdentifiedWarning(string cmdletName, string topic, string message, bool withTimeStamp = false)
         {
-            string formattedMessage = string.Format(
-                CultureInfo.InvariantCulture,
-                "[{0}] {1}: {2}",
-                cmdletName,
-                topic,
-                message);
-
-            if (withTimeStamp)
-            {
-                WriteWarningWithTimestamp(formattedMessage);
-            }
-            else
+            string supressWarningOrErrorValue = System.Environment.GetEnvironmentVariable(BreakingChangeAttributeHelper.SUPPRESS_ERROR_OR_WARNING_MESSAGE_ENV_VARIABLE_NAME);
+            bool supressWarningOrError;
+            Boolean.TryParse(supressWarningOrErrorValue, out supressWarningOrError);
+            if (!supressWarningOrError)
             {
-                WriteWarning(formattedMessage);
+                string formattedMessage = string.Format(
+                    CultureInfo.InvariantCulture, "{0}{1}{2}",
+                    string.IsNullOrEmpty(cmdletName) ? cmdletName : "[" + cmdletName + "] ",
+                    string.IsNullOrEmpty(topic) ? topic : topic + ": ",
+                    message);
+                if (withTimeStamp)
+                {
+                    WriteWarningWithTimestamp(formattedMessage);
+                }
+                else
+                {
+                    WriteWarning(formattedMessage);
+                }
             }
         }
 
@@ -87,16 +91,18 @@ public override void ExecuteCmdlet()
             string reasonPhrase = null;
             string message = null;
             string exName = null;
-            string supressWarningOrErrorValue = System.Environment.GetEnvironmentVariable(BreakingChangeAttributeHelper.SUPPRESS_ERROR_OR_WARNING_MESSAGE_ENV_VARIABLE_NAME);
             try
             {
-                bool supressWarningOrError;
-                Boolean.TryParse(supressWarningOrErrorValue, out supressWarningOrError);
-                if (!supressWarningOrError)
-                {
-                    WriteWarningWithTimestamp("The namespace for all the model classes will change from Microsoft.Azure.Management.Monitor.Management.Models to Microsoft.Azure.Management.Monitor.Models in future releases.");
-                    WriteWarningWithTimestamp("The namespace for output classes will be uniform for all classes in future releases to make it independent of modifications in the model classes.");
-                }
+                this.WriteIdentifiedWarning(
+                    cmdletName: "",
+                    topic: "",
+                    message: "*** The namespace for all the model classes will change from Microsoft.Azure.Management.Monitor.Management.Models to Microsoft.Azure.Management.Monitor.Models in future releases.",
+                    withTimeStamp: true);
+                this.WriteIdentifiedWarning(
+                    cmdletName: "",
+                    topic: "",
+                    message: "*** The namespace for output classes will be uniform for all classes in future releases to make it independent of modifications in the model classes.",
+                    withTimeStamp: true);
                 this.ProcessRecordInternal();
             }
             catch (AggregateException ex)