refine codes

Author: BethanyZhou

src/Authentication.Abstractions/Authentication.Abstractions.csproj

@@ -54,6 +54,7 @@
 
   <ItemGroup>
     <None Include="..\..\LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="" />
+	<Folder Include="Models\" />
   </ItemGroup>
 
 </Project>

src/Authentication.Abstractions/Interfaces/IConfigManagerWithEvents.cs

@@ -1,4 +1,18 @@
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Models;
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// -------------------------------------
+
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Models;
 using Microsoft.Azure.PowerShell.Common.Config;
 
 using System;

src/Authentication.Abstractions/Models/ClearConfigOptions.cs renamed to src/Authentication.Abstractions/Models/Config/ClearConfigOptions.cs

@@ -0,0 +1,34 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// -------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions.Models
+{
+    public class ConfigEventArgs : EventArgs, IExtensibleModel
+    {
+        public string ConfigKey { get; }
+
+        public string ConfigValue { get; }
+
+        public IDictionary<string, string> ExtendedProperties { get; } = new Dictionary<string, string>();
+
+        public ConfigEventArgs(string configKey, string configValue)
+        {
+            ConfigKey = configKey;
+            ConfigValue = configValue;
+        }
+    }
+}

src/Authentication.Abstractions/Models/ConfigData.cs renamed to src/Authentication.Abstractions/Models/Config/ConfigData.cs

@@ -0,0 +1,30 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// -------------------------------------
+
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions.Models
+{
+    public class ConfigReadEventArgs : ConfigEventArgs
+    {
+        public string ConfigTelemetryKey { get; }
+
+        public ConfigReadEventArgs(string configKey, string configValue) : this(configKey, configKey, configValue)
+        {
+        }
+
+        public ConfigReadEventArgs(string configKey, string configTelemetryKey, string configValue) : base(configKey, configValue)
+        {
+            ConfigTelemetryKey = configTelemetryKey;
+        }
+    }
+}

src/Authentication.Abstractions/Models/ConfigDefinition.cs renamed to src/Authentication.Abstractions/Models/Config/ConfigDefinition.cs

@@ -524,25 +524,6 @@ protected void WriteSurvey()
             }
         }
 
-
-        private void AddTelemetryForConfig()
-        {
-            // attach config read event handler to add config telemetry
-            AzureSession.Instance.TryGetComponent<IConfigManager>(nameof(IConfigManager), out var configManager);
-            if (configManager is IConfigManagerWithEvents cm)
-            {
-                cm.ConfigRead += OnConfigReaded;
-            }            
-        }
-
-        private void OnConfigReaded(object sender, ConfigEventArgs args)
-        {
-            if (!_qosEvent.ConfigMetrics.ContainsKey(args.ConfigKey) && args is ConfigReadEventArgs readEventArgs)
-            {
-                _qosEvent.ConfigMetrics[readEventArgs.ConfigKey] = new ConfigMetrics(readEventArgs.ConfigTelemetryKey, readEventArgs.ConfigValue.ToString());
-            }
-        }
-
         protected new void ThrowTerminatingError(ErrorRecord errorRecord)
         {
             FlushDebugMessages();
@@ -567,8 +548,7 @@ private void OnConfigReaded(object sender, ConfigEventArgs args)
             base.WriteObject(sendToPipeline, enumerateCollection);
         }
 
-
-    private void SanitizeOutput(object sendToPipeline)
+        private void SanitizeOutput(object sendToPipeline)
         {
             if (OutputSanitizer?.RequireSecretsDetection == true)
             {
@@ -795,7 +775,27 @@ protected virtual void InitializeQosEvent()
 
             _qosEvent.SanitizerInfo = new SanitizerTelemetry(OutputSanitizer?.RequireSecretsDetection == true);
 
-            AddTelemetryForConfig();
+            AttachConfigReadHandlerForTelemetry();
+        }
+
+        /// <summary>
+        ///  Attach config read event handler to add config telemetry
+        /// </summary>
+        private void AttachConfigReadHandlerForTelemetry()
+        {
+            AzureSession.Instance.TryGetComponent<IConfigManager>(nameof(IConfigManager), out var configManager);
+            if (configManager is IConfigManagerWithEvents cm)
+            {
+                cm.ConfigRead += OnConfigRead;
+            }
+        }
+
+        private void OnConfigRead(object sender, ConfigEventArgs args)
+        {
+            if (!_qosEvent.ConfigMetrics.ContainsKey(args.ConfigKey) && args is ConfigReadEventArgs readEventArgs)
+            {
+                _qosEvent.ConfigMetrics[readEventArgs.ConfigKey] = new ConfigMetrics(readEventArgs.ConfigTelemetryKey, readEventArgs.ConfigValue.ToString());
+            }
         }
 
         private void RecordDebugMessages()