Skip to content

Commit 5ff4f93

Browse files
mrodmmrodm
authored
Replace archiver dependency (#2564)
As github.com/mholt/archiver has been archived, this dependency has been replaced by github.com/mholt/archives as suggested in its README.
1 parent e0e01f5 commit 5ff4f93

File tree

13 files changed

+286
-66
lines changed

13 files changed

+286
-66
lines changed

‎cmd/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func buildCommandAction(cmd *cobra.Command, args []string) error {
8282
cmd.Printf("%s file rendered: %s\n", fileName, target)
8383
}
8484

85-
target, err := builder.BuildPackage(builder.BuildOptions{
85+
target, err := builder.BuildPackage(cmd.Context(), builder.BuildOptions{
8686
PackageRoot: packageRoot,
8787
CreateZip: createZip,
8888
SignPackage: signPackage,

‎cmd/check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func setupCheckCommand() *cobraext.Command {
2323
Long: checkLongDescription,
2424
Args: cobra.NoArgs,
2525
RunE: func(cmd *cobra.Command, args []string) error {
26-
err := cobraext.ComposeCommands(args,
26+
err := cobraext.ComposeCommands(cmd, args,
2727
setupLintCommand(),
2828
setupBuildCommand(),
2929
)

‎cmd/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func installCommandAction(cmd *cobra.Command, _ []string) error {
8282
}
8383
}
8484

85-
installer, err := installer.NewForPackage(installer.Options{
85+
installer, err := installer.NewForPackage(cmd.Context(), installer.Options{
8686
Kibana: kibanaClient,
8787
RootPath: packageRootPath,
8888
SkipValidation: skipValidation,

‎docs/howto/install_package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Example of using `elastic-package install`
6666
2023/02/28 12:34:44 DEBUG data_stream/metrics/fields/fields.yml: source file hasn't been changed
6767
2023/02/28 12:34:44 DEBUG Package doesn't have to import ECS mappings
6868
2023/02/28 12:34:44 DEBUG Build zipped package
69-
2023/02/28 12:34:44 DEBUG Compress using archiver.Zip (destination: /home/user/Coding/work/integrations/build/packages/elastic_package_registry-0.0.6.zip)
69+
2023/02/28 12:34:44 DEBUG Compress using archives.Zip (destination: /home/user/Coding/work/integrations/build/packages/elastic_package_registry-0.0.6.zip)
7070
2023/02/28 12:34:44 DEBUG Create work directory for archiving: /tmp/elastic-package-2222223038/elastic_package_registry-0.0.6
7171
2023/02/28 12:34:44 DEBUG Validating built .zip package (path: /home/user/Coding/work/integrations/build/packages/elastic_package_registry-0.0.6.zip)
7272
2023/02/28 12:34:44 INFO Built package path: /home/user/Coding/work/integrations/build/packages/elastic_package_registry-0.0.6.zip

‎go.mod

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/jedib0t/go-pretty v4.3.0+incompatible
2828
github.com/magefile/mage v1.15.0
2929
github.com/maxmind/mmdbwriter v1.0.0
30-
github.com/mholt/archiver/v3 v3.5.1
30+
github.com/mholt/archives v0.1.1
3131
github.com/olekukonko/tablewriter v0.0.5
3232
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
3333
github.com/shirou/gopsutil/v3 v3.24.5
@@ -57,16 +57,20 @@ require (
5757
github.com/Pallinder/go-randomdata v1.2.0 // indirect
5858
github.com/ProtonMail/go-crypto v1.1.6 // indirect
5959
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
60-
github.com/andybalholm/brotli v1.0.4 // indirect
60+
github.com/STARRY-S/zip v0.2.1 // indirect
61+
github.com/andybalholm/brotli v1.1.1 // indirect
6162
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6263
github.com/bitfield/gotestdox v0.2.2 // indirect
6364
github.com/blang/semver/v4 v4.0.0 // indirect
65+
github.com/bodgit/plumbing v1.3.0 // indirect
66+
github.com/bodgit/sevenzip v1.6.0 // indirect
67+
github.com/bodgit/windows v1.0.1 // indirect
6468
github.com/chai2010/gettext-go v1.0.2 // indirect
6569
github.com/cloudflare/circl v1.3.7 // indirect
6670
github.com/creasty/defaults v1.8.0 // indirect
6771
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6872
github.com/dnephin/pflag v1.0.7 // indirect
69-
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
73+
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
7074
github.com/elastic/gojsonschema v1.2.1 // indirect
7175
github.com/elastic/kbncontent v0.1.4 // indirect
7276
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -84,7 +88,6 @@ require (
8488
github.com/go-openapi/strfmt v0.21.3 // indirect
8589
github.com/go-openapi/swag v0.23.0 // indirect
8690
github.com/gogo/protobuf v1.3.2 // indirect
87-
github.com/golang/snappy v0.0.4 // indirect
8891
github.com/google/btree v1.1.3 // indirect
8992
github.com/google/gnostic-models v0.6.9 // indirect
9093
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -93,14 +96,15 @@ require (
9396
github.com/hashicorp/errwrap v1.1.0 // indirect
9497
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
9598
github.com/hashicorp/go-multierror v1.1.1 // indirect
99+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
96100
github.com/huandu/xstrings v1.5.0 // indirect
97101
github.com/inconshreveable/mousetrap v1.1.0 // indirect
98102
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
99103
github.com/josharian/intern v1.0.0 // indirect
100104
github.com/json-iterator/go v1.1.12 // indirect
101105
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
102-
github.com/klauspost/compress v1.17.0 // indirect
103-
github.com/klauspost/pgzip v1.2.5 // indirect
106+
github.com/klauspost/compress v1.17.11 // indirect
107+
github.com/klauspost/pgzip v1.2.6 // indirect
104108
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
105109
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
106110
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -109,6 +113,7 @@ require (
109113
github.com/mattn/go-isatty v0.0.20 // indirect
110114
github.com/mattn/go-runewidth v0.0.14 // indirect
111115
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
116+
github.com/minio/minlz v1.0.0 // indirect
112117
github.com/mitchellh/copystructure v1.2.0 // indirect
113118
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
114119
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -120,32 +125,34 @@ require (
120125
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
121126
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
122127
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
123-
github.com/nwaples/rardecode v1.1.3 // indirect
128+
github.com/nwaples/rardecode/v2 v2.1.0 // indirect
124129
github.com/oklog/ulid v1.3.1 // indirect
125130
github.com/oschwald/maxminddb-golang v1.12.0 // indirect
126131
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
127-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
132+
github.com/pierrec/lz4/v4 v4.1.21 // indirect
128133
github.com/pkg/errors v0.9.1 // indirect
129134
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
130135
github.com/rivo/uniseg v0.4.3 // indirect
131136
github.com/russross/blackfriday/v2 v2.1.0 // indirect
132137
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
133138
github.com/shoenig/go-m1cpu v0.1.6 // indirect
134139
github.com/shopspring/decimal v1.4.0 // indirect
140+
github.com/sorairolake/lzip-go v0.3.5 // indirect
135141
github.com/spf13/afero v1.11.0 // indirect
136142
github.com/spf13/cast v1.7.0 // indirect
137143
github.com/spf13/pflag v1.0.6 // indirect
138144
github.com/stretchr/objx v0.5.2 // indirect
145+
github.com/therootcompany/xz v1.0.1 // indirect
139146
github.com/tklauser/go-sysconf v0.3.12 // indirect
140147
github.com/tklauser/numcpus v0.6.1 // indirect
141-
github.com/ulikunitz/xz v0.5.11 // indirect
148+
github.com/ulikunitz/xz v0.5.12 // indirect
142149
github.com/x448/float16 v0.8.4 // indirect
143150
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
144151
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
145-
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
146152
github.com/xlab/treeprint v1.2.0 // indirect
147153
github.com/yusufpapurcu/wmi v1.2.4 // indirect
148154
go.mongodb.org/mongo-driver v1.11.1 // indirect
155+
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
149156
golang.org/x/crypto v0.38.0 // indirect
150157
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
151158
golang.org/x/mod v0.24.0 // indirect

0 commit comments

Comments
 (0)