Skip to content

Commit 8996ca5

Browse files
authored
Support PrivateEndpoint and PublicNetworkAccess control (#11919)
1 parent c09b981 commit 8996ca5

File tree

7 files changed

+1442
-2
lines changed

7 files changed

+1442
-2
lines changed

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.1.0-preview" />
14+
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.2.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1616
</ItemGroup>
1717

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,12 @@ public void TestUserOwnedStorage()
197197
{
198198
TestController.NewInstance.RunPsTest(traceInterceptor, "Test-UserOwnedStorage");
199199
}
200+
201+
[Fact]
202+
[Trait(Category.AcceptanceType, Category.CheckIn)]
203+
public void TestPrivateEndpoint()
204+
{
205+
TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PrivateEndpoint");
206+
}
200207
}
201208
}

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.ps1

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,4 +1124,41 @@ function Test-UserOwnedStorage
11241124
# Cleanup
11251125
Clean-ResourceGroup $rgname
11261126
}
1127+
}
1128+
1129+
<#
1130+
.SYNOPSIS
1131+
Test PrivateEndpoint
1132+
#>
1133+
function Test-PrivateEndpoint
1134+
{
1135+
# Setup
1136+
$rgname = Get-CognitiveServicesManagementTestResourceName;
1137+
1138+
try
1139+
{
1140+
# Test
1141+
$accountname = 'csa' + $rgname;
1142+
$skuname = 'S0';
1143+
$accounttype = 'Face';
1144+
$loc = "Central US EUAP";
1145+
1146+
New-AzResourceGroup -Name $rgname -Location $loc;
1147+
$createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -CustomSubdomainName $accountname -Force;
1148+
Assert-NotNull $createdAccount;
1149+
Assert-AreEqual $createdAccount.PublicNetworkAccess "Enabled"
1150+
Assert-AreEqual $createdAccount.PrivateEndpointConnections $null
1151+
1152+
$vnet = Get-AzVirtualNetwork -ResourceName yydemo-vnet -ResourceGroupName yuanyang-demo
1153+
$plsConnection = New-AzPrivateLinkServiceConnection -Name pe-powershell-ut -PrivateLinkServiceId $createdAccount.Id -RequestMessage "Please Approve my request" -GroupId "account"
1154+
New-AzPrivateEndpoint -PrivateLinkServiceConnection $plsConnection -Subnet $vnet.Subnets[0] -Name pe-powershell-ut -ResourceGroupName yuanyang-demo -Location centraluseuap
1155+
1156+
$account = Get-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname
1157+
Assert-AreEqual $account.PrivateEndpointConnections.Length 1
1158+
}
1159+
finally
1160+
{
1161+
# Cleanup
1162+
Clean-ResourceGroup $rgname
1163+
}
11271164
}

0 commit comments

Comments
 (0)