2966ef2 Refine CLI and server interactions, improve error handling · gordon

M .vscode/launch.json +1 -1


@@ -9,7 +9,7 @@
9	9		"type": "go",
10	10		"request": "launch",
11	11		"mode": "debug",
12		-	"program": "./cmd/cli/main.go",
	12	+	"program": "./main.go",
13	13		}
14	14
15	15


@@ -9,7 +9,7 @@
9		"type": "go",	9		"type": "go",
10		"request": "launch",	10		"request": "launch",
11		"mode": "debug",	11		"mode": "debug",
12	-	"program": "./cmd/cli/main.go",	12	+	"program": "./main.go",
13		}	13		}
14			14
15			15

M Makefile +1 -0

@@ -1,3 +1,4 @@
	1	+	# This Makefile is used for dev purposes
1	2		# Variables
2	3		REPO := ghcr.io/bnema/gordon
3	4		TAG := dev

@@ -1,3 +1,4 @@
		1	+	# This Makefile is used for dev purposes
1	# Variables	2		# Variables
2	REPO := ghcr.io/bnema/gordon	3		REPO := ghcr.io/bnema/gordon
3	TAG := dev	4		TAG := dev

M assets/vhs/demo_deploy.gif +0 -0 binary file: no text diff

binary file: no text diff

M assets/vhs/demo_deploy.tape +2 -2


@@ -60,10 +60,10 @@ Require curl
60	60
61	61		Set TypingSpeed 75ms
62	62		Set Shell "bash"
63		-	Set FontSize 17
	63	+	Set FontSize 16
64	64		Set FontFamily "FiraCode Nerd Font"
65	65		Set Width 1200
66		-	Set Height 300
	66	+	Set Height 350
67	67
68	68		Type "gordon"
69	69		Sleep 1


@@ -60,10 +60,10 @@ Require curl
60			60
61		Set TypingSpeed 75ms	61		Set TypingSpeed 75ms
62		Set Shell "bash"	62		Set Shell "bash"
63	-	Set FontSize 17	63	+	Set FontSize 16
64		Set FontFamily "FiraCode Nerd Font"	64		Set FontFamily "FiraCode Nerd Font"
65		Set Width 1200	65		Set Width 1200
66	-	Set Height 300	66	+	Set Height 350
67			67
68		Type "gordon"	68		Type "gordon"
69		Sleep 1	69		Sleep 1

M assets/vhs/demo_push.gif +0 -0 binary file: no text diff

binary file: no text diff

M internal/cli/cmd/deploy.go +4 -2


@@ -116,7 +116,7 @@ func exportDockerImage(imageName string) (io.ReadCloser, int64, error) {
116	116
117	117		func deployImage(a *cli.App, reader io.Reader, imageName, port, targetDomain string) error {
118	118
119		-	log.Info("Attempting to deploy...", "image", imageName, "port", port, "target_domain", targetDomain)
	119	+	log.Info("Attempting to deploy...", "image", imageName, "port", port, "target", targetDomain)
120	120
121	121		reqPayload := common.RequestPayload{
122	122		Type: "deploy",

@@ -172,6 +172,8 @@ func waitForDeployment(domain string, containerID string) error {
172	172		client := &http.Client{Timeout: 10 * time.Second}
173	173		maxRetries := 20
174	174		retryInterval := time.Second
	175	+	// shorten the container id to 12 characters
	176	+	shortContainerID := containerID[:12]
175	177
176	178		log.Info("Waiting for deployment to be reachable")
177	179		for i := 0; i < maxRetries; i++ {

@@ -181,7 +183,7 @@ func waitForDeployment(domain string, containerID string) error {
181	183		if resp.StatusCode == http.StatusOK {
182	184		log.Info("Deployment successful",
183	185		"domain", domain,
184		-	"container_id", containerID)
	186	+	"container_id", shortContainerID)
185	187		return nil
186	188		}
187	189		// Check for error messages in the response body

 func deployImage(a *cli.App, reader io.Reader, imageName, port, targetDomain string) error {
-	log.Info("Attempting to deploy...", "image", imageName, "port", port, "target_domain", targetDomain)
+	log.Info("Attempting to deploy...", "image", imageName, "port", port, "target", targetDomain)
 	reqPayload := common.RequestPayload{
 		Type: "deploy",
 	client := &http.Client{Timeout: 10 * time.Second}
 	maxRetries := 20
 	retryInterval := time.Second
+	// shorten the container id to 12 characters
+	shortContainerID := containerID[:12]
 	log.Info("Waiting for deployment to be reachable")
 	for i := 0; i < maxRetries; i++ {
 			if resp.StatusCode == http.StatusOK {
 				log.Info("Deployment successful",
 					"domain", domain,
-					"container_id", containerID)
+					"container_id", shortContainerID)
 				return nil
 			}
 			// Check for error messages in the response body

M internal/cli/cmd/push.go +12 -5


@@ -4,6 +4,7 @@ import (
4	4		"encoding/json"
5	5		"fmt"
6	6		"os"
	7	+	"strings"
7	8
8	9		"github.com/bnema/gordon/internal/cli"
9	10		"github.com/bnema/gordon/internal/cli/handler"

@@ -73,22 +74,28 @@ func pushImage(a *cli.App, imageName string) error {
73	74
74	75		resp, err := handler.SendHTTPRequest(a, &reqPayload, "POST", "/push")
75	76		if err != nil {
76		-	return fmt.Errorf("error sending HTTP request: %w", err)
	77	+	log.Error("Error sending HTTP request", "error", err)
	78	+	return err
77	79		}
78	80
79	81		var pushResponse common.PushResponse
80	82		if err := json.Unmarshal(resp.Body, &pushResponse); err != nil {
81		-	return fmt.Errorf("error parsing response: %w", err)
	83	+	log.Error("Error parsing response", "error", err)
	84	+	return err
82	85		}
83	86
84	87		if !pushResponse.Success {
85		-	return fmt.Errorf("push failed: %s", pushResponse.Message)
	88	+	log.Error("Push failed", "resp", pushResponse.Message)
	89	+	return fmt.Errorf(pushResponse.Message)
86	90		}
87	91
88		-	log.Info("Image pushed successfully", "image", imageName)
	92	+	//Remove the double quotes from the message
	93	+	message := strings.Trim(pushResponse.Message, "\"")
	94	+
	95	+	log.Info(message)
89	96
90	97		if pushResponse.CreateContainerURL != "" {
91		-	log.Info("Container creation URL:", "url", pushResponse.CreateContainerURL)
	98	+	log.Info("Container creation available", "url", pushResponse.CreateContainerURL)
92	99		}
93	100
94	101		return nil

 	"encoding/json"
 	"fmt"
 	"os"
+	"strings"
 	"github.com/bnema/gordon/internal/cli"
 	"github.com/bnema/gordon/internal/cli/handler"
 	resp, err := handler.SendHTTPRequest(a, &reqPayload, "POST", "/push")
 	if err != nil {
-		return fmt.Errorf("error sending HTTP request: %w", err)
+		log.Error("Error sending HTTP request", "error", err)
+		return err
 	}
 	var pushResponse common.PushResponse
 	if err := json.Unmarshal(resp.Body, &pushResponse); err != nil {
-		return fmt.Errorf("error parsing response: %w", err)
+		log.Error("Error parsing response", "error", err)
+		return err
 	}
 	if !pushResponse.Success {
-		return fmt.Errorf("push failed: %s", pushResponse.Message)
+		log.Error("Push failed", "resp", pushResponse.Message)
+		return fmt.Errorf(pushResponse.Message)
 	}
-	log.Info("Image pushed successfully", "image", imageName)
+	//Remove the double quotes from the message
+	message := strings.Trim(pushResponse.Message, "\"")
+	log.Info(message)
 	if pushResponse.CreateContainerURL != "" {
-		log.Info("Container creation URL:", "url", pushResponse.CreateContainerURL)
+		log.Info("Container creation available", "url", pushResponse.CreateContainerURL)
 	}
 	return nil

M internal/httpserve/handlers/cli_endpoints.go +14 -14


@@ -89,7 +89,7 @@ func PostPush(c echo.Context, a *server.App) error {
89	89
90	90		return sendJSONResponse(c, http.StatusOK, common.PushResponse{
91	91		Success: true,
92		-	Message: "Image pushed successfully",
	92	+	Message: "Image pushed and imported successfully",
93	93		CreateContainerURL: createContainerURL,
94	94		})
95	95		}

@@ -101,7 +101,7 @@ func validateAndPreparePayload(c echo.Context) (*common.PushPayload, error) {
101	101		}
102	102
103	103		if payload.ImageName == "" {
104		-	return nil, errors.New("Invalid image name")
	104	+	return nil, errors.New("invalid image name")
105	105		}
106	106
107	107		return payload, nil

@@ -116,22 +116,22 @@ func saveAndImportImage(c echo.Context, a server.App, payload common.PushPaylo
116	116
117	117		imagePath, err := store.SaveImageToStorage(&a.Config, imageFileName, imageReader)
118	118		if err != nil {
119		-	return "", fmt.Errorf("Failed to save image: %v", err)
	119	+	return "", fmt.Errorf("failed to save image: %v", err)
120	120		}
121	121
122	122		imageID, err := docker.ImportImageToEngine(imagePath)
123	123		if err != nil {
124	124		store.RemoveFromStorage(imagePath)
125		-	return "", fmt.Errorf("Failed to import image: %v", err)
	125	+	return "", fmt.Errorf("failed to import image: %v", err)
126	126		}
127	127
128	128		if imageID == "" {
129		-	return "", errors.New("Imported image ID is empty")
	129	+	return "", errors.New("imported image ID is empty")
130	130		}
131	131
132	132		err = store.RemoveFromStorage(imagePath)
133	133		if err != nil {
134		-	return "", fmt.Errorf("Failed to remove temporary image file: %v", err)
	134	+	return "", fmt.Errorf("failed to remove temporary image file: %v", err)
135	135		}
136	136
137	137		payload.ImageID = imageID

@@ -253,7 +253,7 @@ func validateAndPrepareDeployPayload(c echo.Context) (*common.DeployPayload, err
253	253		}
254	254
255	255		if payload.ImageName == "" {
256		-	return nil, errors.New("Invalid image name")
	256	+	return nil, errors.New("invalid image name")
257	257		}
258	258
259	259		payload.Port = normalizePort(payload.Port)

@@ -287,22 +287,22 @@ func saveAndImportDeployImage(c echo.Context, a server.App, payload common.Dep
287	287
288	288		imagePath, err := store.SaveImageToStorage(&a.Config, imageFileName, imageReader)
289	289		if err != nil {
290		-	return "", fmt.Errorf("Failed to save image: %v", err)
	290	+	return "", fmt.Errorf("failed to save image: %v", err)
291	291		}
292	292
293	293		imageID, err := docker.ImportImageToEngine(imagePath)
294	294		if err != nil {
295	295		store.RemoveFromStorage(imagePath)
296		-	return "", fmt.Errorf("Failed to import image: %v", err)
	296	+	return "", fmt.Errorf("failed to import image: %v", err)
297	297		}
298	298
299	299		if imageID == "" {
300		-	return "", errors.New("Imported image ID is empty")
	300	+	return "", errors.New("imported image ID is empty")
301	301		}
302	302
303	303		err = store.RemoveFromStorage(imagePath)
304	304		if err != nil {
305		-	return "", fmt.Errorf("Failed to remove temporary image file: %v", err)
	305	+	return "", fmt.Errorf("failed to remove temporary image file: %v", err)
306	306		}
307	307
308	308		payload.ImageID = imageID

@@ -313,18 +313,18 @@ func saveAndImportDeployImage(c echo.Context, a server.App, payload common.Dep
313	313		func createAndStartContainer(a server.App, payload common.DeployPayload) (string, error) {
314	314		params, err := cmdparams.FromPayloadStructToCmdParams(payload, a, payload.ImageID)
315	315		if err != nil {
316		-	return "", fmt.Errorf("Failed to create command parameters: %v", err)
	316	+	return "", fmt.Errorf("failed to create command parameters: %v", err)
317	317		}
318	318
319	319		containerID, err := docker.CreateContainer(params)
320	320		if err != nil {
321		-	return "", fmt.Errorf("Failed to create container: %v", err)
	321	+	return "", fmt.Errorf("failed to create container: %v", err)
322	322		}
323	323
324	324		err = docker.StartContainer(containerID)
325	325		if err != nil {
326	326		docker.RemoveContainer(containerID)
327		-	return "", fmt.Errorf("Failed to start container: %v", err)
	327	+	return "", fmt.Errorf("failed to start container: %v", err)
328	328		}
329	329
330	330		return containerID, nil


@@ -89,7 +89,7 @@ func PostPush(c echo.Context, a *server.App) error {
89			89
90		return sendJSONResponse(c, http.StatusOK, common.PushResponse{	90		return sendJSONResponse(c, http.StatusOK, common.PushResponse{
91		Success: true,	91		Success: true,
92	-	Message: "Image pushed successfully",	92	+	Message: "Image pushed and imported successfully",
93		CreateContainerURL: createContainerURL,	93		CreateContainerURL: createContainerURL,
94		})	94		})
95		}	95		}

@@ -101,7 +101,7 @@ func validateAndPreparePayload(c echo.Context) (*common.PushPayload, error) {
101		}	101		}
102			102
103		if payload.ImageName == "" {	103		if payload.ImageName == "" {
104	-	return nil, errors.New("Invalid image name")	104	+	return nil, errors.New("invalid image name")
105		}	105		}
106			106
107		return payload, nil	107		return payload, nil

@@ -116,22 +116,22 @@ func saveAndImportImage(c echo.Context, a server.App, payload common.PushPaylo
116			116
117		imagePath, err := store.SaveImageToStorage(&a.Config, imageFileName, imageReader)	117		imagePath, err := store.SaveImageToStorage(&a.Config, imageFileName, imageReader)
118		if err != nil {	118		if err != nil {
119	-	return "", fmt.Errorf("Failed to save image: %v", err)	119	+	return "", fmt.Errorf("failed to save image: %v", err)
120		}	120		}
121			121
122		imageID, err := docker.ImportImageToEngine(imagePath)	122		imageID, err := docker.ImportImageToEngine(imagePath)
123		if err != nil {	123		if err != nil {
124		store.RemoveFromStorage(imagePath)	124		store.RemoveFromStorage(imagePath)
125	-	return "", fmt.Errorf("Failed to import image: %v", err)	125	+	return "", fmt.Errorf("failed to import image: %v", err)
126		}	126		}
127			127
128		if imageID == "" {	128		if imageID == "" {
129	-	return "", errors.New("Imported image ID is empty")	129	+	return "", errors.New("imported image ID is empty")
130		}	130		}
131			131
132		err = store.RemoveFromStorage(imagePath)	132		err = store.RemoveFromStorage(imagePath)
133		if err != nil {	133		if err != nil {
134	-	return "", fmt.Errorf("Failed to remove temporary image file: %v", err)	134	+	return "", fmt.Errorf("failed to remove temporary image file: %v", err)
135		}	135		}
136			136
137		payload.ImageID = imageID	137		payload.ImageID = imageID

@@ -253,7 +253,7 @@ func validateAndPrepareDeployPayload(c echo.Context) (*common.DeployPayload, err
253		}	253		}
254			254
255		if payload.ImageName == "" {	255		if payload.ImageName == "" {
256	-	return nil, errors.New("Invalid image name")	256	+	return nil, errors.New("invalid image name")
257		}	257		}
258			258
259		payload.Port = normalizePort(payload.Port)	259		payload.Port = normalizePort(payload.Port)

@@ -287,22 +287,22 @@ func saveAndImportDeployImage(c echo.Context, a server.App, payload common.Dep
287			287
288		imagePath, err := store.SaveImageToStorage(&a.Config, imageFileName, imageReader)	288		imagePath, err := store.SaveImageToStorage(&a.Config, imageFileName, imageReader)
289		if err != nil {	289		if err != nil {
290	-	return "", fmt.Errorf("Failed to save image: %v", err)	290	+	return "", fmt.Errorf("failed to save image: %v", err)
291		}	291		}
292			292
293		imageID, err := docker.ImportImageToEngine(imagePath)	293		imageID, err := docker.ImportImageToEngine(imagePath)
294		if err != nil {	294		if err != nil {
295		store.RemoveFromStorage(imagePath)	295		store.RemoveFromStorage(imagePath)
296	-	return "", fmt.Errorf("Failed to import image: %v", err)	296	+	return "", fmt.Errorf("failed to import image: %v", err)
297		}	297		}
298			298
299		if imageID == "" {	299		if imageID == "" {
300	-	return "", errors.New("Imported image ID is empty")	300	+	return "", errors.New("imported image ID is empty")
301		}	301		}
302			302
303		err = store.RemoveFromStorage(imagePath)	303		err = store.RemoveFromStorage(imagePath)
304		if err != nil {	304		if err != nil {
305	-	return "", fmt.Errorf("Failed to remove temporary image file: %v", err)	305	+	return "", fmt.Errorf("failed to remove temporary image file: %v", err)
306		}	306		}
307			307
308		payload.ImageID = imageID	308		payload.ImageID = imageID

@@ -313,18 +313,18 @@ func saveAndImportDeployImage(c echo.Context, a server.App, payload common.Dep
313		func createAndStartContainer(a server.App, payload common.DeployPayload) (string, error) {	313		func createAndStartContainer(a server.App, payload common.DeployPayload) (string, error) {
314		params, err := cmdparams.FromPayloadStructToCmdParams(payload, a, payload.ImageID)	314		params, err := cmdparams.FromPayloadStructToCmdParams(payload, a, payload.ImageID)
315		if err != nil {	315		if err != nil {
316	-	return "", fmt.Errorf("Failed to create command parameters: %v", err)	316	+	return "", fmt.Errorf("failed to create command parameters: %v", err)
317		}	317		}
318			318
319		containerID, err := docker.CreateContainer(params)	319		containerID, err := docker.CreateContainer(params)
320		if err != nil {	320		if err != nil {
321	-	return "", fmt.Errorf("Failed to create container: %v", err)	321	+	return "", fmt.Errorf("failed to create container: %v", err)
322		}	322		}
323			323
324		err = docker.StartContainer(containerID)	324		err = docker.StartContainer(containerID)
325		if err != nil {	325		if err != nil {
326		docker.RemoveContainer(containerID)	326		docker.RemoveContainer(containerID)
327	-	return "", fmt.Errorf("Failed to start container: %v", err)	327	+	return "", fmt.Errorf("failed to start container: %v", err)
328		}	328		}
329			329
330		return containerID, nil	330		return containerID, nil