Solved merge failures

Author: MikhailTryakhov

src/Network/Network.Test/ScenarioTests/CortexTests.cs

@@ -109,7 +109,7 @@ public void TestBgpSettingsUpdateVpnGateway()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestCortexVirtualHubCRUD()
         {
             TestRunner.RunTestScript("Test-CortexVirtualHubCRUD");

src/Network/Network.Test/ScenarioTests/NetworkVirtualApplianceTests.cs

@@ -27,15 +27,15 @@ public NetworkVirtualApplianceTests(Xunit.Abstractions.ITestOutputHelper output)
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.nvaengdev)]
+        [Trait(Category.Owner, NrpTeamAlias.nvadev)]
         public void TestNetworkVirtualApplianceCRUD()
         {
             TestRunner.RunTestScript(string.Format("Test-NetworkVirtualApplianceCRUD"));
         }
 
         [Fact(Skip = "A bug is being fixed by Nfv-Rp team")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.nvaengdev)]
+        [Trait(Category.Owner, NrpTeamAlias.nvadev)]
         public void TestVirtualApplianceSiteCRUD()
         {
             TestRunner.RunTestScript("Test-VirtualApplianceSiteCRUD");

src/Network/Network.Test/ScenarioTests/RouteServerTests.cs

@@ -13,23 +13,23 @@ public RouteServerTests(Xunit.Abstractions.ITestOutputHelper output)
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestRouteServerCRUD()
         {
             TestRunner.RunTestScript(string.Format("Test-RouteServerCRUD"));
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestRouteServerPeerCRUD()
         {
             TestRunner.RunTestScript(string.Format("Test-RouteServerPeerCRUD"));
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestRouteServerPeerRoutes()
         {
             TestRunner.RunTestScript(string.Format("Test-RouteServerPeerRoutes"));

src/Network/Network.Test/ScenarioTests/VirtualHubRouteTableTests.cs

@@ -29,7 +29,7 @@ public VirtualHubRouteTableTests(ITestOutputHelper output)
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestVirtualHubRouteTableCRUD()
         {
             TestRunner.RunTestScript("Test-VirtualHubRouteTableCRUD");

src/Network/Network.Test/ScenarioTests/VirtualRouterTests.cs

@@ -27,23 +27,23 @@ public VirtualRouterTests(Xunit.Abstractions.ITestOutputHelper output)
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestVirtualRouterCRUDMinimalParameters()
         {
             TestRunner.RunTestScript(string.Format("Test-VirtualRouterCRUD"));
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestVirtualRouterPeerCRUD()
         {
             TestRunner.RunTestScript(string.Format("Test-VirtualRouterPeerCRUD"));
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.exrdev)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
         public void TestVirtualRouterPeerRoutes()
         {
             TestRunner.RunTestScript(string.Format("Test-VirtualRouterPeerRoutes"));

src/Resources/LiveTests/TestLiveScenarios.ps1

@@ -0,0 +1,113 @@
+Invoke-LiveTestScenario -Name "Test Application" -Description "Test the process of create an application." -NoResourceGroup -ScenarioScript `
+{
+    try {
+        $today = (Get-Date).tostring('yyyy-MM-dd')
+        $appName1 = $today + 'testapp' + (New-LiveTestRandomName)
+        $replyUrl1 = 'https://' + $appName1 + '-reply.com'
+        $homePage1 = 'https://' + $appName1 + '-home.com'
+    
+        $appName2 = $today + 'testapp' + (New-LiveTestRandomName)
+        $replyUrl2 = 'https://' + $appName2 + '-reply.com'
+        $homePage2 = 'https://' + $appName2 + '-home.com'
+    
+        $spName1 = $today + 'testsp' + (New-LiveTestRandomName)
+        $spName2 = $today + 'testsp' + (New-LiveTestRandomName)
+    
+        $app1 = New-AzADApplication -DisplayName $appName1 -ReplyUrls $replyUrl1 -HomePage $homePage1 -AvailableToOtherTenants $true -StartDate (Get-Date)
+        $app1 = Get-AzADApplication -DisplayName $appName1
+        Assert-NotNullOrEmpty $app1
+        Assert-AreEqual $replyUrl1 $app1.Web.RedirectUri
+        Assert-AreEqual $homepage1 $app1.Web.HomePageUrl
+        Assert-AreEqual 'AzureADMultipleOrgs' $app1.SignInAudience
+    
+        Assert-AreEqual $app1.Id (Get-AzADApplication -ObjectId $app1.id -Select Id).Id
+        Assert-AreEqual $app1.Id (Get-AzADApplication -ApplicationId $app1.AppId -Select Id).Id
+    
+        $app1Update = Update-AzADApplication -ObjectId $app1.Id -ReplyUrl $replyUrl2 -HomePage $homepage2 -AvailableToOtherTenants $false
+        $app1Update = Get-AzADApplication -DisplayName $appName1
+
+        Assert-AreEqual $replyUrl2 $app1Update.Web.RedirectUri
+        Assert-AreEqual $homepage2 $app1Update.Web.HomePageUrl
+        Assert-AreEqual 'AzureADMyOrg' $app1Update.SignInAudience
+        Assert-NotNullOrEmpty (Get-AzADAppCredential -ObjectId $app1.Id)
+        $pw = New-AzADAppCredential -ObjectId $app1.Id -StartDate (get-date)
+    
+        $certFile = Join-Path $PSScriptRoot 'msgraphtest2.cer'
+        $content = get-content $certFile -AsByteStream
+        $certvalue = [System.Convert]::ToBase64String($content)
+        $cert = New-AzADAppCredential -ObjectId $app1.Id -CertValue $certvalue
+    
+        Remove-AzADAppCredential -ObjectId $app1.Id -KeyId $pw.KeyId
+    
+        $sp1 = New-AzADServicePrincipal -ApplicationId $app1.AppId
+        $sp1 = Get-AzADServicePrincipal -ApplicationId $app1.AppId
+        $sp2 = New-AzADServicePrincipal -DisplayName $spName2        
+        $sp2 = Get-AzADServicePrincipal -DisplayName $spName2
+        $app2 = Get-AzADApplication -DisplayName $spName2
+    } finally {
+        if ($sp1) {
+            Remove-AzADServicePrincipal -ServicePrincipalName $sp1.ServicePrincipalName[0]
+        }
+        if ($sp2) {
+            Remove-AzADServicePrincipal -ObjectId $sp2.Id
+        }
+        if ($app1) {
+            Remove-AzADApplication -DisplayName $appName1
+        }
+        if ($app2) {
+            Remove-AzADApplication -DisplayName $spName2
+        }
+    }
+}
+
+Invoke-LiveTestScenario -Name "Test Group Member" -Description "Test the process of create groups and members." -NoResourceGroup -ScenarioScript `
+{
+    try {
+        $today = (Get-Date).tostring('yyyy-MM-dd')
+        $groupName1 = $today + 'testgroup' + (New-LiveTestRandomName)
+        $groupName2 = $today + 'testgroup' + (New-LiveTestRandomName)
+        $userName = $today + 'testuser' + (New-LiveTestRandomName)
+        
+        $groupMailNickName1 = New-LiveTestRandomName
+        $groupMailNickName2 = New-LiveTestRandomName
+        $userMailNickName = New-LiveTestRandomName
+        $userPrincipalName = $userMailNickName + 'microsoft.com#EXT#@AzureSDKTeam.onmicrosoft.com'
+
+        $group1 = New-AzADGroup -DisplayName $groupName1 -MailNickname $groupMailNickName1
+        $group1 = Get-AzADGroup -DisplayName $groupName1
+        $group2 = New-AzADGroup -DisplayName $groupName2 -MailNickname $groupMailNickName2
+        $group2 = Get-AzADGroup -DisplayName $groupName2
+
+        $password = 'A' + (New-LiveTestRandomName)
+        $password = ConvertTo-SecureString -AsPlainText -Force $password
+        $user = New-AzADUser -DisplayName $userName -Password $password -AccountEnabled $true -MailNickname $userMailNickname -UserPrincipalName $userPrincipalName
+        $user = Get-AzADUser -DisplayName $userName
+
+        Add-AzADGroupMember -TargetGroupObjectId $group1.Id -MemberObjectId $group2.Id, $user.Id
+
+        #TODO: test type of group member and properties, for example, user principal name from user
+        $members = Get-AzADGroupMember -GroupObjectId $group1.Id
+        foreach ($member in $members) {
+            switch ($member.OdataType) {
+                '#microsoft.graph.user' {
+                    Assert-AreEqual $user.Id $member.Id
+                    Remove-AzADGroupMember -GroupObjectId $group1.Id -MemberObjectId $user.Id
+                }
+                '#microsoft.graph.group' {
+                    Assert-AreEqual $group2.Id $member.Id
+                    Remove-AzADGroupMember -GroupObjectId $group1.Id -MemberObjectId $group2.Id
+                }
+            }
+        }
+    } finally {
+        if ($user) {
+            Remove-AzADUser -ObjectId $user.Id
+        }
+        if ($group2) {
+            Remove-AzADGroup -ObjectId $group2.Id
+        }
+        if ($group1) {
+            Remove-AzADGroup -ObjectId $group1.Id
+        }
+    }
+}

src/Resources/LiveTests/msgraphtest2.cer

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEGTCCAwGgAwIBAgIQJGmcQ90Ht55ojXCPEWWLQDANBgkqhkiG9w0BAQsFADBN
+MUswSQYDVQQDHkIATQBTAC0ATwByAGcAYQBuAGkAegBhAHQAaQBvAG4ALQBQADIA
+UAAtAEEAYwBjAGUAcwBzACAAWwAyADAAMgAxAF0wHhcNMjEwOTI3MDQxNTQ1WhcN
+MjEwOTI4MDQyMDQ1WjBlMTQwMgYKCZImiZPyLGQBGRYkNzJmOTg4YmYtODZmMS00
+MWFmLTkxYWItMmQ3Y2QwMTFkYjQ3MS0wKwYDVQQDDCRmZWJhNWM1Zi00MDE3LTRh
+ODQtYjhkNS1hY2FkOWEyMjVkODQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDh7ksk8f/SxuyXZkrxHOBn4fF5QSy10khH4YcYlo3BXZsIprWQF1zduqRZ
+MWGOHRxTux2WaL2AATZAdOcd5hqznRM7qpvLwFOGZvp2pxJ1zIOyuyOCFYy9sq2i
+I0r+I19M7zoc6Hxws5df2894ZsScQVC2+z3nen9b0EURF9CZ4PAraGeJwAsFG45S
+kUAw+44JMFw1v87CUGQBzQaOKq/z/xY3OrPpf2eAtcramRctZymZwlqMB/8VYQkJ
+LGaKLYiOBEtgdaPSQYA/VZ5d6huTGirvvI/85ckep0t+oqCcV6U+A/uHW0o7KS5L
+z15cDkQtrq5D513w5UuP6BY/gBkDAgMBAAGjgdwwgdkwDgYDVR0PAQH/BAQDAgWg
+MIGUBgNVHREEgYwwgYmCD0RFU0tUT1AtQTlBMVVEMoIPREVTS1RPUC1BOUExVUQy
+giUyNDA0OmY4MDE6YzAwMjo1MDo4NWE2OjY1Y2Q6MWVkOTpjMzcygiUyNDA0OmY4
+MDE6YzAwMjo1MDo3OWUxOmM2MGU6NDIxYzozMjc1ggkxMC4xNy45LjaCDDE3Mi4y
+MC4yNDAuMTATBgNVHSUEDDAKBggrBgEFBQcDATAbBgkrBgEEAYI3FQoEDjAMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAfKBnGUmj0DfFCRXlnChE3UrJ3
+Pv/Jj12GOKWWWokowY67gvvoAf1BWpyhXLNC8f7M3TMj3LDkfSgQr2zZx45TvDm4
+6hmWSVViYB4y5iYAZs6ZU8qHd1LsuvtKehRWjlokPwzoncZMY8G9N7FFs6G+X1f0
+QyMjQS6pR1B6kfvSXfc+BfI3PWKliYyiyLIkN8FsRv1leU4XFHPQxW+mR11QuUja
+gar3muui3dsRAMOYslaL+bRONWvjPuPLbCFCSExl65/CZo9TjtUUTPnksB2zQhOl
+jt9bt64s4pJoGyGDFeu1g4PJDzR2E1oqRTs2KVAptBvU5RHgky3Y1nHRdfhL
+-----END CERTIFICATE-----

src/SignalR/SignalR/ChangeLog.md

@@ -18,6 +18,11 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Breaking change:
+    - Removed `HostNamePrefix` property of output type `PSSignalRResource` of following cmdlets:
+        - `Get-AzSignalR`
+        - `New-AzSignalR`
+        - `Update-AzSignalR`
 
 ## Version 1.5.0
 * Updated to API version 2022-08-01-preview

src/SignalR/SignalR/Cmdlets/GetAzureRmSignalR.cs

@@ -18,13 +18,11 @@
 using Microsoft.Azure.Commands.SignalR.Models;
 using Microsoft.Azure.Commands.SignalR.Properties;
 using Microsoft.Azure.Management.SignalR;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.SignalR.Cmdlets
 {
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SignalR", DefaultParameterSetName = ListSignalRServiceParameterSet)]
     [OutputType(typeof(PSSignalRResource))]
-    [CmdletOutputBreakingChange(typeof(PSSignalRResource), DeprecatedOutputProperties = new String[] { nameof(PSSignalRResource.HostNamePrefix) })]
     public class GetAzureRmSignalR : SignalRCmdletBase, IWithResourceId
     {
         [Parameter(

src/SignalR/SignalR/Cmdlets/NewAzureRmSignalR.cs

@@ -12,7 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Common.Strategies;
@@ -21,14 +20,12 @@
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.SignalR;
 using Microsoft.Azure.Management.SignalR.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.SignalR.Cmdlets
 {
     [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SignalR", SupportsShouldProcess = true)]
     [OutputType(typeof(PSSignalRResource))]
-    [CmdletOutputBreakingChange(typeof(PSSignalRResource), DeprecatedOutputProperties = new String[] { nameof(PSSignalRResource.HostNamePrefix) })]
     public sealed class NewAzureRmSignalR : SignalRCmdletBase
     {
         private const string DefaultSku = "Standard_S1";