Merge pull request #175 from nerdeveloper/feat/upgrade-go-1.18

refactor: upgrade go and remove deprecated APIs

.github/workflows/build-pr.yml

@@ -14,7 +14,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v1
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: run unit tests
         run: sudo pip install virtualenv && make test
       - name: build binary

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v1
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: run unit tests
         run: sudo pip install virtualenv && make test
       - name: build binary

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

acceptance_tests/lib/Helm.py

@@ -34,7 +34,7 @@ def check_helm_plugin(self):
         self.run_command('%s plugin list | grep ^cm-push' % common.HELM_EXE)
 
     def run_helm_plugin(self):
-        self.run_command('%s cm-push --help' % common.HELM_EXE)
+        self.run_command('%s cm-push --check-helm-version' % common.HELM_EXE)
 
     def remove_helm_plugin(self):
         self.run_command('%s plugin remove cm-push' % common.HELM_EXE)

cmd/helm-cm-push/main.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -102,7 +101,7 @@ func newPushCmd(args []string) *cobra.Command {
 			}
 
 			if len(args) != 2 {
-				return errors.New("This command needs 2 arguments: name of chart, name of chart repository (or repo URL)")
+				return errors.New("this command needs 2 arguments: name of chart, name of chart repository (or repo URL)")
 			}
 			p.chartName = args[0]
 			p.repoName = args[1]
@@ -128,7 +127,10 @@ func newPushCmd(args []string) *cobra.Command {
 	f.BoolVarP(&p.checkHelmVersion, "check-helm-version", "", false, `outputs either "2" or "3" indicating the current Helm major version`)
 	f.Int64VarP(&p.timeout, "timeout", "t", 30, "The duration (in seconds) Helm will wait to get response from chartmuseum")
 
-	f.Parse(args)
+	err := f.Parse(args)
+	if err != nil {
+		return nil
+	}
 
 	v2settings.AddFlags(f)
 	v2settings.Init(f)
@@ -183,7 +185,7 @@ func (p *pushCmd) setAccessTokenFromConfigFile() {
 		return
 	}
 	var c config
-	yamlFile, err := ioutil.ReadFile(configPath)
+	yamlFile, err := os.ReadFile(configPath)
 	if err != nil {
 		return
 	}
@@ -312,7 +314,7 @@ func (p *pushCmd) push() error {
 		return err
 	}
 
-	// update context path if not overrided
+	// update context path if not override
 	if p.contextPath == "" {
 		index, err := helm.GetIndexByRepo(repo, getIndexDownloader(client))
 		if err != nil {
@@ -321,11 +323,16 @@ func (p *pushCmd) push() error {
 		client.Option(cm.ContextPath(index.ServerInfo.ContextPath))
 	}
 
-	tmp, err := ioutil.TempDir("", "helm-push-")
+	tmp, err := os.MkdirTemp("", "helm-push-")
 	if err != nil {
 		return err
 	}
-	defer os.RemoveAll(tmp)
+	defer func(path string) {
+		err := os.RemoveAll(path)
+		if err != nil {
+			fmt.Printf("Failed to remove temporary directory %s: %s", path, err)
+		}
+	}(tmp)
 
 	chartPackagePath, err := helm.CreateChartPackage(chart, tmp)
 	if err != nil {
@@ -396,7 +403,7 @@ func (p *pushCmd) download(fileURL string) error {
 
 func handlePushResponse(resp *http.Response) error {
 	if resp.StatusCode != 201 && resp.StatusCode != 202 {
-		b, err := ioutil.ReadAll(resp.Body)
+		b, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return err
 		}
@@ -407,7 +414,7 @@ func handlePushResponse(resp *http.Response) error {
 }
 
 func handleDownloadResponse(resp *http.Response) error {
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	defer resp.Body.Close()
 	if err != nil {
 		return err
@@ -437,7 +444,7 @@ func getIndexDownloader(client *cm.Client) helm.IndexDownloader {
 			return nil, err
 		}
 		defer resp.Body.Close()
-		b, err := ioutil.ReadAll(resp.Body)
+		b, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return nil, err
 		}

go.mod

@@ -1,6 +1,6 @@
 module github.com/chartmuseum/helm-push
 
-go 1.17
+go 1.18
 
 require (
 	github.com/ghodss/yaml v1.0.0

pkg/chartmuseum/download_test.go

@@ -3,7 +3,7 @@ package chartmuseum
 import (
 	"crypto/tls"
 	"encoding/base64"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -16,8 +16,13 @@ func TestDownloadFile(t *testing.T) {
 			w.WriteHeader(401)
 		} else {
 			w.WriteHeader(200)
-			w.Write([]byte("hello world"))
+			_, err := w.Write([]byte("hello world"))
+			if err != nil {
+				return
+			}
+
 		}
+
 	}))
 	defer ts.Close()
 
@@ -34,7 +39,7 @@ func TestDownloadFile(t *testing.T) {
 	if err != nil {
 		t.Fatal("error downloading testfile", err)
 	}
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatal("error reading response body", err)
 	}
@@ -60,7 +65,10 @@ func TestDownloadFileFromTlsServer(t *testing.T) {
 			w.WriteHeader(401)
 		} else {
 			w.WriteHeader(200)
-			w.Write([]byte("hello world"))
+			_, err := w.Write([]byte("hello world"))
+			if err != nil {
+				return
+			}
 		}
 	}))
 	cert, err := tls.LoadX509KeyPair(testServerCertPath, testServerKeyPath)
@@ -103,7 +111,7 @@ func TestDownloadFileFromTlsServer(t *testing.T) {
 	if err != nil {
 		t.Fatalf("[with ca file] error downloading testfile: %s", err)
 	}
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("[with ca file] error reading response body: %s", err)
 	}

pkg/chartmuseum/upload.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/url"
@@ -68,6 +67,6 @@ func setUploadChartPackageRequestBody(req *http.Request, chartPackagePath string
 		return err
 	}
 	req.Header.Set("Content-Type", w.FormDataContentType())
-	req.Body = ioutil.NopCloser(&body)
+	req.Body = io.NopCloser(&body)
 	return nil
 }

pkg/helm/index.go

@@ -2,7 +2,7 @@ package helm
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 
 	"github.com/ghodss/yaml"
@@ -24,7 +24,7 @@ type (
 func GetIndexByRepo(repo *Repo, downloadIndex IndexDownloader) (*Index, error) {
 	if repo.Config.Name != "" {
 		return GetIndexByDownloader(func() ([]byte, error) {
-			return ioutil.ReadFile(filepath.Join(repo.CachePath, fmt.Sprintf("%s-index.yaml", repo.Config.Name)))
+			return os.ReadFile(filepath.Join(repo.CachePath, fmt.Sprintf("%s-index.yaml", repo.Config.Name)))
 		})
 	}
 	return GetIndexByDownloader(downloadIndex)