Make storage data cmdlets work with ARM and ASM #1041
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // 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 System; | ||
| using System.Collections.Generic; | ||
| using Microsoft.WindowsAzure.Commands.Common; | ||
| using Microsoft.Azure.Common.Authentication.Models; | ||
| using Microsoft.WindowsAzure.Commands.Common.Storage; | ||
| using ArmStorage = Microsoft.Azure.Management.Storage; | ||
| using SmStorage = Microsoft.WindowsAzure.Management.Storage; | ||
| using Microsoft.WindowsAzure.Storage; | ||
| using Microsoft.Azure.Common.Authentication; | ||
| using Microsoft.WindowsAzure.Storage.Auth; | ||
|
|
||
| namespace Microsoft.WindowsAzure.Commands.Utilities.Common | ||
| { | ||
| public static class AzureContextExtensions | ||
| { | ||
| /// <summary> | ||
| /// Set the current storage account using the given connection string | ||
| /// </summary> | ||
| /// <param name="context">The current context.</param> | ||
| /// <param name="connectionString">The connection string to check.</param> | ||
| public static void SetCurrentStorageAccount(this AzureContext context, string connectionString) | ||
| { | ||
| if (context.Subscription != null) | ||
| { | ||
| context.Subscription.SetProperty(AzureSubscription.Property.StorageAccount, connectionString); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Set the current storage account using the given connection string. | ||
| /// </summary> | ||
| /// <param name="context">The current context.</param> | ||
| /// <param name="account">A storage account.</param> | ||
| public static void SetCurrentStorageAccount(this AzureContext context, IStorageContextProvider account) | ||
| { | ||
| if (context.Subscription != null && account != null && account.Context != null | ||
| && account.Context.StorageAccount != null) | ||
| { | ||
| context.SetCurrentStorageAccount(account.Context.StorageAccount.ToString(true)); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Get the current storage account. | ||
| /// </summary> | ||
| /// <param name="context">The current context.</param> | ||
| /// <returns>The current storage account, or null, if no current storage account is set.</returns> | ||
| public static CloudStorageAccount GetCurrentStorageAccount(this AzureContext context) | ||
| { | ||
| if (context != null && context.Subscription != null) | ||
| { | ||
| try | ||
| { | ||
| return | ||
| CloudStorageAccount.Parse( | ||
| context.Subscription.GetProperty(AzureSubscription.Property.StorageAccount)); | ||
| } | ||
| catch | ||
| { | ||
| // return null if we could not parse the connection string | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // 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 System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Microsoft.WindowsAzure.Commands.Common.Storage | ||
| { | ||
| public interface IStorageContextProvider | ||
| { | ||
| AzureStorageContext Context | ||
| { | ||
| get; | ||
| } | ||
| } | ||
| } |
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,42 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // 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 System; | ||
| using System.IO; | ||
| using System.Text.RegularExpressions; | ||
|
|
||
| namespace Microsoft.WindowsAzure.Commands.Common.Storage | ||
| { | ||
| public class StorageIdentity | ||
| { | ||
| private const string StorageIdentityRegex = | ||
| "/subscriptions/([^/]+)/resourceGroups/([^/]+)/microsoft.storage/storageAccounts/(\\w+)"; | ||
| public StorageIdentity(string identity) | ||
| { | ||
| var matcher = new Regex(StorageIdentityRegex); | ||
| var result = matcher.Match(identity); | ||
| if (!result.Success || result.Groups == null || result.Groups.Count < 3) | ||
| { | ||
| throw new InvalidOperationException(string.Format("Cannot find resource grpoup name and storage account name from resource identity {0}", identity)); | ||
| } | ||
|
|
||
| this.ResourceGroupName = result.Groups[1].Value; | ||
| this.StorageAccountName = result.Groups[2].Value; | ||
| } | ||
|
|
||
| public string ResourceGroupName { get; private set; } | ||
|
|
||
| public string StorageAccountName { get; private set; } | ||
| } | ||
| } |
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
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.
Looks scary for me that we have hard-coded endpoints here regardless of the environment. Would propose using AzureEnvironment.BlobSuffixEndpoint instead of the hard-coded value. Feel free to ignore that comment in case I miss some context/assumption that's made here.
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.
this only occurs when running mocked tests, when the values should not matter. in production, the endpoint values from the account are used. In the context where this function is used, this data is not always available. Given that this should not matter, tabling this for now.