Minor fix

alpacanetworks · Aug 21, 2024 · fa03206 · fa03206
1 parent 89160e8
commit fa03206
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/api/ftp/ftp.go b/api/ftp/ftp.go
@@ -59,10 +59,7 @@ func UploadFile(ac *client.AlpaconClient, src []string, dest, username, groupnam
 		if err != nil {
 			return nil, err
 		}
-		err = writer.Close()
-		if err != nil {
-			return nil, err
-		}
+		defer func() { _ = writer.Close() }()
 		respBody, err := ac.SendMultipartRequest(uploadAPIURL, writer, requestBody)
 		if err != nil {
 			return nil, err
@@ -152,7 +149,7 @@ func DownloadFile(ac *client.AlpaconClient, src, dest, username, groupname strin
 			}
 		}
 
-		defer resp.Body.Close()
+		defer func() { _ = resp.Body.Close() }()
 
 		respBody, err := io.ReadAll(resp.Body)
 		if err != nil {

diff --git a/api/websh/websh.go b/api/websh/websh.go
@@ -109,7 +109,7 @@ func OpenNewTerminal(ac *client.AlpaconClient, sessionResponse SessionResponse)
 	if err != nil {
 		utils.CliError("websocket connection faiied %v", err)
 	}
-	defer wsClient.conn.Close()
+	defer func() { _ = wsClient.conn.Close() }()
 
 	err = wsClient.runWsClient()
 	if err != nil {
@@ -124,7 +124,7 @@ func (wsClient *WebsocketClient) runWsClient() error {
 	if err != nil {
 		utils.CliError("websocket connection faiild %v", err)
 	}
-	defer term.Restore(int(os.Stdin.Fd()), oldState)
+	defer func() { _ = term.Restore(int(os.Stdin.Fd()), oldState) }()
 
 	inputChan := make(chan string, 1)
 

diff --git a/client/client.go b/client/client.go
@@ -126,7 +126,7 @@ func (ac *AlpaconClient) sendRequest(req *http.Request) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	contentType := resp.Header.Get("Content-Type")
 	// Check for non-empty and non-JSON content types. Empty content type allowed for responses without content (e.g., from PATCH requests).
@@ -206,7 +206,7 @@ func (ac *AlpaconClient) SendMultipartRequest(url string, multiPartWriter *multi
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	contentType := resp.Header.Get("Content-Type")
 	// Check for non-empty and non-JSON content types. Empty content type allowed for responses without content (e.g., from PATCH requests).