Test removing automapper (#21135)

NoriZC · web-flow · commit bdb97bfd0ac3 · 2023-03-07T17:16:12.000+08:00
diff --git a/src/Monitor/Monitor/Az.Monitor.psd1 b/src/Monitor/Monitor/Az.Monitor.psd1
@@ -56,8 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.11.2'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'Microsoft.Azure.Management.Monitor.dll', 
-               'Microsoft.Azure.PowerShell.AutoMapper.dll', 
+RequiredAssemblies = 'Microsoft.Azure.Management.Monitor.dll',
                'ActivityLogAlert.Autorest\bin\Az.ActivityLogAlert.private.dll', 
                'DiagnosticSetting.Autorest\bin\Az.DiagnosticSetting.private.dll', 
                'ScheduledQueryRule.Autorest\bin\Az.ScheduledQueryRule.private.dll', 
diff --git a/src/Monitor/Monitor/Monitor.csproj b/src/Monitor/Monitor/Monitor.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.28.0-preview" />
-    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
diff --git a/src/Monitor/Monitor/OutputClasses/PSMonitorPrivateLinkScope.cs b/src/Monitor/Monitor/OutputClasses/PSMonitorPrivateLinkScope.cs
@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using Microsoft.Azure.Management.Monitor.Models;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Insights.OutputClasses
@@ -34,6 +35,19 @@ public PSMonitorPrivateLinkScope() { }
             this.ProvisioningState = provisioningState;
         }
 
+        internal static PSMonitorPrivateLinkScope ToPSMonitorPrivateLinkScope(AzureMonitorPrivateLinkScope scope)
+        {
+            return new PSMonitorPrivateLinkScope
+            {
+                Id = scope.Id,
+                Name = scope.Name,
+                Type = scope.Type,
+                Location = scope.Location,
+                Tags = scope.Tags,
+                ProvisioningState = scope.ProvisioningState
+            };
+        }
+
         /// <summary>
         /// Gets azure resource Id
         /// </summary>
diff --git a/src/Monitor/Monitor/OutputClasses/PSMonitorPrivateLinkScopedResource.cs b/src/Monitor/Monitor/OutputClasses/PSMonitorPrivateLinkScopedResource.cs
@@ -13,6 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Mail;
+using Microsoft.Azure.Management.Monitor.Models;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Insights.OutputClasses
@@ -57,5 +59,17 @@ public class PSMonitorPrivateLinkScopedResource
         /// </summary>
         [JsonProperty(PropertyName = "properties.provisioningState")]
         public string ProvisioningState { get; private set; }
+
+        internal static PSMonitorPrivateLinkScopedResource ToPSMonitorPrivateLinkScopedResource(ScopedResource scope)
+        {
+            return new PSMonitorPrivateLinkScopedResource
+            {
+                Id = scope.Id,
+                Name = scope.Name,
+                Type = scope.Type,
+                LinkedResourceId = scope.LinkedResourceId,
+                ProvisioningState = scope.ProvisioningState
+            };
+        }
     }
 }
diff --git a/src/Monitor/Monitor/PrivateLinkScopes/AzureInsightsPrivateLinkScopeCreateOrUpdateCmdletBase.cs b/src/Monitor/Monitor/PrivateLinkScopes/AzureInsightsPrivateLinkScopeCreateOrUpdateCmdletBase.cs
@@ -17,7 +17,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Monitor.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.Azure.Commands.Insights.Utils;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Monitor/Monitor/PrivateLinkScopes/GetAzureInsightsPrivateLinkScope.cs b/src/Monitor/Monitor/PrivateLinkScopes/GetAzureInsightsPrivateLinkScope.cs
@@ -17,7 +17,6 @@
 using Microsoft.Azure.Commands.Insights.OutputClasses;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.Azure.Commands.Insights.Utils;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using System.Linq;
 
@@ -72,14 +71,14 @@ protected override void ProcessRecordInternal()
                                        .PrivateLinkScopes
                                        .ListByResourceGroupWithHttpMessagesAsync(this.ResourceGroupName)
                                        .Result;
-                    WriteObject(response.Body.Select(scope => PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(scope)).ToList(), true);
+                    WriteObject(response.Body.Select(scope => PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(scope)).ToList(), true);
                 }
                 else
                 {
                     var response = this.MonitorManagementClient
                                        .PrivateLinkScopes.ListWithHttpMessagesAsync()
                                        .Result;
-                    WriteObject(response.Body.Select(scope => PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(scope)).ToList(), true);
+                    WriteObject(response.Body.Select(scope => PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(scope)).ToList(), true);
                 }
             }
             else if (ParameterSetName.Equals(ByResourceNameParameterSet) || ParameterSetName.Equals(ResourceId))
@@ -95,7 +94,7 @@ protected override void ProcessRecordInternal()
                                        .PrivateLinkScopes
                                        .GetWithHttpMessagesAsync(this.ResourceGroupName, this.Name)
                                        .Result;
-                WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(response.Body));
+                WriteObject(PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(response.Body));
             }
         }
     }
diff --git a/src/Monitor/Monitor/PrivateLinkScopes/GetAzureInsightsPrivateLinkScopedResource.cs b/src/Monitor/Monitor/PrivateLinkScopes/GetAzureInsightsPrivateLinkScopedResource.cs
@@ -16,7 +16,6 @@
 using Microsoft.Azure.Commands.Insights.OutputClasses;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.Azure.Commands.Insights.Utils;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using System.Linq;
 
@@ -98,15 +97,15 @@ protected override void ProcessRecordInternal()
                                        .PrivateLinkScopedResources
                                        .ListByPrivateLinkScopeWithHttpMessagesAsync(this.ResourceGroupName, this.ScopeName)
                                        .Result;
-                WriteObject(response.Body.Select(scope => PSMapper.Instance.Map<PSMonitorPrivateLinkScopedResource>(scope)).ToList(), true);
+                WriteObject(response.Body.Select(scope => PSMonitorPrivateLinkScopedResource.ToPSMonitorPrivateLinkScopedResource(scope)).ToList(), true);
             }
             else if (this.IsParameterBound(c => c.Name))
             {
                 var response = this.MonitorManagementClient
                                        .PrivateLinkScopedResources
                                        .GetWithHttpMessagesAsync(this.ResourceGroupName, this.ScopeName, this.Name)
                                        .Result;
-                WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScopedResource>(response.Body));
+                WriteObject(PSMonitorPrivateLinkScopedResource.ToPSMonitorPrivateLinkScopedResource(response.Body));
             }
         }
     }
diff --git a/src/Monitor/Monitor/PrivateLinkScopes/NewAzureInsightsPrivateLinkScope.cs b/src/Monitor/Monitor/PrivateLinkScopes/NewAzureInsightsPrivateLinkScope.cs
@@ -16,7 +16,6 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Insights.OutputClasses;
 using Microsoft.Azure.Management.Monitor.Models;
-using Microsoft.Azure.Commands.Insights.Utils;
 using System.Linq;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
@@ -67,7 +66,7 @@ protected override void ProcessRecordInternal()
                                    .PrivateLinkScopes
                                    .CreateOrUpdateWithHttpMessagesAsync(this.ResourceGroupName, this.Name, payLoad)
                                    .Result;
-                WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(response.Body));
+                WriteObject(PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(response.Body));
             }
         }
     }
diff --git a/src/Monitor/Monitor/PrivateLinkScopes/NewAzureInsightsPrivateLinkScopedResource.cs b/src/Monitor/Monitor/PrivateLinkScopes/NewAzureInsightsPrivateLinkScopedResource.cs
@@ -15,7 +15,6 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Insights.OutputClasses;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.Azure.Commands.Insights.Utils;
 using Microsoft.Azure.Management.Monitor.Models;
 
 namespace Microsoft.Azure.Commands.Insights.PrivateLinkScopes
@@ -56,7 +55,7 @@ protected override void ProcessRecordInternal()
                                        .PrivateLinkScopedResources
                                        .CreateOrUpdateWithHttpMessagesAsync(this.ResourceGroupName, this.ScopeName, this.Name, this.LinkedResourceId)
                                        .Result;
-                WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScopedResource>(response.Body));
+                WriteObject(PSMonitorPrivateLinkScopedResource.ToPSMonitorPrivateLinkScopedResource(response.Body));
             }
         }
 
diff --git a/src/Monitor/Monitor/PrivateLinkScopes/UpdateAzureInsightsPrivateLinkScope.cs b/src/Monitor/Monitor/PrivateLinkScopes/UpdateAzureInsightsPrivateLinkScope.cs
@@ -17,7 +17,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Monitor.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.Azure.Commands.Insights.Utils;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using System.Collections.Generic;
 using System.Linq;
@@ -71,7 +70,7 @@ protected override void ProcessRecordInternal()
                                    .PrivateLinkScopes
                                    .UpdateTagsWithHttpMessagesAsync(this.ResourceGroupName, this.Name, this.Tags.ToDictionary(s => s.Split(':')[0], s => s.Split(':')[1]))
                                    .Result;
-                WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(response.Body));
+                WriteObject(PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(response.Body));
             }
         }
     }
diff --git a/src/Monitor/Monitor/Utils/PSMapper.cs b/src/Monitor/Monitor/Utils/PSMapper.cs

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`using Microsoft.Azure.Commands.Insights.OutputClasses;`
`18`	`18`	`using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;`
`19`	`19`	`using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`20`		`-using Microsoft.Azure.Commands.Insights.Utils;`
`21`	`20`	`using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;`
`22`	`21`	`using System.Linq;`
`23`	`22`
`@@ -72,14 +71,14 @@ protected override void ProcessRecordInternal()`
`72`	`71`	`.PrivateLinkScopes`
`73`	`72`	`.ListByResourceGroupWithHttpMessagesAsync(this.ResourceGroupName)`
`74`	`73`	`.Result;`
`75`		`- WriteObject(response.Body.Select(scope => PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(scope)).ToList(), true);`
	`74`	`+ WriteObject(response.Body.Select(scope => PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(scope)).ToList(), true);`
`76`	`75`	`}`
`77`	`76`	`else`
`78`	`77`	`{`
`79`	`78`	`var response = this.MonitorManagementClient`
`80`	`79`	`.PrivateLinkScopes.ListWithHttpMessagesAsync()`
`81`	`80`	`.Result;`
`82`		`- WriteObject(response.Body.Select(scope => PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(scope)).ToList(), true);`
	`81`	`+ WriteObject(response.Body.Select(scope => PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(scope)).ToList(), true);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`	`else if (ParameterSetName.Equals(ByResourceNameParameterSet) \|\| ParameterSetName.Equals(ResourceId))`
`@@ -95,7 +94,7 @@ protected override void ProcessRecordInternal()`
`95`	`94`	`.PrivateLinkScopes`
`96`	`95`	`.GetWithHttpMessagesAsync(this.ResourceGroupName, this.Name)`
`97`	`96`	`.Result;`
`98`		`- WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScope>(response.Body));`
	`97`	`+ WriteObject(PSMonitorPrivateLinkScope.ToPSMonitorPrivateLinkScope(response.Body));`
`99`	`98`	`}`
`100`	`99`	`}`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`using Microsoft.Azure.Commands.Insights.OutputClasses;`
`17`	`17`	`using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;`
`18`	`18`	`using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`19`		`-using Microsoft.Azure.Commands.Insights.Utils;`
`20`	`19`	`using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;`
`21`	`20`	`using System.Linq;`
`22`	`21`
`@@ -98,15 +97,15 @@ protected override void ProcessRecordInternal()`
`98`	`97`	`.PrivateLinkScopedResources`
`99`	`98`	`.ListByPrivateLinkScopeWithHttpMessagesAsync(this.ResourceGroupName, this.ScopeName)`
`100`	`99`	`.Result;`
`101`		`- WriteObject(response.Body.Select(scope => PSMapper.Instance.Map<PSMonitorPrivateLinkScopedResource>(scope)).ToList(), true);`
	`100`	`+ WriteObject(response.Body.Select(scope => PSMonitorPrivateLinkScopedResource.ToPSMonitorPrivateLinkScopedResource(scope)).ToList(), true);`
`102`	`101`	`}`
`103`	`102`	`else if (this.IsParameterBound(c => c.Name))`
`104`	`103`	`{`
`105`	`104`	`var response = this.MonitorManagementClient`
`106`	`105`	`.PrivateLinkScopedResources`
`107`	`106`	`.GetWithHttpMessagesAsync(this.ResourceGroupName, this.ScopeName, this.Name)`
`108`	`107`	`.Result;`
`109`		`- WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScopedResource>(response.Body));`
	`108`	`+ WriteObject(PSMonitorPrivateLinkScopedResource.ToPSMonitorPrivateLinkScopedResource(response.Body));`
`110`	`109`	`}`
`111`	`110`	`}`
`112`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`using System.Management.Automation;`
`16`	`16`	`using Microsoft.Azure.Commands.Insights.OutputClasses;`
`17`	`17`	`using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`18`		`-using Microsoft.Azure.Commands.Insights.Utils;`
`19`	`18`	`using Microsoft.Azure.Management.Monitor.Models;`
`20`	`19`
`21`	`20`	`namespace Microsoft.Azure.Commands.Insights.PrivateLinkScopes`
`@@ -56,7 +55,7 @@ protected override void ProcessRecordInternal()`
`56`	`55`	`.PrivateLinkScopedResources`
`57`	`56`	`.CreateOrUpdateWithHttpMessagesAsync(this.ResourceGroupName, this.ScopeName, this.Name, this.LinkedResourceId)`
`58`	`57`	`.Result;`
`59`		`- WriteObject(PSMapper.Instance.Map<PSMonitorPrivateLinkScopedResource>(response.Body));`
	`58`	`+ WriteObject(PSMonitorPrivateLinkScopedResource.ToPSMonitorPrivateLinkScopedResource(response.Body));`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`