Merge pull request #400 from Gofastasf/fix/OpenDestination-func

fix: Refactor OpenDestination func

Author: jaypipes

pkg/snapshot/pack.go

@@ -32,27 +32,22 @@ func PackFrom(snapshotName, sourceRoot string) error {
 // if the file seems to exist and have existing content already.
 // This is done to avoid accidental overwrites.
 func OpenDestination(snapshotName string) (*os.File, error) {
-	var f *os.File
-	var err error
-
-	if _, err = os.Stat(snapshotName); errors.Is(err, os.ErrNotExist) {
-		if f, err = os.Create(snapshotName); err != nil {
+	f, err := os.OpenFile(snapshotName, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+	if err != nil {
+		if !errors.Is(err, os.ErrExist) {
 			return nil, err
 		}
-	} else if err != nil {
-		return nil, err
-	} else {
-		f, err := os.OpenFile(snapshotName, os.O_WRONLY, 0600)
+		fs, err := os.Stat(snapshotName)
 		if err != nil {
 			return nil, err
 		}
-		fs, err := f.Stat()
+		if fs.Size() > 0 {
+			return nil, fmt.Errorf("file %s already exists and is of size > 0", snapshotName)
+		}
+		f, err = os.OpenFile(snapshotName, os.O_WRONLY, 0600)
 		if err != nil {
 			return nil, err
 		}
-		if fs.Size() > 0 {
-			return nil, fmt.Errorf("File %s already exists and is of size >0", snapshotName)
-		}
 	}
 	return f, nil
 }