Skip to content

Commit 0658ef4

Browse files
authored
Use archive/zip for compression (#3060)
Use stdlib's archive.zip for Zip compression. The main benefits of the other library are: - Multiple compression formats. - Additional compression algorithms on the zip format. - Able to append files to existing zip files. We are not using any of these benefits, and on the other hand it has the following problems: - Less maintained than stdlib. - Misleading defaults that may lead to don't use any compression. - Frequent false positives on security reports on formats or algorithms that we don't use.
1 parent 9e030f9 commit 0658ef4

File tree

18 files changed

+140
-303
lines changed

18 files changed

+140
-303
lines changed

cmd/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func buildCommandAction(cmd *cobra.Command, args []string) error {
8080
}
8181
logger.Debugf("Use build directory: %s", buildDir)
8282

83-
target, err := builder.BuildPackage(cmd.Context(), builder.BuildOptions{
83+
target, err := builder.BuildPackage(builder.BuildOptions{
8484
PackageRootPath: packageRoot,
8585
BuildDir: buildDir,
8686
CreateZip: createZip,

cmd/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func installCommandAction(cmd *cobra.Command, _ []string) error {
8686
return fmt.Errorf("locating repository root failed: %w", err)
8787
}
8888

89-
installer, err := installer.NewForPackage(cmd.Context(), installer.Options{
89+
installer, err := installer.NewForPackage(installer.Options{
9090
Kibana: kibanaClient,
9191
PackageRootPath: packageRootPath,
9292
SkipValidation: skipValidation,

go.mod

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ require (
2929
github.com/jedib0t/go-pretty v4.3.0+incompatible
3030
github.com/magefile/mage v1.15.0
3131
github.com/maxmind/mmdbwriter v1.1.0
32-
github.com/mholt/archives v0.1.5
3332
github.com/olekukonko/tablewriter v1.1.1
3433
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
3534
github.com/shirou/gopsutil/v3 v3.24.5
@@ -59,16 +58,11 @@ require (
5958
github.com/Pallinder/go-randomdata v1.2.0 // indirect
6059
github.com/ProtonMail/go-crypto v1.3.0 // indirect
6160
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
62-
github.com/STARRY-S/zip v0.2.3 // indirect
63-
github.com/andybalholm/brotli v1.2.0 // indirect
6461
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6562
github.com/atotto/clipboard v0.1.4 // indirect
6663
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
6764
github.com/bitfield/gotestdox v0.2.2 // indirect
6865
github.com/blang/semver/v4 v4.0.0 // indirect
69-
github.com/bodgit/plumbing v1.3.0 // indirect
70-
github.com/bodgit/sevenzip v1.6.1 // indirect
71-
github.com/bodgit/windows v1.0.1 // indirect
7266
github.com/chai2010/gettext-go v1.0.2 // indirect
7367
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
7468
github.com/charmbracelet/x/ansi v0.10.1 // indirect
@@ -81,7 +75,6 @@ require (
8175
github.com/creasty/defaults v1.8.0 // indirect
8276
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8377
github.com/dnephin/pflag v1.0.7 // indirect
84-
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
8578
github.com/elastic/gojsonschema v1.2.1 // indirect
8679
github.com/elastic/kbncontent v0.1.4 // indirect
8780
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
@@ -108,14 +101,11 @@ require (
108101
github.com/hashicorp/errwrap v1.1.0 // indirect
109102
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
110103
github.com/hashicorp/go-multierror v1.1.1 // indirect
111-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
112104
github.com/huandu/xstrings v1.5.0 // indirect
113105
github.com/inconshreveable/mousetrap v1.1.0 // indirect
114106
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
115107
github.com/josharian/intern v1.0.0 // indirect
116108
github.com/json-iterator/go v1.1.12 // indirect
117-
github.com/klauspost/compress v1.18.0 // indirect
118-
github.com/klauspost/pgzip v1.2.6 // indirect
119109
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
120110
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
121111
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -125,8 +115,6 @@ require (
125115
github.com/mattn/go-isatty v0.0.20 // indirect
126116
github.com/mattn/go-localereader v0.0.1 // indirect
127117
github.com/mattn/go-runewidth v0.0.19 // indirect
128-
github.com/mikelolasagasti/xz v1.0.1 // indirect
129-
github.com/minio/minlz v1.0.1 // indirect
130118
github.com/mitchellh/copystructure v1.2.0 // indirect
131119
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
132120
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -141,14 +129,12 @@ require (
141129
github.com/muesli/termenv v0.16.0 // indirect
142130
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
143131
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
144-
github.com/nwaples/rardecode/v2 v2.2.0 // indirect
145132
github.com/oklog/ulid v1.3.1 // indirect
146133
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
147134
github.com/olekukonko/errors v1.1.0 // indirect
148135
github.com/olekukonko/ll v0.1.2 // indirect
149136
github.com/oschwald/maxminddb-golang/v2 v2.0.0-beta.10 // indirect
150137
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
151-
github.com/pierrec/lz4/v4 v4.1.22 // indirect
152138
github.com/pkg/errors v0.9.1 // indirect
153139
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
154140
github.com/rivo/uniseg v0.4.7 // indirect
@@ -157,14 +143,12 @@ require (
157143
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
158144
github.com/shoenig/go-m1cpu v0.1.6 // indirect
159145
github.com/shopspring/decimal v1.4.0 // indirect
160-
github.com/sorairolake/lzip-go v0.3.8 // indirect
161146
github.com/spf13/afero v1.15.0 // indirect
162147
github.com/spf13/cast v1.7.0 // indirect
163148
github.com/spf13/pflag v1.0.9 // indirect
164149
github.com/stretchr/objx v0.5.2 // indirect
165150
github.com/tklauser/go-sysconf v0.3.12 // indirect
166151
github.com/tklauser/numcpus v0.6.1 // indirect
167-
github.com/ulikunitz/xz v0.5.15 // indirect
168152
github.com/x448/float16 v0.8.4 // indirect
169153
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
170154
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -175,7 +159,6 @@ require (
175159
go.mongodb.org/mongo-driver v1.11.1 // indirect
176160
go.yaml.in/yaml/v2 v2.4.2 // indirect
177161
go.yaml.in/yaml/v3 v3.0.4 // indirect
178-
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
179162
golang.org/x/crypto v0.43.0 // indirect
180163
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
181164
golang.org/x/mod v0.29.0 // indirect

0 commit comments

Comments
 (0)