chore: remove problematic restore options

Author: MarcStdt

cmd/restore.go

@@ -10,7 +10,6 @@ import (
 )
 
 var tempDir string
-var skipSafety bool
 
 var RestoreCmd = &cobra.Command{
 	Use:   "restore",
@@ -28,16 +27,12 @@ var RestoreCmd = &cobra.Command{
 
 		snapshotService := snapshotServices.NewSnapshotService()
 
-		options := ports.RestoreSnapshotOptions{
-			Safe:    !skipSafety,
-			TempDir: tempDir,
-		}
+		options := ports.RestoreSnapshotOptions{}
 
 		return snapshotService.RestoreSnapshot(scrollService.GetCwd(), source, options)
 	},
 }
 
 func init() {
 	RestoreCmd.Flags().StringVarP(&tempDir, "temp-dir", "", "", "Temporary directory where to move the soon to be deleted files to. Files will be restored, in case an error occured while fetching / extracting the snapshot. Only works when --skip-safety is not set.")
-	RestoreCmd.Flags().BoolVarP(&skipSafety, "skip-safety", "", false, "Skips the renaming of the soon to be deleted files. If set the original state will NOT be recovered, if an error happens during fetching / extracting of the snapshot.")
 }

cmd/serve.go

@@ -381,9 +381,7 @@ func initScroll(scrollService *services.ScrollService, snapshotService ports.Sna
 
 		if initSnapshotUrl != "" {
 			logger.Log().Info("Starting restore process")
-			err := snapshotService.RestoreSnapshot(scrollService.GetCwd(), initSnapshotUrl, ports.RestoreSnapshotOptions{
-				Safe: false,
-			})
+			err := snapshotService.RestoreSnapshot(scrollService.GetCwd(), initSnapshotUrl, ports.RestoreSnapshotOptions{})
 
 			if err != nil {
 				return false, err

docs/docs.go

@@ -257,7 +257,10 @@ const docTemplate = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/domain.AugmentedPort"
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/domain.AugmentedPort"
+                            }
                         }
                     }
                 }

docs/swagger.json

@@ -249,7 +249,10 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/domain.AugmentedPort"
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/domain.AugmentedPort"
+                            }
                         }
                     }
                 }

docs/swagger.yaml

@@ -473,7 +473,9 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/domain.AugmentedPort'
+            items:
+              $ref: '#/definitions/domain.AugmentedPort'
+            type: array
       summary: Get ports from scroll with additional information
       tags:
       - port

internal/core/ports/services_ports.go

@@ -133,8 +133,6 @@ type ColdStarterInterface interface {
 }
 
 type RestoreSnapshotOptions struct {
-	Safe    bool
-	TempDir string
 }
 
 type S3Destination struct {

internal/core/services/snapshot/restore_service.go

@@ -144,7 +144,9 @@ func (rc *SnapshotService) RestoreSnapshot(dir string, source string, options po
 
 	progressReader := &ProgressTracker{}
 
-	dest := path.Join(dir, ".snap_dl")
+	tmpDir := os.TempDir()
+	dest := path.Join(tmpDir, ".snap_dl")
+
 	os.RemoveAll(dest)
 	defer os.RemoveAll(dest)
 
@@ -160,30 +162,11 @@ func (rc *SnapshotService) RestoreSnapshot(dir string, source string, options po
 		return fmt.Errorf("failed to validate source: %w", err)
 	}
 
-	temDir := options.TempDir
-	if temDir == "" {
-		temDir = dir + "-bck"
-	}
-
-	//move dir if possible
 	if _, err := os.Stat(dir); err == nil {
-		if options.Safe {
-			logger.Log().Info("Moving folder to make space for backup", zap.String("dir", dir), zap.String("backup_dir", dir+"-bck"))
-
-			err := os.MkdirAll(temDir, 0755)
-			if err != nil {
-				return err
-			}
-			err = utils.MoveContents(dir, temDir)
-			if err != nil {
-				return err
-			}
-		} else {
-			logger.Log().Info("Removing folder to make space for backup", zap.String("dir", dir))
-			err := utils.RemoveContents(dir)
-			if err != nil {
-				return err
-			}
+		logger.Log().Info("Removing folder to make space for backup", zap.String("dir", dir))
+		err := utils.RemoveContents(dir)
+		if err != nil {
+			return err
 		}
 	}
 
@@ -197,13 +180,6 @@ func (rc *SnapshotService) RestoreSnapshot(dir string, source string, options po
 	if err != nil {
 		os.RemoveAll(dest)
 		logger.Log().Error("Error occured while getting backup", zap.Error(err))
-		if options.Safe {
-			logger.Log().Warn("Restoring old state, as error occured while getting backup", zap.Error(err))
-			errRename := os.Rename(temDir, dir)
-			if errRename != nil {
-				return errRename
-			}
-		}
 		return err
 	}
 
@@ -214,7 +190,7 @@ func (rc *SnapshotService) RestoreSnapshot(dir string, source string, options po
 	}
 
 	logger.Log().Info("Backup restored", zap.String("source", source), zap.String("destination", dir))
-	return os.RemoveAll(temDir)
+	return nil
 }
 
 func (rc *SnapshotService) createTarGz(rootPath, target string) error {

internal/handler/port_handler.go

@@ -22,7 +22,7 @@ func NewPortHandler(
 // @Tags port, druid, daemon
 // @Accept */*
 // @Produce json
-// @Success 200 {object} domain.AugmentedPort
+// @Success 200 {object} []domain.AugmentedPort
 // @Router /api/v1/ports [get]
 func (p PortHandler) GetPorts(c *fiber.Ctx) error {
 	augmentedPorts := p.portService.GetPorts()