🔥 Clean up

pkg/cmd/rds/deploy/commands.go

@@ -1,20 +1,15 @@
 package deploy
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"code.smartsheep.studio/goatworks/roadsign/pkg/cmd/rds/conn"
 	"code.smartsheep.studio/goatworks/roadsign/pkg/sign"
 	"github.com/gofiber/fiber/v2"
-	"github.com/google/uuid"
 	"github.com/rs/zerolog/log"
-	"github.com/samber/lo"
-	"github.com/saracen/fastzip"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v2"
 )
@@ -25,8 +20,12 @@ var DeployCommands = []*cli.Command{
 		Aliases:   []string{"dp"},
 		ArgsUsage: "<server> <site> <upstream> [path]",
 		Action: func(ctx *cli.Context) error {
-			if ctx.Args().Len() < 3 {
+			if ctx.Args().Len() < 4 {
-				return fmt.Errorf("must have three arguments: <server> <site> <upstream> [path]")
+				return fmt.Errorf("must have four arguments: <server> <site> <upstream> <path>")
+			}
+
+			if !strings.HasSuffix(ctx.Args().Get(3), ".zip") {
+				return fmt.Errorf("input file must be a zip file and ends with .zip")
 			}
 
 			server, ok := conn.GetConnection(ctx.Args().Get(0))
@@ -34,67 +33,19 @@ var DeployCommands = []*cli.Command{
 				return fmt.Errorf("server was not found, use \"rds connect\" add one first")
 			}
 
-			// Prepare file to upload
-			cleanup := true
-			workdir, _ := os.Getwd()
-			var filename string
-			if ctx.Args().Len() < 3 || !strings.HasSuffix(ctx.Args().Get(3), ".zip") {
-				log.Info().Msg("Preparing file to upload, please stand by...")
-
-				dest := lo.Ternary(ctx.Args().Len() > 3, ctx.Args().Get(3), workdir)
-				filename = filepath.Join(workdir, fmt.Sprintf("rds-deploy-cache-%s.zip", uuid.NewString()))
-				out, err := os.Create(filename)
-				if err != nil {
-					return fmt.Errorf("failed to prepare file: %q", err)
-				}
-				defer out.Close()
-
-				arc, err := fastzip.NewArchiver(out, dest)
-				if err != nil {
-					return err
-				}
-				defer arc.Close()
-
-				filelist := make(map[string]os.FileInfo)
-				if err := filepath.Walk(dest, func(pathname string, info os.FileInfo, err error) error {
-					filelist[pathname] = info
-					return nil
-				}); err != nil {
-					return err
-				}
-
-				if err := arc.Archive(context.Background(), filelist); err != nil {
-					return err
-				}
-			} else if ctx.Args().Len() > 3 {
-				cleanup = false
-				filename = ctx.Args().Get(3)
-			}
-
 			// Send request
 			log.Info().Msg("Now publishing to remote server...")
 
 			url := fmt.Sprintf("/webhooks/publish/%s/%s?mimetype=%s", ctx.Args().Get(1), ctx.Args().Get(2), "application/zip")
 			client := fiber.Put(server.Url+url).
-				SendFile(filename, "attachments").
+				SendFile(ctx.Args().Get(3), "attachments").
 				MultipartForm(nil).
 				BasicAuth("RoadSign CLI", server.Credential)
 
-			var mistake error
 			if status, data, err := client.Bytes(); len(err) > 0 {
-				mistake = fmt.Errorf("failed to publish to remote: %q", err)
+				return fmt.Errorf("failed to publish to remote: %q", err)
 			} else if status != 200 {
-				mistake = fmt.Errorf("server rejected request, status code %d, response %s", status, string(data))
+				return fmt.Errorf("server rejected request, status code %d, response %s", status, string(data))
-			}
-
-			// Cleanup
-			if cleanup {
-				log.Info().Msg("Cleaning up...")
-				os.Remove(filename)
-			}
-
-			if mistake != nil {
-				return mistake
 			}
 
 			log.Info().Msg("Well done! Your site is successfully published! 🎉")