-
Notifications
You must be signed in to change notification settings - Fork 111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove deprecated Azure SDK's from Calamari.CloudAccounts #1356
Draft
APErebus
wants to merge
7
commits into
main
Choose a base branch
from
ap/remove-deprecated-api-from-cloud-accounts
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fb7675e
No longer use deprecated Azure SDK's in Calamari.CloudAccounts
APErebus b7e0c5f
Remove Microsoft.Azure.Management.Fluent
APErebus 4c8f8f8
Fix mixed dll versions
APErebus 957be9d
Fix bad rebase
APErebus 34abf3d
Update a bunch of packages to latest
APErebus 0c08bce
Fix AKS cluster discovery
APErebus b962fc5
Handle failing regions
APErebus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,46 @@ | ||
| using System; | ||
| using Azure.Identity; | ||
| using Azure.ResourceManager; | ||
| using Microsoft.Azure.Management.ResourceManager.Fluent; | ||
|
|
||
| namespace Calamari.Azure | ||
| { | ||
| public sealed class AzureKnownEnvironment | ||
| { | ||
| { | ||
| /// <param name="environment">The environment name exactly matching the names defined in Azure SDK (see here https://github.com/Azure/azure-libraries-for-net/blob/master/src/ResourceManagement/ResourceManager/AzureEnvironment.cs) | ||
| /// Other names are allowed in case this list is ever expanded/changed, but will likely result in an error at deployment time. | ||
| /// </param> | ||
| public AzureKnownEnvironment(string environment) | ||
| { | ||
| Value = environment; | ||
|
|
||
| if (string.IsNullOrEmpty(environment) || environment == "AzureCloud") // This environment name is defined in Sashimi.Azure.Accounts.AzureEnvironmentsListAction | ||
| Value = Global.Value; // We interpret it as the normal Azure environment for historical reasons) | ||
|
|
||
| azureSdkEnvironment = AzureEnvironment.FromName(Value) ?? | ||
| throw new InvalidOperationException($"Unknown environment name {Value}"); | ||
| if (string.IsNullOrEmpty(environment) || environment == "AzureCloud") // This environment name is defined in Sashimi.Azure.Accounts.AzureEnvironmentsListAction | ||
| { | ||
| Value = "AzureGlobalCloud"; // We interpret it as the normal Azure environment for historical reasons) | ||
| } | ||
| } | ||
|
|
||
| private readonly AzureEnvironment azureSdkEnvironment; | ||
| public string Value { get; } | ||
|
|
||
| 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"); | ||
|
|
||
| public AzureEnvironment AsAzureSDKEnvironment() | ||
| { | ||
| return azureSdkEnvironment; | ||
| } | ||
|
|
||
| public ArmEnvironment AsAzureArmEnvironment() => ToArmEnvironment(Value); | ||
|
|
||
| private static ArmEnvironment ToArmEnvironment(string name) => name switch | ||
| { | ||
| "AzureGlobalCloud" => ArmEnvironment.AzurePublicCloud, | ||
| "AzureChinaCloud" => ArmEnvironment.AzureChina, | ||
| "AzureGermanCloud" => ArmEnvironment.AzureGermany, | ||
| "AzureUSGovernment" => ArmEnvironment.AzureGovernment, | ||
| _ => throw new InvalidOperationException($"ARM Environment {name} is not a known Azure Environment name.") | ||
| }; | ||
|
|
||
| static ArmEnvironment ToArmEnvironment(string name) => name switch | ||
| { | ||
| "AzureGlobalCloud" => ArmEnvironment.AzurePublicCloud, | ||
| "AzureChinaCloud" => ArmEnvironment.AzureChina, | ||
| "AzureGermanCloud" => ArmEnvironment.AzureGermany, | ||
| "AzureUSGovernment" => ArmEnvironment.AzureGovernment, | ||
| _ => throw new InvalidOperationException($"ARM Environment {name} is not a known Azure Environment name.") | ||
| }; | ||
| public Uri GetAzureAuthorityHost() => ToAzureAuthorityHost(Value); | ||
|
|
||
| private static Uri ToAzureAuthorityHost(string name) => name switch | ||
| { | ||
| "AzureGlobalCloud" => AzureAuthorityHosts.AzurePublicCloud, | ||
| "AzureChinaCloud" => AzureAuthorityHosts.AzureChina, | ||
| "AzureGermanCloud" => AzureAuthorityHosts.AzureGermany, | ||
| "AzureUSGovernment" => AzureAuthorityHosts.AzureGovernment, | ||
| _ => throw new InvalidOperationException($"ARM Environment {name} is not a known Azure Environment name.") | ||
| }; | ||
| static Uri ToAzureAuthorityHost(string name) => name switch | ||
| { | ||
| "AzureGlobalCloud" => AzureAuthorityHosts.AzurePublicCloud, | ||
| "AzureChinaCloud" => AzureAuthorityHosts.AzureChina, | ||
| "AzureGermanCloud" => AzureAuthorityHosts.AzureGermany, | ||
| "AzureUSGovernment" => AzureAuthorityHosts.AzureGovernment, | ||
| _ => throw new InvalidOperationException($"ARM Environment {name} is not a known Azure Environment name.") | ||
| }; | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of this was unused. The only one was
Global, but we only needed the string, so let's just use it.