Skip to content

Commit 8a8fa5d

Browse files
pchilapierrehilbertcmacknz
authored
Fix regex to locate elastic-agent .zip packages in package tests (#3908)
* Fix regex to locate elastic-agent .zip packages in package tests * fix linter errors --------- Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co> Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
1 parent ba0ea0b commit 8a8fa5d

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

dev-tools/packaging/package_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ import (
1818
"flag"
1919
"fmt"
2020
"io"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
"regexp"
2524
"strings"
2625
"testing"
2726

2827
"github.com/blakesmith/ar"
29-
rpm "github.com/cavaliercoder/go-rpm"
28+
"github.com/cavaliercoder/go-rpm"
3029
)
3130

3231
const (
@@ -85,7 +84,7 @@ func TestTar(t *testing.T) {
8584
}
8685

8786
func TestZip(t *testing.T) {
88-
zips := getFiles(t, regexp.MustCompile(`^\w+beat-\S+.zip$`))
87+
zips := getFiles(t, regexp.MustCompile(`^\w+\S+.zip$`))
8988
for _, zip := range zips {
9089
checkZip(t, zip)
9190
}
@@ -792,7 +791,7 @@ type dockerManifest struct {
792791
}
793792

794793
func readDockerManifest(r io.Reader) (*dockerManifest, error) {
795-
data, err := ioutil.ReadAll(r)
794+
data, err := io.ReadAll(r)
796795
if err != nil {
797796
return nil, err
798797
}
@@ -820,7 +819,7 @@ type dockerInfo struct {
820819
}
821820

822821
func readDockerInfo(r io.Reader) (*dockerInfo, error) {
823-
data, err := ioutil.ReadAll(r)
822+
data, err := io.ReadAll(r)
824823
if err != nil {
825824
return nil, err
826825
}

0 commit comments

Comments
 (0)