DataLakeStore - Remove ShouldContinue from adls overwrites

markcowl · markcowl · commit f514b39a9a2d · 2016-07-01T22:13:59.000-07:00
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ExportAzureRmDataLakeStoreItem.cs b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ExportAzureRmDataLakeStoreItem.cs
@@ -86,15 +86,11 @@ public override void ExecuteCmdlet()
 
             FileType type;
             ConfirmAction(
-                Force.IsPresent,
-                string.Format(Resources.OverwriteFileMessage, powerShellReadyPath),
                 VerbsData.Export,
                 Path.TransformedPath,
                 () =>
                 {
-                    if (
-                        !DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Path.TransformedPath, Account, out type) ||
-                        type != FileType.FILE)
+                    if (!DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Path.TransformedPath, Account, out type))
                     {
                         throw new CloudException(string.Format(Resources.InvalidExportPathType, Path.TransformedPath));
                     }
@@ -113,8 +109,7 @@ public override void ExecuteCmdlet()
                     }
 
                     WriteObject(powerShellReadyPath);
-                },
-                () => File.Exists(powerShellReadyPath));
+                });
         }
     }
 }
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/GetAzureRmDataLakeStoreItemContent.cs b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/GetAzureRmDataLakeStoreItemContent.cs
@@ -65,22 +65,24 @@ public FileSystemCmdletProviderEncoding Encoding
 
         public override void ExecuteCmdlet()
         {
-            long fileLength = 0;
-            byte[] byteArray;
-            fileLength = (long)DataLakeStoreFileSystemClient.GetFileStatus(Path.TransformedPath, Account).Length - Offset;
-
             ConfirmAction(
-                Force.IsPresent,
-                Resources.LargeDownloadWarning,
                 Resources.DownloadFileDataMessage,
                 Path.TransformedPath,
                 () =>
                 {
-                    using (
-                        var memStream =
-                            ((MemoryStream)
-                                DataLakeStoreFileSystemClient.PreviewFile(Path.TransformedPath, Account, Length, Offset,
-                                    CmdletCancellationToken, this)))
+                    byte[] byteArray;
+                    if (Length <= 0)
+                    {
+                        Length = (long)DataLakeStoreFileSystemClient.GetFileStatus(Path.TransformedPath, Account).Length - Offset;
+                        if (Length > 1 * 1024 * 1024 && !Force)
+                        // If content is greater than 1MB throw an error to the user to let them know they must pass in a length to preview this much content
+                        {
+                            throw new InvalidOperationException(string.Format(Resources.FilePreviewTooLarge, 1 * 1024 * 1024, Length));
+                        }
+                    }
+
+                    using (var memStream = ((MemoryStream)DataLakeStoreFileSystemClient.PreviewFile(Path.TransformedPath, Account, Length, Offset,
+                        CmdletCancellationToken, this)))
                     {
                         byteArray = memStream.ToArray();
                     }
@@ -93,8 +95,7 @@ public override void ExecuteCmdlet()
                     {
                         WriteObject(BytesToString(byteArray, Encoding));
                     }
-                },
-                () => Length <= 0 && fileLength > 1*1024*1024);
+                });
         }
     }
 }
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ImportAzureRmDataLakeStoreItem.cs b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ImportAzureRmDataLakeStoreItem.cs
@@ -97,11 +97,11 @@ public override void ExecuteCmdlet()
                             Account,
                             powerShellSourcePath,
                             CmdletCancellationToken,
-                            PerFileThreadCount,
                             ConcurrentFileCount,
+                            PerFileThreadCount,
                             Recurse,
                             Force,
-                            Resume, ForceBinary, ForceBinary, this);
+                            Resume, ForceBinary, ForceBinary, cmdletRunningRequest: this);
                     }
                     else if (File.Exists(powerShellSourcePath))
                     {
@@ -114,45 +114,13 @@ public override void ExecuteCmdlet()
                             Force,
                             Resume,
                             ForceBinary,
-                            this);
+                            cmdletRunningRequest: this);
                     }
                     else
                     {
-                        throw new FileNotFoundException(string.Format(Resources.FileOrFolderDoesNotExist,
-                            powerShellSourcePath));
+                        throw new FileNotFoundException(string.Format(Resources.FileOrFolderDoesNotExist, powerShellSourcePath));
                     }
 
-            if (Directory.Exists(powerShellSourcePath))
-            {
-                DataLakeStoreFileSystemClient.CopyDirectory(
-                    Destination.TransformedPath,
-                    Account,
-                    powerShellSourcePath,
-                    CmdletCancellationToken,
-                    ConcurrentFileCount,
-                    PerFileThreadCount,
-                    Recurse,
-                    Force,
-                    Resume, ForceBinary, ForceBinary, cmdletRunningRequest: this);
-            }
-            else if (File.Exists(powerShellSourcePath))
-            {
-                DataLakeStoreFileSystemClient.CopyFile(
-                    Destination.TransformedPath,
-                    Account,
-                    powerShellSourcePath,
-                    CmdletCancellationToken,
-                    PerFileThreadCount,
-                    Force,
-                    Resume,
-                    ForceBinary,
-                    cmdletRunningRequest: this);
-            }
-            else
-            {
-                throw new FileNotFoundException(string.Format(Resources.FileOrFolderDoesNotExist, powerShellSourcePath));
-            }
-
                     // only attempt to write output if this cmdlet hasn't been cancelled.
                     if (!CmdletCancellationToken.IsCancellationRequested && !Stopping)
                     {
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/JoinAzureRmDataLakeStoreItem.cs b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/JoinAzureRmDataLakeStoreItem.cs
@@ -55,9 +55,8 @@ public override void ExecuteCmdlet()
             FileType fileType;
             if (ShouldProcess(Destination.TransformedPath, "Join"))
             {
-                if ((DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,
-                        out fileType) && fileType == FileType.FILE) 
-                        && (Force.IsPresent || ShouldContinue(string.Format(Resources.OverwriteFileMessage, Destination.TransformedPath), "")))
+                if (Force.IsPresent && (DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,
+                        out fileType) && fileType == FileType.FILE))
                     // If it is a directory you are trying to overwrite with a concatenated file, we will error out.
                 {
                     DataLakeStoreFileSystemClient.DeleteFileOrFolder(Destination.TransformedPath, Account, false);
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/MoveAzureRmDataLakeStoreItem.cs b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/MoveAzureRmDataLakeStoreItem.cs
@@ -55,15 +55,13 @@ public override void ExecuteCmdlet()
             if (ShouldProcess(Destination.TransformedPath, VerbsCommon.Move))
             {
                 FileType fileType;
-                if (DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,
-                        out fileType)
-                        && (Force.IsPresent || ShouldContinue(string.Format(Resources.OverwriteFileMessage, Destination.TransformedPath), "")))
+                if (Force.IsPresent && DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,
+                        out fileType))
                 {
                     DataLakeStoreFileSystemClient.DeleteFileOrFolder(Destination.TransformedPath, Account, true);
                 }
 
-                if (
-                    !DataLakeStoreFileSystemClient.RenameFileOrDirectory(Path.TransformedPath, Account,
+                if (!DataLakeStoreFileSystemClient.RenameFileOrDirectory(Path.TransformedPath, Account,
                         Destination.TransformedPath))
                 {
                     throw new CloudException(

Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,11 @@ public override void ExecuteCmdlet()`
`86`	`86`
`87`	`87`	`FileType type;`
`88`	`88`	`ConfirmAction(`
`89`		`- Force.IsPresent,`
`90`		`- string.Format(Resources.OverwriteFileMessage, powerShellReadyPath),`
`91`	`89`	`VerbsData.Export,`
`92`	`90`	`Path.TransformedPath,`
`93`	`91`	`() =>`
`94`	`92`	`{`
`95`		`- if (`
`96`		`- !DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Path.TransformedPath, Account, out type) \|\|`
`97`		`- type != FileType.FILE)`
	`93`	`+ if (!DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Path.TransformedPath, Account, out type))`
`98`	`94`	`{`
`99`	`95`	`throw new CloudException(string.Format(Resources.InvalidExportPathType, Path.TransformedPath));`
`100`	`96`	`}`
`@@ -113,8 +109,7 @@ public override void ExecuteCmdlet()`
`113`	`109`	`}`
`114`	`110`
`115`	`111`	`WriteObject(powerShellReadyPath);`
`116`		`- },`
`117`		`- () => File.Exists(powerShellReadyPath));`
	`112`	`+ });`
`118`	`113`	`}`
`119`	`114`	`}`
`120`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,22 +65,24 @@ public FileSystemCmdletProviderEncoding Encoding`
`65`	`65`
`66`	`66`	`public override void ExecuteCmdlet()`
`67`	`67`	`{`
`68`		`- long fileLength = 0;`
`69`		`- byte[] byteArray;`
`70`		`- fileLength = (long)DataLakeStoreFileSystemClient.GetFileStatus(Path.TransformedPath, Account).Length - Offset;`
`71`		`-`
`72`	`68`	`ConfirmAction(`
`73`		`- Force.IsPresent,`
`74`		`- Resources.LargeDownloadWarning,`
`75`	`69`	`Resources.DownloadFileDataMessage,`
`76`	`70`	`Path.TransformedPath,`
`77`	`71`	`() =>`
`78`	`72`	`{`
`79`		`- using (`
`80`		`- var memStream =`
`81`		`- ((MemoryStream)`
`82`		`- DataLakeStoreFileSystemClient.PreviewFile(Path.TransformedPath, Account, Length, Offset,`
`83`		`- CmdletCancellationToken, this)))`
	`73`	`+ byte[] byteArray;`
	`74`	`+ if (Length <= 0)`
	`75`	`+ {`
	`76`	`+ Length = (long)DataLakeStoreFileSystemClient.GetFileStatus(Path.TransformedPath, Account).Length - Offset;`
	`77`	`+ if (Length > 1 * 1024 * 1024 && !Force)`
	`78`	`+ // If content is greater than 1MB throw an error to the user to let them know they must pass in a length to preview this much content`
	`79`	`+ {`
	`80`	`+ throw new InvalidOperationException(string.Format(Resources.FilePreviewTooLarge, 1 * 1024 * 1024, Length));`
	`81`	`+ }`
	`82`	`+ }`
	`83`	`+`
	`84`	`+ using (var memStream = ((MemoryStream)DataLakeStoreFileSystemClient.PreviewFile(Path.TransformedPath, Account, Length, Offset,`
	`85`	`+ CmdletCancellationToken, this)))`
`84`	`86`	`{`
`85`	`87`	`byteArray = memStream.ToArray();`
`86`	`88`	`}`
`@@ -93,8 +95,7 @@ public override void ExecuteCmdlet()`
`93`	`95`	`{`
`94`	`96`	`WriteObject(BytesToString(byteArray, Encoding));`
`95`	`97`	`}`
`96`		`- },`
`97`		`- () => Length <= 0 && fileLength > 110241024);`
	`98`	`+ });`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,8 @@ public override void ExecuteCmdlet()`
`55`	`55`	`FileType fileType;`
`56`	`56`	`if (ShouldProcess(Destination.TransformedPath, "Join"))`
`57`	`57`	`{`
`58`		`- if ((DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,`
`59`		`- out fileType) && fileType == FileType.FILE)`
`60`		`- && (Force.IsPresent \|\| ShouldContinue(string.Format(Resources.OverwriteFileMessage, Destination.TransformedPath), "")))`
	`58`	`+ if (Force.IsPresent && (DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,`
	`59`	`+ out fileType) && fileType == FileType.FILE))`
`61`	`60`	`// If it is a directory you are trying to overwrite with a concatenated file, we will error out.`
`62`	`61`	`{`
`63`	`62`	`DataLakeStoreFileSystemClient.DeleteFileOrFolder(Destination.TransformedPath, Account, false);`
Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,13 @@ public override void ExecuteCmdlet()`
`55`	`55`	`if (ShouldProcess(Destination.TransformedPath, VerbsCommon.Move))`
`56`	`56`	`{`
`57`	`57`	`FileType fileType;`
`58`		`- if (DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,`
`59`		`- out fileType)`
`60`		`- && (Force.IsPresent \|\| ShouldContinue(string.Format(Resources.OverwriteFileMessage, Destination.TransformedPath), "")))`
	`58`	`+ if (Force.IsPresent && DataLakeStoreFileSystemClient.TestFileOrFolderExistence(Destination.TransformedPath, Account,`
	`59`	`+ out fileType))`
`61`	`60`	`{`
`62`	`61`	`DataLakeStoreFileSystemClient.DeleteFileOrFolder(Destination.TransformedPath, Account, true);`
`63`	`62`	`}`
`64`	`63`
`65`		`- if (`
`66`		`- !DataLakeStoreFileSystemClient.RenameFileOrDirectory(Path.TransformedPath, Account,`
	`64`	`+ if (!DataLakeStoreFileSystemClient.RenameFileOrDirectory(Path.TransformedPath, Account,`
`67`	`65`	`Destination.TransformedPath))`
`68`	`66`	`{`
`69`	`67`	`throw new CloudException(`