chore(updater): move updater packages to pkg/updaters/<name>

pkg/updaters/unzip/extract.go

@@ -0,0 +1,37 @@
+package unzip
+
+import (
+	"archive/zip"
+	"bytes"
+	"io"
+	"path/filepath"
+	"strings"
+)
+
+func zipExtractAll(zipBytes []byte) (contents map[string][]byte, err error) {
+	r, err := zip.NewReader(bytes.NewReader(zipBytes), int64(len(zipBytes)))
+	if err != nil {
+		return nil, err
+	}
+	contents = map[string][]byte{}
+	for _, zf := range r.File {
+		fileName := filepath.Base(zf.Name)
+		if !strings.HasSuffix(fileName, ".ovpn") &&
+			!strings.HasSuffix(fileName, ".conf") {
+			continue
+		}
+		f, err := zf.Open()
+		if err != nil {
+			return nil, err
+		}
+		defer f.Close()
+		contents[fileName], err = io.ReadAll(f)
+		if err != nil {
+			return nil, err
+		}
+		if err := f.Close(); err != nil {
+			return nil, err
+		}
+	}
+	return contents, nil
+}

pkg/updaters/unzip/fetch.go

@@ -0,0 +1,40 @@
+package unzip
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+)
+
+func (u *Unzipper) FetchAndExtract(ctx context.Context, url string) (
+	contents map[string][]byte, err error,
+) {
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	request.Header.Set("User-Agent", "gluetun")
+
+	response, err := u.client.Do(request)
+	if err != nil {
+		return nil, err
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("HTTP status code not OK: %s: %d %s",
+			url, response.StatusCode, response.Status)
+	}
+
+	b, err := io.ReadAll(response.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := response.Body.Close(); err != nil {
+		return nil, err
+	}
+
+	return zipExtractAll(b)
+}

pkg/updaters/unzip/unzip.go

@@ -0,0 +1,15 @@
+package unzip
+
+import (
+	"net/http"
+)
+
+type Unzipper struct {
+	client *http.Client
+}
+
+func New(client *http.Client) *Unzipper {
+	return &Unzipper{
+		client: client,
+	}
+}