Skip to content

Commit 6ed1ed4

Browse files
Fixing test pipeline (Azure#51277)
* update samples * fixing consts * fix sample endpoint * enumerating blobs * Fixing sample async return types * Fixing upload path * import * directory separator --------- Co-authored-by: Josiah Vinson <[email protected]>
1 parent f9b329c commit 6ed1ed4

File tree

9 files changed

+21
-18
lines changed

9 files changed

+21
-18
lines changed

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample1_HelloWorld.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static void DemonstrateCredential()
2626
[Test]
2727
public void HelloWorld()
2828
{
29-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
29+
string serviceEndpoint = TestEnvironment.Endpoint;
3030
TokenCredential credential = TestEnvironment.Credential;
3131

3232
#region Snippet:AzHealthDeidSample1_HelloWorld

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample1_HelloWorldAsync.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#nullable disable
55

66
using System;
7+
using System.Threading.Tasks;
78
using Azure.Core;
89
using Azure.Core.TestFramework;
910
using Azure.Health.Deidentification.Tests;
@@ -14,9 +15,9 @@ namespace Azure.Health.Deidentification.Samples
1415
public partial class Samples_DeidentificationClient : SamplesBase<DeidentificationTestEnvironment>
1516
{
1617
[Test]
17-
public async void HelloWorldAsync()
18+
public async Task HelloWorldAsync()
1819
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
20+
string serviceEndpoint = TestEnvironment.Endpoint;
2021
TokenCredential credential = TestEnvironment.Credential;
2122

2223
#region Snippet:AzHealthDeidSample1Async_HelloWorld

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample2_CreateAndRunJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public partial class Samples_DeidentificationClient : SamplesBase<Deidentificati
1616
[Test]
1717
public void CreateAndRunJob()
1818
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
19+
string serviceEndpoint = TestEnvironment.Endpoint;
2020
TokenCredential credential = TestEnvironment.Credential;
2121

2222
DeidentificationClient client = new(

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample2_CreateAndRunJobAsync.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#nullable disable
55

66
using System;
7+
using System.Threading.Tasks;
78
using Azure.Core;
89
using Azure.Core.TestFramework;
910
using Azure.Health.Deidentification.Tests;
@@ -14,9 +15,9 @@ namespace Azure.Health.Deidentification.Samples
1415
public partial class Samples_DeidentificationClient : SamplesBase<DeidentificationTestEnvironment>
1516
{
1617
[Test]
17-
public async void CreateAndRunJobAsync()
18+
public async Task CreateAndRunJobAsync()
1819
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
20+
string serviceEndpoint = TestEnvironment.Endpoint;
2021
TokenCredential credential = TestEnvironment.Credential;
2122

2223
DeidentificationClient client = new(

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample3_ListJobs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public partial class Samples_DeidentificationClient : SamplesBase<Deidentificati
1616
[Test]
1717
public void ListJobs()
1818
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
19+
string serviceEndpoint = TestEnvironment.Endpoint;
2020
TokenCredential credential = TestEnvironment.Credential;
2121

2222
DeidentificationClient client = new(

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample3_ListJobsAsync.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#nullable disable
55

66
using System;
7+
using System.Threading.Tasks;
78
using Azure.Core;
89
using Azure.Core.TestFramework;
910
using Azure.Health.Deidentification.Tests;
@@ -14,9 +15,9 @@ namespace Azure.Health.Deidentification.Samples
1415
public partial class Samples_DeidentificationClient : SamplesBase<DeidentificationTestEnvironment>
1516
{
1617
[Test]
17-
public async void ListJobsAsync()
18+
public async Task ListJobsAsync()
1819
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
20+
string serviceEndpoint = TestEnvironment.Endpoint;
2021
TokenCredential credential = TestEnvironment.Credential;
2122

2223
DeidentificationClient client = new(

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample4_ListCompletedFiles.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public partial class Samples_DeidentificationClient : SamplesBase<Deidentificati
1616
[Test]
1717
public void ListCompletedFiles()
1818
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
19+
string serviceEndpoint = TestEnvironment.Endpoint;
2020
TokenCredential credential = TestEnvironment.Credential;
2121

2222
DeidentificationClient client = new(

sdk/healthdataaiservices/Azure.Health.Deidentification/tests/samples/Sample4_ListCompletedFilesAsync.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#nullable disable
55

66
using System;
7+
using System.Threading.Tasks;
78
using Azure.Core;
89
using Azure.Core.TestFramework;
910
using Azure.Health.Deidentification.Tests;
@@ -14,9 +15,9 @@ namespace Azure.Health.Deidentification.Samples
1415
public partial class Samples_DeidentificationClient : SamplesBase<DeidentificationTestEnvironment>
1516
{
1617
[Test]
17-
public async void ListCompletedFilesAsync()
18+
public async Task ListCompletedFilesAsync()
1819
{
19-
const string serviceEndpoint = "https://example.api.cac001.deid.azure.com";
20+
string serviceEndpoint = TestEnvironment.Endpoint;
2021
TokenCredential credential = TestEnvironment.Credential;
2122

2223
DeidentificationClient client = new(

sdk/healthdataaiservices/test-resources-post.ps1

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $storageAccountName = $DeploymentOutputs['HEALTHDATAAISERVICES_STORAGE_ACCOUNT_N
2121
$containerName = $DeploymentOutputs['HEALTHDATAAISERVICES_STORAGE_CONTAINER_NAME']
2222

2323
# Set the local folder path to upload
24-
$localFolderPath = "$PSScriptRoot\Azure.Health.Deidentification\tests\Data\example_patient_1"
24+
$localFolderPath = Join-Path $PSScriptRoot "Azure.Health.Deidentification\tests\Data\example_patient_1"
2525

2626
# Check if the connection string is present
2727
if ([string]::IsNullOrWhiteSpace($storageAccountName)) {
@@ -48,15 +48,14 @@ Start-Sleep -Seconds 30
4848
Get-AzStorageContainer -Name $containerName -Context $storageContext
4949

5050
# Upload the folder and its contents to the container
51-
# Gets last folder name + filename. example_patient_1\doctor_dictation.txt
51+
# Gets last folder name + filename. example_patient_1/doctor_dictation.txt
5252
Get-ChildItem -Path $localFolderPath -Recurse | ForEach-Object {
5353
$relativePath = $_.FullName
54-
$relativePath = $relativePath.Replace("\\", "\")
55-
$folderName = ($relativePath -split "\\")[-2] # Get only the folder name.
56-
$blobName = ($relativePath -split "\\")[-1] # Get only the file name.
54+
$folderName = Split-Path -Path (Split-Path -Path $relativePath -Parent) -Leaf
55+
$blobName = Split-Path -Path $relativePath -Leaf
5756
$destinationBlob = $blobName -replace ":", ""
5857

59-
$destinationBlob = "$folderName\$destinationBlob"
58+
$destinationBlob = "$folderName/$destinationBlob"
6059
Write-Host "Uploading file '$destinationBlob'"
6160
Set-AzStorageBlobContent -File $_.FullName -Container $containerName -Blob $destinationBlob -Context $storageContext -Force
6261
}

0 commit comments

Comments
 (0)