-
Notifications
You must be signed in to change notification settings - Fork 4.1k
[Storage] Upgrade to XSCL 10 (depends on PR #9037, to upgrade SRP SDK) #9005
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 hidden or 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
134 changes: 134 additions & 0 deletions
134
src/Storage/Storage.Management/Common/AzureContextAdapterExtensions.cs
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Microsoft.Azure.Commands.Common.Authentication.Abstractions; | ||
| using Microsoft.Azure.Storage; | ||
| using Microsoft.Azure.Storage.Auth; | ||
| using Microsoft.WindowsAzure.Commands.Utilities.Common; | ||
| using Microsoft.WindowsAzure.Commands.Common.Storage; | ||
| using System.Linq; | ||
| using System; | ||
| using System.Text; | ||
|
|
||
| namespace Microsoft.WindowsAzure.Commands.Storage.Adapters | ||
| { | ||
| public static class AzureContextAdapterExtensions | ||
| { | ||
| /// <summary> | ||
| /// Get the current storage account. | ||
| /// </summary> | ||
| /// <param name="context">The current Azure context.</param> | ||
| /// <returns>The current storage account, or null, if no current storage account is set.</returns> | ||
| public static CloudStorageAccount GetCurrentStorageAccount(this IAzureContext context, IStorageServiceProvider provider) | ||
| { | ||
| if (context != null) | ||
| { | ||
| var storageConnectionString = context.GetCurrentStorageAccountConnectionString(); | ||
| try | ||
| { | ||
| return | ||
| CloudStorageAccount.Parse(storageConnectionString); | ||
| } | ||
| catch | ||
| { | ||
| var service = provider.GetStorageService(storageConnectionString, null); | ||
| return service.GetCloudStorageAccount(); | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Get a CloudStorageAccount client for the storage account represented by this context | ||
| /// </summary> | ||
| /// <param name="context">The storage context for the storage account</param> | ||
| /// <returns>A CloudStorageAccount client for storage data plane tasks</returns> | ||
| public static CloudStorageAccount GetCloudStorageAccount(this IStorageContext context) | ||
| { | ||
| CloudStorageAccount result = null; | ||
| CloudStorageAccount.TryParse(context.ConnectionString, out result); | ||
| return result; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Get a CloudStorageAccount client for the storage account represented by this service | ||
| /// </summary> | ||
| /// <param name="service">The storage service</param> | ||
| /// <returns>A CloudStorageAccount client for storage data plane tasks</returns> | ||
| public static CloudStorageAccount GetCloudStorageAccount( this IStorageService service) | ||
| { | ||
| return new CloudStorageAccount(new StorageCredentials(service.Name, service.AuthenticationKeys.First()), | ||
| new StorageUri(service.BlobEndpoint), new StorageUri(service.QueueEndpoint), | ||
| new StorageUri(service.TableEndpoint), new StorageUri(service.FileEndpoint)); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Get a storage context client for the storage account represented by this service | ||
| /// </summary> | ||
| /// <param name="service">The storage service</param> | ||
| /// <returns>A CloudStorageAccount client for storage data plane tasks</returns> | ||
| public static IStorageContext GetStorageContext(this IStorageService service) | ||
| { | ||
| return new AzureStorageContext(new CloudStorageAccount(new StorageCredentials(service.Name, service.AuthenticationKeys.First()), | ||
| new StorageUri(service.BlobEndpoint), new StorageUri(service.QueueEndpoint), | ||
| new StorageUri(service.TableEndpoint), new StorageUri(service.FileEndpoint))); | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Get a CloudStorageAccount client for the given storage service using the given storage service provider | ||
| /// </summary> | ||
| /// <param name="provider">The storage service provider to retrieve storage service details</param> | ||
| /// <param name="accountName">The storage accoutn name</param> | ||
| /// <returns>A CloudStorageAccount client for storage data plane tasks</returns> | ||
| public static CloudStorageAccount GetCloudStorageAccount(this IStorageServiceProvider provider, string accountName, string resourceGroupName = null) | ||
| { | ||
| #if DEBUG | ||
markcowl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (TestMockSupport.RunningMocked) | ||
| { | ||
| return new CloudStorageAccount(new StorageCredentials(accountName, | ||
| Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString()))), true); | ||
| } | ||
| #endif | ||
| return provider.GetStorageService(accountName, resourceGroupName).GetCloudStorageAccount(); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /// <summary> | ||
| /// Get a CloudStorageAccount client for the current storage service using the given storage service provider | ||
| /// </summary> | ||
| /// <param name="context">The current Azure context.</param> | ||
| /// <param name="provider">The storage service provider to retrieve storage service details</param> | ||
| /// <returns>A CloudStorageAccount client for storage data plane tasks</returns> | ||
| public static CloudStorageAccount GetCloudStorageAccount(this IAzureContext context, IStorageServiceProvider provider) | ||
| { | ||
| CloudStorageAccount account; | ||
| var storageConnectionString = context.GetCurrentStorageAccountConnectionString(); | ||
| if(!CloudStorageAccount.TryParse(storageConnectionString, out account)) | ||
| { | ||
| if (null == provider) | ||
| { | ||
| throw new ArgumentNullException("provider"); | ||
| } | ||
|
|
||
| account = provider.GetCloudStorageAccount(storageConnectionString); | ||
| } | ||
|
|
||
| return account; | ||
| } | ||
|
|
||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.