remove tmp directory (ultravioletrs#204)

Signed-off-by: Sammy Oina <[email protected]>
WashingtonKK · Aug 21, 2024 · f906593 · f906593
1 parent 899bfb0
commit f906593
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 309 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,6 @@ build
 
 build
 cmd/manager/img
-cmd/manager/iso
-cmd/manager/tmp
 
 .cov
 

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -17,7 +17,6 @@ import (
 	"github.com/absmach/magistrala/pkg/prometheus"
 	"github.com/absmach/magistrala/pkg/uuid"
 	"github.com/caarlos0/env/v11"
-	"github.com/ultravioletrs/cocos/internal"
 	"github.com/ultravioletrs/cocos/manager"
 	"github.com/ultravioletrs/cocos/manager/api"
 	managerapi "github.com/ultravioletrs/cocos/manager/api/grpc"
@@ -119,10 +118,6 @@ func main() {
 	if err := g.Wait(); err != nil {
 		logger.Error(fmt.Sprintf("%s service terminated: %s", svcName, err))
 	}
-
-	if err = internal.DeleteFilesInDir(qemuCfg.TmpFileLoc); err != nil {
-		logger.Error(err.Error())
-	}
 }
 
 func newService(logger *slog.Logger, tracer trace.Tracer, qemuCfg qemu.Config, eventsChan chan *pkgmanager.ClientStreamMessage, backendMeasurementPath string) (manager.Service, error) {

diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
diff --git a/manager/README.md b/manager/README.md
@@ -47,7 +47,6 @@ The service is configured using the environment variables from the following tab
 | MANAGER_QEMU_VSOCK_GUEST_CID               | The guest-side CID (Context ID) for the virtual socket device.                                                  | 3                            |
 | MANAGER_QEMU_VSOCK_VNC                     | Whether to enable the virtual socket device for VNC.                                                            | 0                            |
 | MANAGER_QEMU_BIN_PATH                      | The file path for the QEMU binary.                                                                              | qemu-system-x86_64           |
-| MANAGER_QEMU_TMP_FILE_LOC                  | The directory for temporary files.                                                                              | tmp                          |
 | MANAGER_QEMU_USE_SUDO                      | Whether to use sudo to run QEMU.                                                                                | false                        |
 | MANAGER_QEMU_ENABLE_SEV                    | Whether to enable Secure Encrypted Virtualization (SEV).                                                        | false                        |
 | MANAGER_QEMU_ENABLE_SEV_SNP                | Whether to enable Secure Nested Paging (SEV-SNP).                                                               | true                         |
@@ -85,7 +84,7 @@ sudo apt update
 sudo apt install qemu-kvm
 ```
 
-Create `img` directory in `cmd/manager`. Create `tmp` directory in `cmd/manager`.
+Create `img` directory in `cmd/manager`.
 
 #### Add Vsock
 The necessary kernel modules must be loaded on the hypervisor. To check if `vhost_vsock` is loaded run:

diff --git a/manager/qemu/config.go b/manager/qemu/config.go
@@ -61,7 +61,6 @@ type VSockConfig struct {
 
 type Config struct {
 	QemuBinPath  string `env:"BIN_PATH"       envDefault:"qemu-system-x86_64"`
-	TmpFileLoc   string `env:"TMP_FILE_LOC"   envDefault:"tmp"`
 	UseSudo      bool   `env:"USE_SUDO"       envDefault:"false"`
 	EnableSEV    bool   `env:"ENABLE_SEV"     envDefault:"false"`
 	EnableSEVSNP bool   `env:"ENABLE_SEV_SNP" envDefault:"true"`

diff --git a/manager/qemu/vm.go b/manager/qemu/vm.go
@@ -7,7 +7,6 @@ import (
 	"os/exec"
 
 	"github.com/gofrs/uuid"
-	"github.com/ultravioletrs/cocos/internal"
 	"github.com/ultravioletrs/cocos/manager/vm"
 	"github.com/ultravioletrs/cocos/pkg/manager"
 )
@@ -43,34 +42,6 @@ func (v *qemuVM) Start() error {
 	qemuCfg.NetDevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.NetDevConfig.ID, id)
 	qemuCfg.SevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.SevConfig.ID, id)
 
-	if !v.config.KernelHash {
-		// Copy firmware vars file
-		srcFile := qemuCfg.OVMFVarsConfig.File
-		dstFile := fmt.Sprintf("%s/%s-%s.fd", v.config.TmpFileLoc, firmwareVars, id)
-		err = internal.CopyFile(srcFile, dstFile)
-		if err != nil {
-			return err
-		}
-		qemuCfg.OVMFVarsConfig.File = dstFile
-	}
-
-	// Copy img files
-	srcFile := qemuCfg.DiskImgConfig.KernelFile
-	dstFile := fmt.Sprintf("%s/%s-%s", v.config.TmpFileLoc, KernelFile, id)
-	err = internal.CopyFile(srcFile, dstFile)
-	if err != nil {
-		return err
-	}
-	qemuCfg.DiskImgConfig.KernelFile = dstFile
-
-	srcFile = qemuCfg.DiskImgConfig.RootFsFile
-	dstFile = fmt.Sprintf("%s/%s-%s.gz", v.config.TmpFileLoc, rootfsFile, id)
-	err = internal.CopyFile(srcFile, dstFile)
-	if err != nil {
-		return err
-	}
-	qemuCfg.DiskImgConfig.RootFsFile = dstFile
-
 	exe, args, err := v.executableAndArgs()
 	if err != nil {
 		return err