Skip to content

Commit ad7ea2f

Browse files
committed
Task 41737: Merge feat/azure-split to main: Step 3 - Tie everything together
- Addressed a few final comments from the Step 2 PR.
1 parent 313e26a commit ad7ea2f

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/Microsoft.Data.SqlClient.Extensions/Abstractions/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ feature implementations via the appropriate APIs at runtime:
149149

150150
- Authentication: [SqlAuthenticationProvider](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlauthenticationprovider?view=sqlclient-dotnet-core-6.0)
151151
- Attestation: _**New API will be exposed.**_
152-
- Key Valut: [SqlColumnEncryptionKeyStoreProvider](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlcolumnencryptionkeystoreprovider?view=sqlclient-dotnet-core-6.0)
152+
- Key Vault: [SqlColumnEncryptionKeyStoreProvider](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlcolumnencryptionkeystoreprovider?view=sqlclient-dotnet-core-6.0)
153153

154154
## Versioning Strategy
155155

@@ -181,7 +181,7 @@ packages as well. Those dependent packages will then take a strict dependency
181181
on the appropriate `Abstractions` package version. This ensures that only
182182
compatible extensions package versions can co-exist with the main MDS package.
183183

184-
For example, imagine that a new extensible conenction pooling feature is added
184+
For example, imagine that a new extensible connection pooling feature is added
185185
to MDS. The `Abstractions` package would be updated to include any new pooling
186186
APIs, the main MDS package would be updated to accept extensible pooling, and
187187
the new pooling implementation would be included in a new `ConnectionPooling`
@@ -269,7 +269,7 @@ package will look for the `Azure` extension assembly and automatically load it.
269269
#### Use AKV Provider v7.0.0
270270

271271
This is a temporary solution. The AKV provider v7.0.0 will be marked as
272-
deprecated and removed entirely at some point in the future. The applictaion
272+
deprecated and removed entirely at some point in the future. The application
273273
would remain dependent on the AKV provider, but must update to the v7.0.0
274274
package. Previous AKV package versions do not support main MDS package versions
275275
beyond the v6.x range.

src/Microsoft.Data.SqlClient.Extensions/Azure/test/WorkloadIdentityFederationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class WorkloadIdentityFederationTests
1616
nameof(Config.HasTenantId),
1717
nameof(Config.HasUserManagedIdentityClientId),
1818
nameof(Config.HasWorkloadIdentityFederationServiceConnectionId))]
19-
public async void GetCredential()
19+
public async Task GetCredential()
2020
{
2121
AzurePipelinesCredential credential = new(
2222
// The tenant ID of the managed identity associated to our workload
@@ -32,7 +32,7 @@ public async void GetCredential()
3232
// The client ID of the managed identity associated to our workload
3333
// identity federation service connection. See:
3434
//
35-
// https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/654fffd0-d02d-4894-b1b7-e2dfbc44a665/resourceGroups/aad-testlab-dl797892652000/providers/Microsoft.ManagedIdentity/userAssignedIdentities/dotnetMSI/overview
35+
// https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/654fffd0-d02d-4894-b1b7-e2dfbc44a665/resourceGroups/aad-testlab-dl797892652000/providers/Microsoft.ManagedIdentity/userAssignedIdentities/dotnetMSI/overview
3636
//
3737
Config.UserManagedIdentityClientId,
3838

@@ -60,6 +60,6 @@ public async void GetCredential()
6060
new(["https://database.windows.net/.default"]),
6161
CancellationToken.None);
6262

63-
Assert.NotEmpty(token.Token);
63+
Assert.NotEmpty(token.Token);
6464
}
6565
}

0 commit comments

Comments
 (0)