properly zip sigzips

Author: Emyrk

cli/add.go

@@ -2,7 +2,6 @@ package cli
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -131,14 +130,14 @@ func doAdd(ctx context.Context, source string, includeSignature bool, store stor
 			return nil, xerrors.Errorf("generate signature manifest: %w", err)
 		}
 
-		data, err := json.Marshal(sigManifest)
+		zipped, err := extensionsign.Zip(sigManifest)
 		if err != nil {
-			return nil, xerrors.Errorf("marshal signature manifest: %w", err)
+			return nil, xerrors.Errorf("zip signature manifest: %w", err)
 		}
 
 		extra = append(extra, storage.File{
 			RelativePath: "extension.sigzip",
-			Content:      data,
+			Content:      zipped,
 		})
 
 		manifest.Assets.Asset = append(manifest.Assets.Asset, storage.VSIXAsset{

internal/extensionsign/sigzip.go

@@ -0,0 +1,48 @@
+package extensionsign
+
+import (
+	"archive/zip"
+	"bytes"
+	"encoding/json"
+
+	"golang.org/x/xerrors"
+
+	"github.com/coder/code-marketplace/storage"
+)
+
+func ExtractSignatureManifest(zip []byte) (SignatureManifest, error) {
+	r, err := storage.GetZipFileReader(zip, ".signature.manifest")
+	if err != nil {
+		return SignatureManifest{}, xerrors.Errorf("get manifest: %w", err)
+	}
+
+	defer r.Close()
+	var manifest SignatureManifest
+	err = json.NewDecoder(r).Decode(&manifest)
+	if err != nil {
+		return SignatureManifest{}, xerrors.Errorf("decode manifest: %w", err)
+	}
+	return manifest, nil
+}
+
+func Zip(manifest SignatureManifest) ([]byte, error) {
+	var buf bytes.Buffer
+	w := zip.NewWriter(&buf)
+
+	manFile, err := w.Create(".signature.manifest")
+	if err != nil {
+		return nil, xerrors.Errorf("create manifest: %w", err)
+	}
+
+	err = json.NewEncoder(manFile).Encode(manifest)
+	if err != nil {
+		return nil, xerrors.Errorf("encode manifest: %w", err)
+	}
+
+	err = w.Close()
+	if err != nil {
+		return nil, xerrors.Errorf("close zip: %w", err)
+	}
+
+	return buf.Bytes(), nil
+}