-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Refactoring commands.common.storage to remove storage management depe… #1950
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 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9962c1c
Refactoring commands.common.storage to remove storage management depe…
markcowl 53dcccb
Update msi for storage changes
markcowl 3af62d9
Merge branch 'dev' of github.com:Azure/azure-powershell into storagec…
markcowl 01e0fab
Updating msi
markcowl a070174
Responding to review comments
markcowl 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
37 changes: 37 additions & 0 deletions
37
src/Common/Commands.Common.Storage/Adapters/ARM.Storage.3/ARMStorageProvider.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,37 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // 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.Management.Automation; | ||
| using Microsoft.Azure.Management.Storage; | ||
| using Microsoft.WindowsAzure.Commands.Common.Storage; | ||
|
|
||
| namespace Microsoft.Azure.Commands.Management.Storage.Models | ||
| { | ||
| public class ARMStorageProvider : IStorageServiceProvider | ||
| { | ||
| IStorageManagementClient _client; | ||
|
|
||
| public ARMStorageProvider(IStorageManagementClient client) | ||
| { | ||
| _client = client; | ||
| } | ||
| public IStorageService GetStorageService(string name, string resourceGroupName) | ||
| { | ||
| var account = _client.StorageAccounts.GetProperties(resourceGroupName, name); | ||
| var keys = _client.StorageAccounts.ListKeys(resourceGroupName, name); | ||
| return new ARMStorageService(account.StorageAccount, keys.StorageAccountKeys.Key1, | ||
| keys.StorageAccountKeys.Key2); | ||
| } | ||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
src/Common/Commands.Common.Storage/Adapters/ARM.Storage.3/ARMStorageService.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,81 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // 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; | ||
| using Microsoft.WindowsAzure.Commands.Common.Storage; | ||
|
|
||
| namespace Microsoft.Azure.Commands.Management.Storage.Models | ||
| { | ||
| public class ARMStorageService : IStorageService | ||
| { | ||
| Azure.Management.Storage.Models.StorageAccount _account; | ||
| List<string> _authenticationKeys = new List<string>(); | ||
| public ARMStorageService(Azure.Management.Storage.Models.StorageAccount account, | ||
| params string[] authenticationKeys) | ||
| { | ||
| _account = account; | ||
| foreach (var key in authenticationKeys) | ||
| { | ||
| _authenticationKeys.Add(key); | ||
| } | ||
| } | ||
|
|
||
| public Uri BlobEndpoint | ||
| { | ||
| get { return _account.PrimaryEndpoints.Blob; } | ||
| } | ||
|
|
||
| public Uri FileEndpoint | ||
| { | ||
| get { return _account.PrimaryEndpoints.File; } | ||
| } | ||
|
|
||
| public Uri QueueEndpoint | ||
| { | ||
| get { return _account.PrimaryEndpoints.Queue; } | ||
| } | ||
|
|
||
| public Uri TableEndpoint | ||
| { | ||
| get { return _account.PrimaryEndpoints.Table; } | ||
| } | ||
|
|
||
| public string Name | ||
| { | ||
| get { return _account.Name; } | ||
| } | ||
|
|
||
| public List<string> AuthenticationKeys | ||
| { | ||
| get { return _authenticationKeys; } | ||
| } | ||
|
|
||
| public static string ParseResourceGroupFromId(string idFromServer) | ||
| { | ||
| if (!string.IsNullOrEmpty(idFromServer)) | ||
| { | ||
| string[] tokens = idFromServer.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); | ||
|
|
||
| return tokens[3]; | ||
| } | ||
|
|
||
| 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
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.
Since this is public static method - it may fail with index outside the bounds of the array. Could you check that it has 3 elements before accessing it?