Remove deprecated Azure SDK's from Calamari.CloudAccounts #1356
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
APErebus
commented
Oct 4, 2024
Comment on lines
-27
to
-30
| public static readonly AzureKnownEnvironment Global = new AzureKnownEnvironment("AzureGlobalCloud"); | ||
| public static readonly AzureKnownEnvironment AzureChinaCloud = new AzureKnownEnvironment("AzureChinaCloud"); | ||
| public static readonly AzureKnownEnvironment AzureUSGovernment = new AzureKnownEnvironment("AzureUSGovernment"); | ||
| public static readonly AzureKnownEnvironment AzureGermanCloud = new AzureKnownEnvironment("AzureGermanCloud"); |
There was a problem hiding this comment.
All of this was unused. The only one was Global, but we only needed the string, so let's just use it.
source/Calamari.Azure/Kubernetes/Discovery/AzureKubernetesDiscoverer.cs
Outdated
Show resolved
Hide resolved
Comment on lines
-76
to
+78
| var token = !jwt.IsNullOrEmpty() | ||
| ? await new AzureOidcAccount(variables).Credentials(CancellationToken.None) | ||
| : await new AzureServicePrincipalAccount(variables).Credentials(); | ||
| var resourcesClient = new ResourceManagementClient(token, AuthHttpClientFactory.ProxyClientHandler()) | ||
| { | ||
| SubscriptionId = subscriptionId, | ||
| BaseUri = new Uri(resourceManagementEndpoint), | ||
| }; | ||
| resourcesClient.HttpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + token); | ||
| resourcesClient.HttpClient.BaseAddress = new Uri(resourceManagementEndpoint); | ||
| return resourcesClient; | ||
| }; | ||
|
|
||
| await CreateDeployment(createArmClient, resourceGroupName, deploymentName, deploymentMode, template, parameters); | ||
| { | ||
| var account = AzureAccountFactory.Create(variables); | ||
| var token = new TokenCredentials(await account.GetAuthorizationToken(log, CancellationToken.None)); |
There was a problem hiding this comment.
Consolidating around the AzureAccountFactory and the new IAzureAccount.GetAuthorizationToken method
| public string ClientId { get; } | ||
| public string TenantId { get; } | ||
| public string Jwt { get; } | ||
| public string AzureEnvironment { get; } | ||
| public string ResourceManagementEndpointBaseUri { get; } | ||
| public string ActiveDirectoryEndpointBaseUri { get; } | ||
|
|
||
| internal static string GetDefaultScope(string environmentName) | ||
| public async Task<string> GetAuthorizationToken(ILog log, CancellationToken cancellationToken) |
There was a problem hiding this comment.
All of this code was in the two extension method classes (one for each type), but changed to instance methods so they can be accessed through the IAzureAccount
APErebus
changed the title
APErebus
changed the title
APErebus
force-pushed
the
ap/remove-deprecated-api-from-cloud-accounts
branch
3 times, most recently
from
2a80b23 to
d47d44f
Compare
APErebus
force-pushed
the
ap/remove-deprecated-api-from-cloud-accounts
branch
from
d47d44f to
4c8f8f8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes the use of
Microsoft.RestandMicrosoft.Azure.Management.FluentfromCalamari.CloudAccountsas these are deprecated libraries.The main code changes is to move the logic for retrieving the access token on to the
IAzureAccountimplementations, rather than on extension methods