Skip to content

Commit 27ab661

Browse files
VeryEarlyyifanz7
andauthored
[Storage] Mirgate Storage file cmdlets to Track2 SDK (Azure#26575) (Azure#26594)
* [Storage] Mirgate Storage file cmdlets to Track2 SDK (Azure#26575) * REsolve merge conflicts * Resolve merge conflicts * remove breaking change warnings * Update changelog * Add breaking change exception * Remove unused file InvalidCLoudFileShare.cs * Update RemoveFilePathTrailingDot helper function per comments --------- Co-authored-by: yifanz7 <[email protected]> Co-authored-by: Yifan Zhang <[email protected]>
1 parent 8dce41c commit 27ab661

File tree

78 files changed

+547
-4431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+547
-4431
lines changed

src/Storage/Storage.Management/ChangeLog.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,30 @@
2020
## Upcoming Release
2121
* When download blob with parameter AbsoluteUri (alias Uri, BlobUri), not allow input parameter Context together.
2222
- `Get-AzStorageBlobContent`
23+
* Migrated following Azure Storage File dataplane cmdlets from 'Microsoft.Azure.Storage.File' to 'Azure.Storage.Files.Shares'
24+
- `Close-AzStorageFileHandle`
25+
- `Get-AzStorageFile`
26+
- `Get-AzStorageFileContent`
27+
- `Get-AzStorageFileCopyState`
28+
- `Get-AzStorageFileHandle`
29+
- `Get-AzStorageShare`
30+
- `Get-AzStorageShareStoredAccessPolicy`
31+
- `New-AzStorageDirectory`
32+
- `New-AzStorageShare`
33+
- `New-AzStorageFileSASToken`
34+
- `New-AzStorageShareSASToken`
35+
- `New-AzStorageShareStoredAccessPolicy`
36+
- `Remove-AzStorageDirectory`
37+
- `Remove-AzStorageFile`
38+
- `Remove-AzStorageShare`
39+
- `Remove-AzStorageShareStoredAccessPolicy`
40+
- `Rename-AzStorageDirectory`
41+
- `Rename-AzStorageFile`
42+
- `Set-AzStorageFileContent`
43+
- `Set-AzStorageShareQuota`
44+
- `Set-AzStorageShareStoredAccessPolicy`
45+
- `Start-AzStorageFileCopy`
46+
- `Stop-AzStorageFileCopy`
2347

2448
## Version 7.5.0
2549
* Added a warning for an upcoming breaking change for download blob will block input parameter -AbsoluteUri and -Context together.

src/Storage/Storage.Management/Models/PSShare.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,15 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
16-
using Microsoft.Azure.Management.Storage;
1715
using Microsoft.Azure.Management.Storage.Models;
1816
using Microsoft.WindowsAzure.Commands.Common.Attributes;
19-
using Microsoft.WindowsAzure.Commands.Common.Storage;
20-
using Microsoft.WindowsAzure.Commands.Storage.Common;
21-
using Microsoft.Azure.Storage;
22-
using Microsoft.Azure.Storage.File;
2317
using System;
2418
using System.Collections.Generic;
2519
using StorageModels = Microsoft.Azure.Management.Storage.Models;
2620

2721
namespace Microsoft.Azure.Commands.Management.Storage.Models
2822
{
29-
public class PSShare //: CloudFileShare
23+
public class PSShare
3024
{
3125
public PSShare(StorageModels.FileShare share)
3226
{

src/Storage/Storage.Management/help/Close-AzStorageFileHandle.md

Lines changed: 33 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,49 @@ Closes file handles of a file share, a file directory or a file.
1515
### ShareNameCloseAll (Default)
1616
```
1717
Close-AzStorageFileHandle [-ShareName] <String> [[-Path] <String>] [-Recursive] [-CloseAll]
18-
[-Context <IStorageContext>] [-DisAllowTrailingDot] [-PassThru] [-AsJob] [-ServerTimeoutPerRequest <Int32>]
18+
[-DisAllowTrailingDot] [-PassThru] [-AsJob] [-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>]
1919
[-ClientTimeoutPerRequest <Int32>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
2020
[-WhatIf] [-Confirm] [<CommonParameters>]
2121
```
2222

2323
### ShareNameCloseSingle
2424
```
25-
Close-AzStorageFileHandle [-ShareName] <String> -FileHandle <PSFileHandle> [-Context <IStorageContext>]
26-
[-DisAllowTrailingDot] [-PassThru] [-AsJob] [-ServerTimeoutPerRequest <Int32>]
27-
[-ClientTimeoutPerRequest <Int32>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
28-
[-WhatIf] [-Confirm] [<CommonParameters>]
25+
Close-AzStorageFileHandle [-ShareName] <String> -FileHandle <PSFileHandle> [-DisAllowTrailingDot] [-PassThru]
26+
[-AsJob] [-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
27+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [-WhatIf] [-Confirm]
28+
[<CommonParameters>]
2929
```
3030

3131
### ShareCloseAll
3232
```
33-
Close-AzStorageFileHandle [-Share] <CloudFileShare> [-ShareClient <ShareClient>] [[-Path] <String>]
34-
[-Recursive] [-CloseAll] [-PassThru] [-AsJob] [-ServerTimeoutPerRequest <Int32>]
35-
[-ClientTimeoutPerRequest <Int32>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
36-
[-WhatIf] [-Confirm] [<CommonParameters>]
33+
Close-AzStorageFileHandle [-ShareClient] <ShareClient> [[-Path] <String>] [-Recursive] [-CloseAll] [-PassThru]
34+
[-AsJob] [-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
35+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [-WhatIf] [-Confirm]
36+
[<CommonParameters>]
3737
```
3838

3939
### ShareCloseSingle
4040
```
41-
Close-AzStorageFileHandle [-Share] <CloudFileShare> [-ShareClient <ShareClient>] -FileHandle <PSFileHandle>
42-
[-PassThru] [-AsJob] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
43-
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
44-
[-WhatIf] [-Confirm] [<CommonParameters>]
41+
Close-AzStorageFileHandle [-ShareClient] <ShareClient> -FileHandle <PSFileHandle> [-PassThru] [-AsJob]
42+
[-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
43+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [-WhatIf] [-Confirm]
44+
[<CommonParameters>]
4545
```
4646

4747
### DirectoryCloseAll
4848
```
49-
Close-AzStorageFileHandle [-Directory] <CloudFileDirectory> [-ShareDirectoryClient <ShareDirectoryClient>]
50-
[[-Path] <String>] [-Recursive] [-CloseAll] [-PassThru] [-AsJob] [-ServerTimeoutPerRequest <Int32>]
49+
Close-AzStorageFileHandle [-ShareDirectoryClient] <ShareDirectoryClient> [[-Path] <String>] [-Recursive]
50+
[-CloseAll] [-PassThru] [-AsJob] [-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>]
5151
[-ClientTimeoutPerRequest <Int32>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
5252
[-WhatIf] [-Confirm] [<CommonParameters>]
5353
```
5454

5555
### FileCloseAll
5656
```
57-
Close-AzStorageFileHandle [-File] <CloudFile> [-ShareFileClient <ShareFileClient>] [-CloseAll] [-PassThru]
58-
[-AsJob] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
59-
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
60-
[-WhatIf] [-Confirm] [<CommonParameters>]
57+
Close-AzStorageFileHandle [-ShareFileClient] <ShareFileClient> [-CloseAll] [-PassThru] [-AsJob]
58+
[-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
59+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [-WhatIf] [-Confirm]
60+
[<CommonParameters>]
6161
```
6262

6363
## DESCRIPTION
@@ -165,7 +165,7 @@ Azure Storage Context Object
165165
166166
```yaml
167167
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IStorageContext
168-
Parameter Sets: ShareNameCloseAll, ShareNameCloseSingle
168+
Parameter Sets: (All)
169169
Aliases:
170170

171171
Required: False
@@ -190,21 +190,6 @@ Accept pipeline input: False
190190
Accept wildcard characters: False
191191
```
192192
193-
### -Directory
194-
CloudFileDirectory object indicated the base folder where the files/directories would be listed.
195-
196-
```yaml
197-
Type: Microsoft.Azure.Storage.File.CloudFileDirectory
198-
Parameter Sets: DirectoryCloseAll
199-
Aliases: CloudFileDirectory
200-
201-
Required: True
202-
Position: 0
203-
Default value: None
204-
Accept pipeline input: True (ByPropertyName, ByValue)
205-
Accept wildcard characters: False
206-
```
207-
208193
### -DisAllowTrailingDot
209194
Disallow trailing dot (.) to suffix directory and file names.
210195
@@ -220,21 +205,6 @@ Accept pipeline input: False
220205
Accept wildcard characters: False
221206
```
222207
223-
### -File
224-
CloudFile object indicated the file to close handle.
225-
226-
```yaml
227-
Type: Microsoft.Azure.Storage.File.CloudFile
228-
Parameter Sets: FileCloseAll
229-
Aliases: CloudFile
230-
231-
Required: True
232-
Position: 0
233-
Default value: None
234-
Accept pipeline input: True (ByPropertyName, ByValue)
235-
Accept wildcard characters: False
236-
```
237-
238208
### -FileHandle
239209
The File Handle to close.
240210
@@ -311,21 +281,6 @@ Accept pipeline input: False
311281
Accept wildcard characters: False
312282
```
313283
314-
### -Share
315-
CloudFileShare object indicated the share where the files/directories would be listed.
316-
317-
```yaml
318-
Type: Microsoft.Azure.Storage.File.CloudFileShare
319-
Parameter Sets: ShareCloseAll, ShareCloseSingle
320-
Aliases: CloudFileShare
321-
322-
Required: True
323-
Position: 0
324-
Default value: None
325-
Accept pipeline input: True (ByPropertyName, ByValue)
326-
Accept wildcard characters: False
327-
```
328-
329284
### -ShareClient
330285
ShareClient object indicated the share which contains the files/directories to closed handle.
331286
@@ -334,8 +289,8 @@ Type: Azure.Storage.Files.Shares.ShareClient
334289
Parameter Sets: ShareCloseAll, ShareCloseSingle
335290
Aliases:
336291

337-
Required: False
338-
Position: Named
292+
Required: True
293+
Position: 0
339294
Default value: None
340295
Accept pipeline input: True (ByPropertyName, ByValue)
341296
Accept wildcard characters: False
@@ -349,8 +304,8 @@ Type: Azure.Storage.Files.Shares.ShareDirectoryClient
349304
Parameter Sets: DirectoryCloseAll
350305
Aliases:
351306

352-
Required: False
353-
Position: Named
307+
Required: True
308+
Position: 0
354309
Default value: None
355310
Accept pipeline input: True (ByPropertyName, ByValue)
356311
Accept wildcard characters: False
@@ -364,8 +319,8 @@ Type: Azure.Storage.Files.Shares.ShareFileClient
364319
Parameter Sets: FileCloseAll
365320
Aliases:
366321

367-
Required: False
368-
Position: Named
322+
Required: True
323+
Position: 0
369324
Default value: None
370325
Accept pipeline input: True (ByPropertyName, ByValue)
371326
Accept wildcard characters: False
@@ -422,15 +377,19 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
422377
423378
## INPUTS
424379
425-
### Microsoft.Azure.Storage.File.CloudFileShare
380+
### Azure.Storage.Files.Shares.ShareClient
381+
382+
### Azure.Storage.Files.Shares.ShareDirectoryClient
383+
384+
### Azure.Storage.Files.Shares.ShareFileClient
426385
427-
### Microsoft.Azure.Storage.File.CloudFileDirectory
386+
### Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel.PSFileHandle
428387
429388
### Microsoft.Azure.Commands.Common.Authentication.Abstractions.IStorageContext
430389
431390
## OUTPUTS
432391
433-
### Microsoft.Azure.Storage.File.CloseFileHandleResultSegment
392+
### System.Int32
434393
435394
## NOTES
436395

src/Storage/Storage.Management/help/Get-AzStorageFile.md

Lines changed: 13 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,21 @@ Lists directories and files for a path.
1717
```
1818
Get-AzStorageFile [-ShareName] <String> [[-Path] <String>] [-ExcludeExtendedInfo] [-DisAllowTrailingDot]
1919
[-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
20-
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
21-
[<CommonParameters>]
20+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [<CommonParameters>]
2221
```
2322

2423
### Share
2524
```
26-
Get-AzStorageFile [-Share] <CloudFileShare> [-ShareClient <ShareClient>] [[-Path] <String>]
27-
[-ExcludeExtendedInfo] [-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>]
28-
[-ClientTimeoutPerRequest <Int32>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
29-
[<CommonParameters>]
25+
Get-AzStorageFile [-ShareClient] <ShareClient> [[-Path] <String>] [-ExcludeExtendedInfo]
26+
[-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
27+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [<CommonParameters>]
3028
```
3129

3230
### Directory
3331
```
34-
Get-AzStorageFile [-Directory] <CloudFileDirectory> [-ShareDirectoryClient <ShareDirectoryClient>]
35-
[[-Path] <String>] [-ExcludeExtendedInfo] [-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>]
36-
[-ClientTimeoutPerRequest <Int32>] [-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>]
37-
[<CommonParameters>]
32+
Get-AzStorageFile [-ShareDirectoryClient] <ShareDirectoryClient> [[-Path] <String>] [-ExcludeExtendedInfo]
33+
[-Context <IStorageContext>] [-ServerTimeoutPerRequest <Int32>] [-ClientTimeoutPerRequest <Int32>]
34+
[-DefaultProfile <IAzureContextContainer>] [-ConcurrentTaskCount <Int32>] [<CommonParameters>]
3835
```
3936

4037
## DESCRIPTION
@@ -130,24 +127,6 @@ Accept pipeline input: False
130127
Accept wildcard characters: False
131128
```
132129
133-
### -Directory
134-
Specifies a folder as a **CloudFileDirectory** object.
135-
This cmdlet gets the folder that this parameter specifies.
136-
To obtain a directory, use the New-AzStorageDirectory cmdlet.
137-
You can also use the **Get-AzStorageFile** cmdlet to obtain a directory.
138-
139-
```yaml
140-
Type: Microsoft.Azure.Storage.File.CloudFileDirectory
141-
Parameter Sets: Directory
142-
Aliases: CloudFileDirectory
143-
144-
Required: True
145-
Position: 0
146-
Default value: None
147-
Accept pipeline input: True (ByPropertyName, ByValue)
148-
Accept wildcard characters: False
149-
```
150-
151130
### -DisAllowTrailingDot
152131
Disallow trailing dot (.) to suffix directory and file names.
153132
@@ -211,25 +190,6 @@ Accept pipeline input: False
211190
Accept wildcard characters: False
212191
```
213192
214-
### -Share
215-
Specifies a **CloudFileShare** object.
216-
This cmdlet gets a file or directory from the file share that this parameter specifies.
217-
To obtain a **CloudFileShare** object, use the Get-AzStorageShare cmdlet.
218-
This object contains the Storage context.
219-
If you specify this parameter, do not specify the *Context* parameter.
220-
221-
```yaml
222-
Type: Microsoft.Azure.Storage.File.CloudFileShare
223-
Parameter Sets: Share
224-
Aliases: CloudFileShare
225-
226-
Required: True
227-
Position: 0
228-
Default value: None
229-
Accept pipeline input: True (ByPropertyName, ByValue)
230-
Accept wildcard characters: False
231-
```
232-
233193
### -ShareClient
234194
ShareClient object indicated the share where the files/directories would be listed.
235195
@@ -238,8 +198,8 @@ Type: Azure.Storage.Files.Shares.ShareClient
238198
Parameter Sets: Share
239199
Aliases:
240200

241-
Required: False
242-
Position: Named
201+
Required: True
202+
Position: 0
243203
Default value: None
244204
Accept pipeline input: True (ByPropertyName, ByValue)
245205
Accept wildcard characters: False
@@ -253,8 +213,8 @@ Type: Azure.Storage.Files.Shares.ShareDirectoryClient
253213
Parameter Sets: Directory
254214
Aliases:
255215

256-
Required: False
257-
Position: Named
216+
Required: True
217+
Position: 0
258218
Default value: None
259219
Accept pipeline input: True (ByPropertyName, ByValue)
260220
Accept wildcard characters: False
@@ -281,9 +241,9 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
281241
282242
## INPUTS
283243
284-
### Microsoft.Azure.Storage.File.CloudFileShare
244+
### Azure.Storage.Files.Shares.ShareClient
285245
286-
### Microsoft.Azure.Storage.File.CloudFileDirectory
246+
### Azure.Storage.Files.Shares.ShareDirectoryClient
287247
288248
### Microsoft.Azure.Commands.Common.Authentication.Abstractions.IStorageContext
289249

0 commit comments

Comments
 (0)