From e7192804949d0434b0eb321b45fd04ba7ad7cd56 Mon Sep 17 00:00:00 2001 From: Caio Saldanha Date: Sat, 5 Oct 2024 01:23:36 -0700 Subject: [PATCH 1/3] [DocumentIntelligence] Default authentication to Token Credential --- .../Azure.AI.DocumentIntelligence/assets.json | 2 +- ...telligenceAdministrationClientLiveTests.cs | 5 ++--- .../DocumentIntelligenceClientLiveTests.cs | 5 ++--- .../DocumentIntelligenceLiveTestBase.cs | 20 +++++++++---------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json index a44682a71766..82a37d28ea5c 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/documentintelligence/Azure.AI.DocumentIntelligence", - "Tag": "net/documentintelligence/Azure.AI.DocumentIntelligence_76280009cf" + "Tag": "net/documentintelligence/Azure.AI.DocumentIntelligence_ac9b1a968f" } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs index e71a0d1ab3b8..0960675610c0 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceAdministrationClient/DocumentIntelligenceAdministrationClientLiveTests.cs @@ -15,10 +15,9 @@ public DocumentIntelligenceAdministrationClientLiveTests(bool isAsync) } [RecordedTest] - [Ignore("https://github.com/Azure/azure-sdk-for-net/issues/40054")] - public async Task DocumentIntelligenceAdministrationClientCanAuthenticateWithTokenCredential() + public async Task DocumentIntelligenceAdministrationClientCanAuthenticateWithApiKey() { - var client = CreateDocumentIntelligenceAdministrationClient(useTokenCredential: true); + var client = CreateDocumentIntelligenceAdministrationClient(useApiKey: true); Response response = await client.GetResourceInfoAsync(); Response rawResponse = response.GetRawResponse(); diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs index 076bd30d577a..06e2824b41f3 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/DocumentIntelligenceClient/DocumentIntelligenceClientLiveTests.cs @@ -15,10 +15,9 @@ public DocumentIntelligenceClientLiveTests(bool isAsync) } [RecordedTest] - [Ignore("https://github.com/Azure/azure-sdk-for-net/issues/40054")] - public async Task DocumentIntelligenceClientCanAuthenticateWithTokenCredential() + public async Task DocumentIntelligenceClientCanAuthenticateWithApiKey() { - var client = CreateDocumentIntelligenceClient(useTokenCredential: true); + var client = CreateDocumentIntelligenceClient(useApiKey: true); var content = new AnalyzeDocumentContent() { diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs index 2ba694f3ccaf..5e15593536d3 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceLiveTestBase.cs @@ -21,41 +21,41 @@ public DocumentIntelligenceLiveTestBase(bool isAsync, RecordedTestMode? mode = n protected string ServiceVersionString { get; } = "2024-07-31-preview"; - protected DocumentIntelligenceClient CreateDocumentIntelligenceClient(bool useTokenCredential = false) + protected DocumentIntelligenceClient CreateDocumentIntelligenceClient(bool useApiKey = false) { var endpoint = new Uri(TestEnvironment.Endpoint); var options = InstrumentClientOptions(new DocumentIntelligenceClientOptions()); DocumentIntelligenceClient nonInstrumentedClient; - if (useTokenCredential) + if (useApiKey) { - nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, TestEnvironment.Credential, options); + var credential = new AzureKeyCredential(TestEnvironment.ApiKey); + nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, credential, options); } else { - var credential = new AzureKeyCredential(TestEnvironment.ApiKey); - nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, credential, options); + nonInstrumentedClient = new DocumentIntelligenceClient(endpoint, TestEnvironment.Credential, options); } return InstrumentClient(nonInstrumentedClient); } - protected DocumentIntelligenceAdministrationClient CreateDocumentIntelligenceAdministrationClient(bool useTokenCredential = false) + protected DocumentIntelligenceAdministrationClient CreateDocumentIntelligenceAdministrationClient(bool useApiKey = false) { var endpoint = new Uri(TestEnvironment.Endpoint); var options = InstrumentClientOptions(new DocumentIntelligenceClientOptions()); DocumentIntelligenceAdministrationClient nonInstrumentedClient; - if (useTokenCredential) + if (useApiKey) { - nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, TestEnvironment.Credential, options); + var credential = new AzureKeyCredential(TestEnvironment.ApiKey); + nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, credential, options); } else { - var credential = new AzureKeyCredential(TestEnvironment.ApiKey); - nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, credential, options); + nonInstrumentedClient = new DocumentIntelligenceAdministrationClient(endpoint, TestEnvironment.Credential, options); } return InstrumentClient(nonInstrumentedClient); From fc9b57356ff4999f6240a66ec26601305dadb54d Mon Sep 17 00:00:00 2001 From: Caio Saldanha Date: Mon, 14 Oct 2024 12:02:11 -0700 Subject: [PATCH 2/3] Updating samples as well --- .../MigrationGuide.md | 8 +++--- .../Azure.AI.DocumentIntelligence/README.md | 4 +-- .../samples/Sample_AddOnCapabilities.md | 3 +-- .../Sample_AnalyzeWithPrebuiltModel.md | 3 +-- .../samples/Sample_BuildCustomModel.md | 3 +-- .../samples/Sample_BuildDocumentClassifier.md | 3 +-- .../samples/Sample_ClassifyDocument.md | 3 +-- .../samples/Sample_CopyCustomModel.md | 6 ++--- .../samples/Sample_ExtractLayout.md | 3 +-- .../samples/Sample_ExtractLayoutAsMarkdown.md | 3 +-- .../samples/Sample_GetAndListOperations.md | 3 +-- .../samples/Sample_ManageModels.md | 3 +-- .../samples/Sample_ModelCompose.md | 3 +-- .../DocumentIntelligenceTestEnvironment.cs | 7 ++--- .../samples/DocumentIntelligenceSamples.cs | 2 +- ...ampleAnalyzeWithPrebuiltModelWithBase64.cs | 4 +-- .../tests/samples/SampleSnippets.cs | 26 +++++++------------ .../Sample_AnalyzeWithAddOnCapabilities.cs | 16 +++++------- .../Sample_AnalyzeWithPrebuiltModelFromUri.cs | 4 +-- .../samples/Sample_BuildCustomModelAsync.cs | 4 +-- .../Sample_BuildDocumentClassifierAsync.cs | 4 +-- .../Sample_ClassifyDocumentFromUriAsync.cs | 6 ++--- .../tests/samples/Sample_ComposeModelAsync.cs | 5 ++-- .../tests/samples/Sample_CopyModelToAsync.cs | 9 +++---- .../Sample_ExtractLayoutAsMarkdownAsync.cs | 4 +-- .../Sample_ExtractLayoutFromUriAsync.cs | 3 ++- .../Sample_GetAndListOperationsAsync.cs | 4 +-- .../tests/samples/Sample_ManageModelsAsync.cs | 4 +-- 28 files changed, 62 insertions(+), 88 deletions(-) diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md index 5fb053949d8b..7b3f614f2431 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/MigrationGuide.md @@ -65,8 +65,7 @@ We continue to support API key and AAD authentication methods when creating the Creating new clients in `Azure.AI.FormRecognizer`: ```C# string endpoint = ""; -string apiKey = ""; -var credential = new AzureKeyCredential(apiKey); +var credential = new DefaultAzureCredential(); var documentAnalysisClient = new DocumentAnalysisClient(new Uri(endpoint), credential); var documentModelAdministrationClient = new DocumentModelAdministrationClient(new Uri(endpoint), credential); @@ -75,8 +74,7 @@ var documentModelAdministrationClient = new DocumentModelAdministrationClient(ne Creating new clients in `Azure.AI.DocumentIntelligence`: ```C# Snippet:Migration_CreateBothDocumentIntelligenceClients string endpoint = ""; -string apiKey = ""; -var credential = new AzureKeyCredential(apiKey); +var credential = new DefaultAzureCredential(); var documentIntelligenceClient = new DocumentIntelligenceClient(new Uri(endpoint), credential); var documentIntelligenceAdministrationClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); @@ -352,7 +350,7 @@ Differences between the versions: Building a document model with `Azure.AI.FormRecognizer`: ```C# Uri blobContainerUri = new Uri(""); -var client = new DocumentModelAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentModelAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); BuildDocumentModelOperation operation = await client.BuildDocumentModelAsync(WaitUntil.Completed, blobContainerUri, DocumentBuildMode.Template); DocumentModelDetails model = operation.Value; diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md index c3b3afa841d7..086ee7d4fbb7 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md @@ -97,7 +97,7 @@ az cognitiveservices account keys list --name "" --resource-group Once you have the value for the API key, create an `AzureKeyCredential`. With the endpoint and key credential, you can create the [`DocumentIntelligenceClient`][doc_intelligence_client_class]: -```C# Snippet:CreateDocumentIntelligenceClient +```C# Snippet:CreateDocumentIntelligenceClientApiKey string endpoint = ""; string apiKey = ""; var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); @@ -117,7 +117,7 @@ You will also need to [register a new AAD application][register_aad_app] and [gr Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET. -```C# Snippet:CreateDocumentIntelligenceClientTokenCredential +```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); ``` diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md index a794fc8daeb8..a20ff115f22c 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md @@ -14,8 +14,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## High resolution extraction diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md index 569c0572800a..2c9afa5582ea 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Use a prebuilt model to analyze a document from a URI diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md index 5d9de4d43513..97748b4a9ef9 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md @@ -14,8 +14,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Build a custom model diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md index 662516c84cd6..ac79e3216283 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md @@ -14,8 +14,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Build a document classifier diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md index 4622f4127021..ef41d9e4f612 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Classify a document from a URI diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md index 1f4f186a5ae0..a0f2e0bd8797 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md @@ -26,8 +26,7 @@ The source client that contains the custom model to copy. ```C# Snippet:DocumentIntelligenceSampleCreateCopySourceClient string sourceEndpoint = ""; -string sourceApiKey = ""; -var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new AzureKeyCredential(sourceApiKey)); +var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new DefaultAzureCredential()); ``` ### Target client @@ -36,8 +35,7 @@ The target client to copy the custom model to. ```C# Snippet:DocumentIntelligenceSampleCreateCopyTargetClient string targetEndpoint = ""; -string targetApiKey = ""; -var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new AzureKeyCredential(targetApiKey)); +var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new DefaultAzureCredential()); ``` ### Authorize the copy diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md index 6c3c32580ee9..b2f20ba2bf71 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Extract the layout of a document from a URI diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md index 727a90dcc29e..8556a6817534 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Extract the layout of a document as Markdown diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md index de3ee51532b3..4d8c249e62dd 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Get and List Document Model Operations diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md index 26794bb45373..bdec51ec116e 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Model administration operations diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md index c42f0f450f1b..a08ad30fd9f6 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md @@ -12,8 +12,7 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -string apiKey = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); ``` ## Compose a model diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs index 43ccbde453d6..88872f260da7 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/Infrastructure/DocumentIntelligenceTestEnvironment.cs @@ -6,6 +6,7 @@ using System.Reflection; using System.Threading.Tasks; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Tests { @@ -56,12 +57,12 @@ public static BinaryData CreateBinaryData(string filename) protected override async ValueTask IsEnvironmentReadyAsync() { var endpoint = new Uri(Endpoint); - var keyCredential = new AzureKeyCredential(ApiKey); - var keyCredentialClient = new DocumentIntelligenceAdministrationClient(endpoint, keyCredential); + var credential = Credential; + var client = new DocumentIntelligenceAdministrationClient(endpoint, credential); try { - await keyCredentialClient.GetResourceInfoAsync(); + await client.GetResourceInfoAsync(); } catch (RequestFailedException e) when (e.Status == 401) { diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs index fdc69eaf66a2..5971d426eba8 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/DocumentIntelligenceSamples.cs @@ -10,7 +10,7 @@ namespace Azure.AI.DocumentIntelligence.Samples [AsyncOnly] // Ensure that each sample will only run once. public partial class DocumentIntelligenceSamples : RecordedTestBase { - public DocumentIntelligenceSamples(bool isAsync) : base(isAsync, RecordedTestMode.Live) + public DocumentIntelligenceSamples(bool isAsync) : base(isAsync) { } } diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs index 9f63f918ca62..41e97b1a632b 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -16,8 +17,7 @@ public partial class DocumentIntelligenceSamples public async Task AnalyzeWithPrebuiltModelWithBase64Async() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceAnalyzeWithPrebuiltModelWithBase64Async #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs index bc30d5782226..27b4b18ad13a 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs @@ -18,25 +18,25 @@ public void CreateDocumentIntelligenceClient() #region Snippet:CreateDocumentIntelligenceClient #if SNIPPET string endpoint = ""; - string apiKey = ""; #else string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; #endif - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #endregion } [RecordedTest] - public void CreateDocumentIntelligenceClientTokenCredential() + public void CreateDocumentIntelligenceClientApiKey() { - #region Snippet:CreateDocumentIntelligenceClientTokenCredential + #region Snippet:CreateDocumentIntelligenceClientApiKey #if SNIPPET string endpoint = ""; + string apiKey = ""; #else string endpoint = TestEnvironment.Endpoint; + string apiKey = TestEnvironment.ApiKey; #endif - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); #endregion } @@ -46,12 +46,10 @@ public void CreateDocumentIntelligenceAdministrationClient() #region Snippet:CreateDocumentIntelligenceAdministrationClient #if SNIPPET string endpoint = ""; - string apiKey = ""; #else string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; #endif - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); #endregion } @@ -61,12 +59,10 @@ public void CreateBothDocumentIntelligenceClients() #region Snippet:Migration_CreateBothDocumentIntelligenceClients #if SNIPPET string endpoint = ""; - string apiKey = ""; #else string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; #endif - var credential = new AzureKeyCredential(apiKey); + var credential = new DefaultAzureCredential(); var documentIntelligenceClient = new DocumentIntelligenceClient(new Uri(endpoint), credential); var documentIntelligenceAdministrationClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); @@ -77,8 +73,7 @@ public void CreateBothDocumentIntelligenceClients() public async Task BadRequestSnippet() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceBadRequest var content = new AnalyzeDocumentContent() @@ -101,8 +96,7 @@ public async Task BadRequestSnippet() public async Task GetWordsSnippet() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:Migration_DocumentIntelligenceGetWordsUsage #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs index 169bf3f768bc..679f80a3980a 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -16,8 +17,7 @@ public partial class DocumentIntelligenceSamples public async Task AnalyzeWithFormulaExtraction() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleFormulaExtraction #if SNIPPET @@ -65,8 +65,7 @@ public async Task AnalyzeWithFormulaExtraction() public async Task AnalyzeWithFontStyling() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleFontStyling #if SNIPPET @@ -229,8 +228,7 @@ public async Task AnalyzeWithFontStyling() public async Task AnalyzeWithBarcodeExtraction() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleBarcodeExtraction #if SNIPPET @@ -280,8 +278,7 @@ public async Task AnalyzeWithBarcodeExtraction() public async Task AnalyzeWithLanguageDetection() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleLanguageDetection #if SNIPPET @@ -323,8 +320,7 @@ public async Task AnalyzeWithLanguageDetection() public async Task AnalyzeWithKeyValuePairs() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleKeyValuePairsExtraction #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs index 4b2e7967194d..508e3dd077cd 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,8 +16,7 @@ public partial class DocumentIntelligenceSamples public async Task AnalyzeWithPrebuiltModelFromUriAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceAnalyzeWithPrebuiltModelFromUriAsync #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs index c23a1a9b7bb2..3544f2707320 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -14,8 +15,7 @@ public partial class DocumentIntelligenceSamples public async Task BuildCustomModelAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleBuildModel // For this sample, you can use the training documents found in the `trainingFiles` folder. diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs index a9059699e148..95688ebf7675 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -14,8 +15,7 @@ public partial class DocumentIntelligenceSamples public async Task BuildDocumentClassifierAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleBuildClassifier // For this sample, you can use the training documents found in the `classifierTrainingFiles` folder. diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs index 3cf9d721b59d..35ecf2945fb5 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,9 +16,8 @@ public partial class DocumentIntelligenceSamples public async Task ClassifyDocumentFromUriAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); - var adminClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var adminClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); string setupClassifierId = Guid.NewGuid().ToString(); Uri blobContainerUri = new Uri(TestEnvironment.ClassifierTrainingSasUrl); diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs index 5b62541c4a3d..59e144edaee1 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; -using NUnit.Framework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,8 +15,7 @@ public partial class DocumentIntelligenceSamples public async Task ComposeModelAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceSampleBuildVariousModels // For this sample, you can use the training documents found in the `trainingFiles` folder. diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs index 2da068c23ad7..0b7393eb82a0 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,12 +16,10 @@ public async Task CopyModelToAsync() #region Snippet:DocumentIntelligenceSampleCreateCopySourceClient #if SNIPPET string sourceEndpoint = ""; - string sourceApiKey = ""; #else string sourceEndpoint = TestEnvironment.Endpoint; - string sourceApiKey = TestEnvironment.ApiKey; #endif - var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new AzureKeyCredential(sourceApiKey)); + var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new DefaultAzureCredential()); #endregion // For the purpose of this sample, we are going to create a model to copy. Note that @@ -38,12 +37,10 @@ public async Task CopyModelToAsync() #region Snippet:DocumentIntelligenceSampleCreateCopyTargetClient #if SNIPPET string targetEndpoint = ""; - string targetApiKey = ""; #else string targetEndpoint = TestEnvironment.Endpoint; - string targetApiKey = TestEnvironment.ApiKey; #endif - var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new AzureKeyCredential(targetApiKey)); + var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new DefaultAzureCredential()); #endregion #region Snippet:DocumentIntelligenceSampleGetCopyAuthorization diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs index 447538501ea3..1d51c065ec57 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -14,8 +15,7 @@ public partial class DocumentIntelligenceSamples public async Task ExtractLayoutAsMarkdownAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceExtractLayoutAsMarkdownAsync #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs index 14296a51c55a..1d715a506180 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,7 +16,7 @@ public async Task ExtractLayoutFromUriAsync() { string endpoint = TestEnvironment.Endpoint; string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); #region Snippet:DocumentIntelligenceExtractLayoutFromUriAsync #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs index cb5964474abf..b63419ef61a9 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -13,8 +14,7 @@ public partial class DocumentIntelligenceSamples public async Task GetAndListOperationsAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); // Build a custom model to make sure that there is at least one operation. string modelId = Guid.NewGuid().ToString(); diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs index d4dc678953a8..7878b34d31c7 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using Azure.Core.TestFramework; +using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -13,8 +14,7 @@ public partial class DocumentIntelligenceSamples public async Task ManageModelsAsync() { string endpoint = TestEnvironment.Endpoint; - string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new AzureKeyCredential(apiKey)); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); // Build to make sure that there is at least one custom model. string setupModelId = Guid.NewGuid().ToString(); From ae4bf9a2a69ec3d366a2459f61bb53bf9bbf93b4 Mon Sep 17 00:00:00 2001 From: Caio Saldanha Date: Mon, 14 Oct 2024 12:55:54 -0700 Subject: [PATCH 3/3] Using TestEnvironment.Credential instead --- .../Azure.AI.DocumentIntelligence/README.md | 3 ++- .../samples/Sample_AddOnCapabilities.md | 3 ++- .../samples/Sample_AnalyzeWithPrebuiltModel.md | 3 ++- .../samples/Sample_BuildCustomModel.md | 3 ++- .../samples/Sample_BuildDocumentClassifier.md | 3 ++- .../samples/Sample_ClassifyDocument.md | 3 ++- .../samples/Sample_CopyCustomModel.md | 6 ++++-- .../samples/Sample_ExtractLayout.md | 3 ++- .../samples/Sample_ExtractLayoutAsMarkdown.md | 3 ++- .../samples/Sample_GetAndListOperations.md | 3 ++- .../samples/Sample_ManageModels.md | 3 ++- .../samples/Sample_ModelCompose.md | 3 ++- .../SampleAnalyzeWithPrebuiltModelWithBase64.cs | 3 +-- .../tests/samples/SampleSnippets.cs | 15 ++++++++++----- .../Sample_AnalyzeWithAddOnCapabilities.cs | 11 +++++------ .../Sample_AnalyzeWithPrebuiltModelFromUri.cs | 3 +-- .../tests/samples/Sample_BuildCustomModelAsync.cs | 3 +-- .../Sample_BuildDocumentClassifierAsync.cs | 3 +-- .../Sample_ClassifyDocumentFromUriAsync.cs | 5 ++--- .../tests/samples/Sample_ComposeModelAsync.cs | 3 +-- .../tests/samples/Sample_CopyModelToAsync.cs | 8 ++++++-- .../Sample_ExtractLayoutAsMarkdownAsync.cs | 3 +-- .../samples/Sample_ExtractLayoutFromUriAsync.cs | 3 +-- .../samples/Sample_GetAndListOperationsAsync.cs | 3 +-- .../tests/samples/Sample_ManageModelsAsync.cs | 3 +-- 25 files changed, 58 insertions(+), 47 deletions(-) diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md index 086ee7d4fbb7..a37e5d5aa240 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/README.md @@ -119,7 +119,8 @@ Set the values of the client ID, tenant ID, and client secret of the AAD applica ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); ``` ## Key concepts diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md index a20ff115f22c..05821f5b86f3 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AddOnCapabilities.md @@ -14,7 +14,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); ``` ## High resolution extraction diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md index 2c9afa5582ea..192bbf5273e4 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_AnalyzeWithPrebuiltModel.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); ``` ## Use a prebuilt model to analyze a document from a URI diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md index 97748b4a9ef9..a902cd6a55f5 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildCustomModel.md @@ -14,7 +14,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); ``` ## Build a custom model diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md index ac79e3216283..4486d3a2a3b2 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_BuildDocumentClassifier.md @@ -14,7 +14,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); ``` ## Build a document classifier diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md index ef41d9e4f612..6bcf6bfa4c7a 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ClassifyDocument.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); ``` ## Classify a document from a URI diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md index a0f2e0bd8797..a09ad62aa5d4 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_CopyCustomModel.md @@ -26,7 +26,8 @@ The source client that contains the custom model to copy. ```C# Snippet:DocumentIntelligenceSampleCreateCopySourceClient string sourceEndpoint = ""; -var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new DefaultAzureCredential()); +var sourceResourceCredential = new DefaultAzureCredential(); +var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), sourceResourceCredential); ``` ### Target client @@ -35,7 +36,8 @@ The target client to copy the custom model to. ```C# Snippet:DocumentIntelligenceSampleCreateCopyTargetClient string targetEndpoint = ""; -var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new DefaultAzureCredential()); +var targetResourceCredential = new DefaultAzureCredential(); +var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), targetResourceCredential); ``` ### Authorize the copy diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md index b2f20ba2bf71..2d1b1f5f04d2 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); ``` ## Extract the layout of a document from a URI diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md index 8556a6817534..0dd816583ebe 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayoutAsMarkdown.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceClient string endpoint = ""; -var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); ``` ## Extract the layout of a document as Markdown diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md index 4d8c249e62dd..4f261237cf1e 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_GetAndListOperations.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); ``` ## Get and List Document Model Operations diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md index bdec51ec116e..d29f14b500a8 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ManageModels.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); ``` ## Model administration operations diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md index a08ad30fd9f6..c3796d2b90cd 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ModelCompose.md @@ -12,7 +12,8 @@ You can set `endpoint` and `apiKey` based on an environment variable, a configur ```C# Snippet:CreateDocumentIntelligenceAdministrationClient string endpoint = ""; -var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); +var credential = new DefaultAzureCredential(); +var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); ``` ## Compose a model diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs index 41e97b1a632b..15da927b6f89 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleAnalyzeWithPrebuiltModelWithBase64.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -17,7 +16,7 @@ public partial class DocumentIntelligenceSamples public async Task AnalyzeWithPrebuiltModelWithBase64Async() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceAnalyzeWithPrebuiltModelWithBase64Async #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs index 27b4b18ad13a..d166e87293ed 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/SampleSnippets.cs @@ -18,10 +18,12 @@ public void CreateDocumentIntelligenceClient() #region Snippet:CreateDocumentIntelligenceClient #if SNIPPET string endpoint = ""; + var credential = new DefaultAzureCredential(); #else string endpoint = TestEnvironment.Endpoint; + var credential = TestEnvironment.Credential; #endif - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), credential); #endregion } @@ -46,10 +48,12 @@ public void CreateDocumentIntelligenceAdministrationClient() #region Snippet:CreateDocumentIntelligenceAdministrationClient #if SNIPPET string endpoint = ""; + var credential = new DefaultAzureCredential(); #else string endpoint = TestEnvironment.Endpoint; + var credential = TestEnvironment.Credential; #endif - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); #endregion } @@ -59,10 +63,11 @@ public void CreateBothDocumentIntelligenceClients() #region Snippet:Migration_CreateBothDocumentIntelligenceClients #if SNIPPET string endpoint = ""; + var credential = new DefaultAzureCredential(); #else string endpoint = TestEnvironment.Endpoint; + var credential = TestEnvironment.Credential; #endif - var credential = new DefaultAzureCredential(); var documentIntelligenceClient = new DocumentIntelligenceClient(new Uri(endpoint), credential); var documentIntelligenceAdministrationClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), credential); @@ -73,7 +78,7 @@ public void CreateBothDocumentIntelligenceClients() public async Task BadRequestSnippet() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceBadRequest var content = new AnalyzeDocumentContent() @@ -96,7 +101,7 @@ public async Task BadRequestSnippet() public async Task GetWordsSnippet() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:Migration_DocumentIntelligenceGetWordsUsage #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs index 679f80a3980a..3dd5cc8ba013 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithAddOnCapabilities.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -17,7 +16,7 @@ public partial class DocumentIntelligenceSamples public async Task AnalyzeWithFormulaExtraction() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleFormulaExtraction #if SNIPPET @@ -65,7 +64,7 @@ public async Task AnalyzeWithFormulaExtraction() public async Task AnalyzeWithFontStyling() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleFontStyling #if SNIPPET @@ -228,7 +227,7 @@ public async Task AnalyzeWithFontStyling() public async Task AnalyzeWithBarcodeExtraction() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleBarcodeExtraction #if SNIPPET @@ -278,7 +277,7 @@ public async Task AnalyzeWithBarcodeExtraction() public async Task AnalyzeWithLanguageDetection() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleLanguageDetection #if SNIPPET @@ -320,7 +319,7 @@ public async Task AnalyzeWithLanguageDetection() public async Task AnalyzeWithKeyValuePairs() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleKeyValuePairsExtraction #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs index 508e3dd077cd..9c7538a11187 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_AnalyzeWithPrebuiltModelFromUri.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -16,7 +15,7 @@ public partial class DocumentIntelligenceSamples public async Task AnalyzeWithPrebuiltModelFromUriAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceAnalyzeWithPrebuiltModelFromUriAsync #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs index 3544f2707320..1988e301887a 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildCustomModelAsync.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,7 +14,7 @@ public partial class DocumentIntelligenceSamples public async Task BuildCustomModelAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleBuildModel // For this sample, you can use the training documents found in the `trainingFiles` folder. diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs index 95688ebf7675..55d793d53563 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_BuildDocumentClassifierAsync.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,7 +14,7 @@ public partial class DocumentIntelligenceSamples public async Task BuildDocumentClassifierAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleBuildClassifier // For this sample, you can use the training documents found in the `classifierTrainingFiles` folder. diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs index 35ecf2945fb5..77f8e090e5b0 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ClassifyDocumentFromUriAsync.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -16,8 +15,8 @@ public partial class DocumentIntelligenceSamples public async Task ClassifyDocumentFromUriAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); - var adminClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); + var adminClient = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential); string setupClassifierId = Guid.NewGuid().ToString(); Uri blobContainerUri = new Uri(TestEnvironment.ClassifierTrainingSasUrl); diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs index 59e144edaee1..245798e26acd 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ComposeModelAsync.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,7 +14,7 @@ public partial class DocumentIntelligenceSamples public async Task ComposeModelAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceSampleBuildVariousModels // For this sample, you can use the training documents found in the `trainingFiles` folder. diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs index 0b7393eb82a0..eef61ad2e2f3 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_CopyModelToAsync.cs @@ -16,10 +16,12 @@ public async Task CopyModelToAsync() #region Snippet:DocumentIntelligenceSampleCreateCopySourceClient #if SNIPPET string sourceEndpoint = ""; + var sourceResourceCredential = new DefaultAzureCredential(); #else string sourceEndpoint = TestEnvironment.Endpoint; + var sourceResourceCredential = TestEnvironment.Credential; #endif - var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), new DefaultAzureCredential()); + var sourceClient = new DocumentIntelligenceAdministrationClient(new Uri(sourceEndpoint), sourceResourceCredential); #endregion // For the purpose of this sample, we are going to create a model to copy. Note that @@ -37,10 +39,12 @@ public async Task CopyModelToAsync() #region Snippet:DocumentIntelligenceSampleCreateCopyTargetClient #if SNIPPET string targetEndpoint = ""; + var targetResourceCredential = new DefaultAzureCredential(); #else string targetEndpoint = TestEnvironment.Endpoint; + var targetResourceCredential = TestEnvironment.Credential; #endif - var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), new DefaultAzureCredential()); + var targetClient = new DocumentIntelligenceAdministrationClient(new Uri(targetEndpoint), targetResourceCredential); #endregion #region Snippet:DocumentIntelligenceSampleGetCopyAuthorization diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs index 1d51c065ec57..d55a20f520d4 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutAsMarkdownAsync.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -15,7 +14,7 @@ public partial class DocumentIntelligenceSamples public async Task ExtractLayoutAsMarkdownAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceExtractLayoutAsMarkdownAsync #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs index 1d715a506180..e0f2c50c906e 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ExtractLayoutFromUriAsync.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Azure.AI.DocumentIntelligence.Tests; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -16,7 +15,7 @@ public async Task ExtractLayoutFromUriAsync() { string endpoint = TestEnvironment.Endpoint; string apiKey = TestEnvironment.ApiKey; - var client = new DocumentIntelligenceClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceClient(new Uri(endpoint), TestEnvironment.Credential); #region Snippet:DocumentIntelligenceExtractLayoutFromUriAsync #if SNIPPET diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs index b63419ef61a9..0b70ff07dfb8 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_GetAndListOperationsAsync.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -14,7 +13,7 @@ public partial class DocumentIntelligenceSamples public async Task GetAndListOperationsAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential); // Build a custom model to make sure that there is at least one operation. string modelId = Guid.NewGuid().ToString(); diff --git a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs index 7878b34d31c7..e5c84bf6d705 100644 --- a/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs +++ b/sdk/documentintelligence/Azure.AI.DocumentIntelligence/tests/samples/Sample_ManageModelsAsync.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.Identity; namespace Azure.AI.DocumentIntelligence.Samples { @@ -14,7 +13,7 @@ public partial class DocumentIntelligenceSamples public async Task ManageModelsAsync() { string endpoint = TestEnvironment.Endpoint; - var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), new DefaultAzureCredential()); + var client = new DocumentIntelligenceAdministrationClient(new Uri(endpoint), TestEnvironment.Credential); // Build to make sure that there is at least one custom model. string setupModelId = Guid.NewGuid().ToString();