Skip to content

Commit f690341

Browse files
bluewwblueww
committed
[Storage] Update per review comments
1 parent 1892e0a commit f690341

File tree

3 files changed

+37
-17
lines changed

3 files changed

+37
-17
lines changed

‎src/Storage/Storage.Management.Test/ScenarioTests/StorageDataPlaneTests.ps1

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,25 @@ function Test-File
5757
Assert-AreEqual $file.Count 1
5858
Assert-AreEqual $file[0].Name $objectName1
5959

60-
Set-AzStorageFileContent -source $localSrcFile -ShareName $shareName -Path $objectName1 -PreserveSMBAttribute -Force -Context $storageContext
60+
if ($Env:OS -eq "Windows_NT")
61+
{
62+
Set-AzStorageFileContent -source $localSrcFile -ShareName $shareName -Path $objectName1 -PreserveSMBAttribute -Force -Context $storageContext
63+
}
64+
else
65+
{
66+
Set-AzStorageFileContent -source $localSrcFile -ShareName $shareName -Path $objectName1 -Force -Context $storageContext
67+
}
6168
$file = Get-AzStorageFile -ShareName $shareName -Context $storageContext
6269
Assert-AreEqual $file.Count 1
6370
Assert-AreEqual $file[0].Name $objectName1
64-
$file[0].FetchAttributes()
65-
$localFileProperties = Get-ItemProperty $localSrcFile
66-
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].Properties.CreationTime.ToUniversalTime().Ticks
67-
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].Properties.LastWriteTime.ToUniversalTime().Ticks
68-
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].Properties.NtfsAttributes.ToString()
71+
if ($Env:OS -eq "Windows_NT")
72+
{
73+
$file[0].FetchAttributes()
74+
$localFileProperties = Get-ItemProperty $localSrcFile
75+
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].Properties.CreationTime.ToUniversalTime().Ticks
76+
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].Properties.LastWriteTime.ToUniversalTime().Ticks
77+
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].Properties.NtfsAttributes.ToString()
78+
}
6979

7080
Start-AzStorageFileCopy -SrcShareName $shareName -SrcFilePath $objectName1 -DestShareName $shareName -DestFilePath $objectName2 -Force -Context $storageContext -DestContext $storageContext
7181
Get-AzStorageFileCopyState -ShareName $shareName -FilePath $objectName2 -Context $storageContext -WaitForComplete
@@ -79,14 +89,24 @@ function Test-File
7989
Assert-AreEqual $t.State "Completed"
8090
Assert-AreEqual $t.Error $null
8191
Assert-AreEqual (Get-FileHash -Path $localDestFile -Algorithm MD5).Hash (Get-FileHash -Path $localSrcFile -Algorithm MD5).Hash
82-
83-
Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -PreserveSMBAttribute -Force -Context $storageContext
92+
93+
if ($Env:OS -eq "Windows_NT")
94+
{
95+
Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -PreserveSMBAttribute -Force -Context $storageContext
96+
}
97+
else
98+
{
99+
Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -Force -Context $storageContext
100+
}
84101
Assert-AreEqual (Get-FileHash -Path $localDestFile -Algorithm MD5).Hash (Get-FileHash -Path $localSrcFile -Algorithm MD5).Hash
85-
$file = Get-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $storageContext
86-
$localFileProperties = Get-ItemProperty $localSrcFile
87-
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].Properties.CreationTime.ToUniversalTime().Ticks
88-
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].Properties.LastWriteTime.ToUniversalTime().Ticks
89-
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].Properties.NtfsAttributes.ToString()
102+
if ($Env:OS -eq "Windows_NT")
103+
{
104+
$file = Get-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $storageContext
105+
$localFileProperties = Get-ItemProperty $localSrcFile
106+
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].Properties.CreationTime.ToUniversalTime().Ticks
107+
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].Properties.LastWriteTime.ToUniversalTime().Ticks
108+
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].Properties.NtfsAttributes.ToString()
109+
}
90110

91111
Remove-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $storageContext
92112
$file = Get-AzStorageFile -ShareName $shareName -Context $storageContext

‎src/Storage/Storage/File/Cmdlet/GetAzureStorageFileContent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ await DataMovementTransferHelper.DoTransfer(() =>
203203
new DownloadOptions
204204
{
205205
DisableContentMD5Validation = !this.CheckMd5,
206-
PreserveSMBAttributes = context.PreserveSMBAttribute.IsPresent ? true : false
206+
PreserveSMBAttributes = context is null ? false : context.PreserveSMBAttribute.IsPresent
207207
},
208208
this.GetTransferContext(progressRecord, fileToBeDownloaded.Properties.Length),
209209
CmdletCancellationToken);
@@ -225,7 +225,7 @@ await DataMovementTransferHelper.DoTransfer(() =>
225225
}
226226
public object GetDynamicParameters()
227227
{
228-
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
228+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
229229
{
230230
context = new WindowsOnlyParameters();
231231
return context;

‎src/Storage/Storage/File/Cmdlet/SetAzureStorageFileContent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ await DataMovementTransferHelper.DoTransfer(() =>
133133
cloudFileToBeUploaded,
134134
new UploadOptions
135135
{
136-
PreserveSMBAttributes = context.PreserveSMBAttribute.IsPresent ? true : false
136+
PreserveSMBAttributes = context is null ? false : context.PreserveSMBAttribute.IsPresent
137137
},
138138
this.GetTransferContext(progressRecord, localFile.Length),
139139
this.CmdletCancellationToken),
@@ -235,7 +235,7 @@ private async Task<CloudFile> BuildCloudFileInstanceFromPathAsync(string default
235235

236236
public object GetDynamicParameters()
237237
{
238-
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
238+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
239239
{
240240
context = new WindowsOnlyParameters();
241241
return context;

0 commit comments

Comments
 (0)