Skip to content

[fixes #103934158] Fix storage data plane renamings #968

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 2 commits into from
Sep 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Common/Storage/Azure.Storage.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ VariablesToExport = '*'

# Aliases to export from this module
AliasesToExport = @(
'Get-AzureRMStorageContainerAcl',
'Get-AzureStorageContainerAcl',
'Start-CopyAzureStorageBlob',
'Stop-CopyAzureStorageBlob'
)
Expand Down
48 changes: 24 additions & 24 deletions src/Common/Storage/Commands.Storage/Common/StorageNouns.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ public static class StorageNouns
/// <summary>
/// Blob cmdlet name
/// </summary>
public const string Blob = "AzureRMStorageBlob";
public const string Blob = "AzureStorageBlob";

/// <summary>
/// Blobcontent cmdlet name
/// </summary>
public const string BlobContent = "AzureRMStorageBlobContent";
public const string BlobContent = "AzureStorageBlobContent";

/// <summary>
/// blob snapshot cmdlet name
/// </summary>
public const string BlobSnapshot = "AzureRMStorageBlobSnapshot";
public const string BlobSnapshot = "AzureStorageBlobSnapshot";

/// <summary>
/// Container cmdlet name
/// </summary>
public const string Container = "AzureRMStorageContainer";
public const string Container = "AzureStorageContainer";

/// <summary>
/// Container acl cmdlet name
/// </summary>
public const string ContainerAcl = "AzureRMStorageContainerAcl";
public const string ContainerAcl = "AzureStorageContainerAcl";

/// <summary>
/// Http protocol
Expand All @@ -57,12 +57,12 @@ public static class StorageNouns
/// <summary>
/// Queue cmdlet name
/// </summary>
public const string Queue = "AzureRMStorageQueue";
public const string Queue = "AzureStorageQueue";

/// <summary>
/// Storage context cmdlet name
/// </summary>
public const string StorageContext = "AzureRMStorageContext";
public const string StorageContext = "AzureStorageContext";

/// <summary>
/// Storage account name
Expand All @@ -72,12 +72,12 @@ public static class StorageNouns
/// <summary>
/// Table cmdlet name
/// </summary>
public const string Table = "AzureRMStorageTable";
public const string Table = "AzureStorageTable";

/// <summary>
/// Copy azure storage blob
/// </summary>
public const string CopyBlob = "AzureRMStorageBlobCopy";
public const string CopyBlob = "AzureStorageBlobCopy";

/// <summary>
/// Copy azure storage blob deprecated name
Expand All @@ -87,78 +87,78 @@ public static class StorageNouns
/// <summary>
/// Copy status for azure storage blob
/// </summary>
public const string CopyBlobStatus = "AzureRMStorageBlobCopyState";
public const string CopyBlobStatus = "AzureStorageBlobCopyState";

/// <summary>
/// Azure storage service hour metrics
/// </summary>
public const string StorageServiceMetrics = "AzureRMStorageServiceMetricsProperty";
public const string StorageServiceMetrics = "AzureStorageServiceMetricsProperty";

/// <summary>
/// Azure storage service logging
/// </summary>
public const string StorageServiceLogging = "AzureRMStorageServiceLoggingProperty";
public const string StorageServiceLogging = "AzureStorageServiceLoggingProperty";

/// <summary>
/// Azure storage CORS rule
/// </summary>
public const string StorageCORSRule = "AzureRMStorageCORSRule";
public const string StorageCORSRule = "AzureStorageCORSRule";

/// <summary>
/// Azure storage container sas
/// </summary>
public const string ContainerSas = "AzureRMStorageContainerSASToken";
public const string ContainerSas = "AzureStorageContainerSASToken";

/// <summary>
/// Azure storage blob sas
/// </summary>
public const string BlobSas = "AzureRMStorageBlobSASToken";
public const string BlobSas = "AzureStorageBlobSASToken";

/// <summary>
/// Azure storage file share sas
/// </summary>
public const string ShareSas = "AzureRMStorageShareSASToken";
public const string ShareSas = "AzureStorageShareSASToken";

/// <summary>
/// Azure storage file sas
/// </summary>
public const string FileSas = "AzureRMStorageFileSASToken";
public const string FileSas = "AzureStorageFileSASToken";

/// <summary>
/// Azure storage table sas
/// </summary>
public const string TableSas = "AzureRMStorageTableSASToken";
public const string TableSas = "AzureStorageTableSASToken";

/// <summary>
/// Azure storage queue sas
/// </summary>
public const string QueueSas = "AzureRMStorageQueueSASToken";
public const string QueueSas = "AzureStorageQueueSASToken";

/// <summary>
/// Azure storage table stored access policy
/// </summary>
public const string TableStoredAccessPolicy = "AzureRMStorageTableStoredAccessPolicy";
public const string TableStoredAccessPolicy = "AzureStorageTableStoredAccessPolicy";

/// <summary>
/// Azure storage share stored access policy
/// </summary>
public const string ShareStoredAccessPolicy = "AzureRMStorageShareStoredAccessPolicy";
public const string ShareStoredAccessPolicy = "AzureStorageShareStoredAccessPolicy";

/// <summary>
/// Azure storage container stored access policy
/// </summary>
public const string ContainerStoredAccessPolicy = "AzureRMStorageContainerStoredAccessPolicy";
public const string ContainerStoredAccessPolicy = "AzureStorageContainerStoredAccessPolicy";


/// <summary>
/// Azure storage container stored access policy
/// </summary>
public const string QueueStoredAccessPolicy = "AzureRMStorageQueueStoredAccessPolicy";
public const string QueueStoredAccessPolicy = "AzureStorageQueueStoredAccessPolicy";

/// <summary>
/// Azure storage share quota
/// </summary>
public const string ShareQuota = "AzureRMStorageShareQuota";
public const string ShareQuota = "AzureStorageShareQuota";

/// <summary>
/// Default service metrics version
Expand Down
14 changes: 7 additions & 7 deletions src/Common/Storage/Commands.Storage/File/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,37 +34,37 @@ internal static class Constants
/// <summary>
/// Cmdlet name for storage context.
/// </summary>
public const string StorageContextCmdletName = "AzureRMStorageContext";
public const string StorageContextCmdletName = "AzureStorageContext";

/// <summary>
/// Cmdlet name for file share.
/// </summary>
public const string ShareCmdletName = "AzureRMStorageShare";
public const string ShareCmdletName = "AzureStorageShare";

/// <summary>
/// Cmdlet name for file directory.
/// </summary>
public const string FileDirectoryCmdletName = "AzureRMStorageDirectory";
public const string FileDirectoryCmdletName = "AzureStorageDirectory";

/// <summary>
/// Cmdlet name for file.
/// </summary>
public const string FileCmdletName = "AzureRMStorageFile";
public const string FileCmdletName = "AzureStorageFile";

/// <summary>
/// Cmdlet name for file content.
/// </summary>
public const string FileContentCmdletName = "AzureRMStorageFileContent";
public const string FileContentCmdletName = "AzureStorageFileContent";

/// <summary>
/// Cmdlet name for file copy.
/// </summary>
public const string FileCopyCmdletName = "AzureRMStorageFileCopy";
public const string FileCopyCmdletName = "AzureStorageFileCopy";

/// <summary>
/// Cmdlet name for file copy state.
/// </summary>
public const string FileCopyCmdletStateName = "AzureRMStorageFileCopyState";
public const string FileCopyCmdletStateName = "AzureStorageFileCopyState";

/// <summary>
/// Stores the default endpoint suffix for storage accounts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function Test-BackupRestoreApiManagement
New-AzureRmStorageAccount -StorageAccountName $storageAccountName -Location $storageLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS

$storageKey = (Get-AzureRmStorageAccountKey -ResourceGroupName $resourceGroupName -StorageAccountName $storageAccountName).Key1
$storageContext = New-AzureRmStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageKey
$storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageKey

$apiManagementName = Get-ApiManagementServiceName
$organization = "apimpowershellorg"
Expand Down