Skip to content

[Storage] Refine Track2 file cmdlets migration #26232

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.

Sign up for GitHub

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
Nickcandy merged 11 commits into from
Oct 12, 2024
Merged

[Storage] Refine Track2 file cmdlets migration #26232

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ea11507
temp
yifanz7 Sep 12, 2024
424f2cf
temp2
yifanz7 Sep 23, 2024
0cfa351
Move Track1 Blob reference in file copy cmdlet back; add context chec…
yifanz7 Sep 25, 2024
5c66a41
remove warning
yifanz7 Sep 26, 2024
7dc7aa1
clean up
yifanz7 Sep 26, 2024
08642b2
update warning message when dest context is missing; update file and …
yifanz7 Sep 26, 2024
7e497c0
clean up code
yifanz7 Oct 8, 2024
67a1073
Update help files
yifanz7 Oct 8, 2024
bb1c53b
Merge branch 'Az.Storage-preview' of https://github.com/Azure/azure-p…
yifanz7 Oct 8, 2024
505dc31
Update changelog
yifanz7 Oct 8, 2024
e2ded27
Update file and directory output display
yifanz7 Oct 8, 2024
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
Next Next commit
temp
  • Loading branch information
@yifanz7
yifanz7 committed Sep 25, 2024
commit ea11507d2620b331938babf6964bb6f326ecd3cd
50 changes: 28 additions & 22 deletions src/Storage/Storage/File/Cmdlet/StartAzureStorageFileCopy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,18 @@ public class StartAzureStorageFileCopyCommand : StorageFileDataManagementCmdletB
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ContainerNameParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ShareNameParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ContainerParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = BlobFilePathParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = BlobFileParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ShareParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = FileFileParameterSet)]
[Parameter(HelpMessage = "Source Azure Storage Context Object",
Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = FileFilePathParameterSet)]
//[Parameter(HelpMessage = "Source Azure Storage Context Object",
//Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ContainerParameterSet)]
//[Parameter(HelpMessage = "Source Azure Storage Context Object",
// Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = BlobFilePathParameterSet)]
//[Parameter(HelpMessage = "Source Azure Storage Context Object",
// Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = BlobFileParameterSet)]
//[Parameter(HelpMessage = "Source Azure Storage Context Object",
//Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ShareParameterSet)]
//[Parameter(HelpMessage = "Source Azure Storage Context Object",
// Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = FileFileParameterSet)]
//[Parameter(HelpMessage = "Source Azure Storage Context Object",
// Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = FileFilePathParameterSet)]
public override IStorageContext Context { get; set; }

[Parameter(HelpMessage = "Destination Storage context object", ParameterSetName = ContainerNameParameterSet)]
Expand Down Expand Up @@ -198,13 +198,14 @@ private IStorageBlobManagement GetBlobChannel()
private AzureStorageContext GetSourceContext()
{
if (this.ParameterSetName == ContainerNameParameterSet ||
this.ParameterSetName == ShareNameParameterSet ||
this.ParameterSetName == ContainerParameterSet ||
this.ParameterSetName == BlobFilePathParameterSet ||
this.ParameterSetName == BlobFileParameterSet ||
this.ParameterSetName == ShareParameterSet ||
this.ParameterSetName == FileFilePathParameterSet ||
this.ParameterSetName == FileFileParameterSet)
this.ParameterSetName == ShareNameParameterSet
//this.ParameterSetName == ContainerParameterSet ||
//this.ParameterSetName == BlobFilePathParameterSet ||
//this.ParameterSetName == BlobFileParameterSet ||
//this.ParameterSetName == ShareParameterSet
//this.ParameterSetName == FileFilePathParameterSet ||
//this.ParameterSetName == FileFileParameterSet
)
{
return this.GetCmdletStorageContext();
}
Expand Down Expand Up @@ -391,10 +392,15 @@ private void StartCopyFromFile()

ShareFileClient destFile = this.GetDestFile();

if (((AzureStorageContext)this.Context).Track2OauthToken != null
&& string.Compare(sourceFile.Uri.Host, destFile.Uri.Host, ignoreCase: true) != 0)
//if (((AzureStorageContext)this.Context).Track2OauthToken != null
// && string.Compare(sourceFile.Uri.Host, destFile.Uri.Host, ignoreCase: true) != 0)
//{
// WriteWarning("The source File is on Azure AD credential, might cause cross account file copy fail. Please use source File based on SharedKey or SAS creadencial to avoid the failure.");
//}

if (!sourceFile.CanGenerateSasUri && string.Compare(sourceFile.Uri.Host, destFile.Uri.Host, ignoreCase: true) != 0)
{
WriteWarning("The source File is on Azure AD credential, might cause cross account file copy fail. Please use source File based on SharedKey or SAS creadencial to avoid the failure.");
WriteWarning("The source File cannot generate SAS Uri and might cause cross account file copy failures. Please use source File based on SharedKey or SAS creadencial to avoid the failure.");
}

Func<long, Task> taskGenerator = (taskId) => StartAsyncCopy(
Expand Down