Fix argo message and close body for node

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
alexellis · Apr 29, 2024 · 64200e7 · 64200e7
1 parent 083e628
commit 64200e7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/cmd/apps/argocd_app.go b/cmd/apps/argocd_app.go
@@ -56,8 +56,8 @@ func MakeInstallArgoCD() *cobra.Command {
 }
 
 const ArgoCDInfoMsg = `
-# Get the ArgoCD CLI
-arkade install argocd
+# Install the "argocd" CLI:
+arkade get argocd
 
 # Port-forward the ArgoCD API server
 kubectl port-forward svc/argocd-server -n argocd 8443:443 &

diff --git a/cmd/system/containerd.go b/cmd/system/containerd.go
@@ -150,14 +150,19 @@ func MakeInstallContainerd() *cobra.Command {
 				return err
 			}
 
-			content, err := io.ReadAll(response.Body)
+			defer response.Body.Close()
+
+			body, err := io.ReadAll(response.Body)
 			if err != nil {
 				return err
 			}
+			if response.StatusCode != http.StatusOK {
+				return fmt.Errorf("error fetching systemd unit file, status code: %d, body: %s", response.StatusCode, string(body))
+			}
 
-			content = bytes.ReplaceAll(content, []byte("/usr/local/bin/containerd"), []byte(installPath+"/containerd"))
+			body = bytes.ReplaceAll(body, []byte("/usr/local/bin/containerd"), []byte(installPath+"/containerd"))
 
-			if err := createSystemdUnit(systemdUnitName, content); err != nil {
+			if err := createSystemdUnit(systemdUnitName, body); err != nil {
 				return err
 			}
 		}

diff --git a/cmd/system/go.go b/cmd/system/go.go
@@ -121,16 +121,17 @@ func getGoVersion() (string, error) {
 		return "", err
 	}
 
-	if res.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("unexpected status code: %d", res.StatusCode)
-	}
 	if res.Body == nil {
 		return "", fmt.Errorf("unexpected empty body")
 	}
 
 	defer res.Body.Close()
 	body, _ := io.ReadAll(res.Body)
 
+	if res.StatusCode != http.StatusOK {
+		return "", fmt.Errorf("unexpected status code: %d", res.StatusCode)
+	}
+
 	content := strings.TrimSpace(string(body))
 	version, _, ok := strings.Cut(content, "\n")
 	if !ok {

diff --git a/cmd/system/node.go b/cmd/system/node.go
@@ -29,10 +29,19 @@ func getLatestNodeVersion(version, channel string) (*string, error) {
 		return nil, err
 	}
 
+	if res.Body != nil {
+		defer res.Body.Close()
+	}
+
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}
+
+	if res.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("could not find latest version for %s, (%d), body: %s", version, res.StatusCode, string(body))
+	}
+
 	regex := regexp.MustCompile(`(?m)node-v(\d+.\d+.\d+)-linux-.*`)
 	result := regex.FindStringSubmatch(string(body))