From f6e5331a480b3c1e2529a63e5b8e9930657e1367 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 7 Jul 2021 11:54:51 +0100 Subject: [PATCH] Linting --- cmd/dendrite-upgrade-tests/main.go | 27 +++++++++++++-------------- cmd/dendrite-upgrade-tests/tar.go | 2 +- cmd/dendrite-upgrade-tests/tests.go | 12 ++++++------ 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go index e2c083e07..2c3fcf512 100644 --- a/cmd/dendrite-upgrade-tests/main.go +++ b/cmd/dendrite-upgrade-tests/main.go @@ -84,10 +84,6 @@ ENV SERVER_NAME=localhost EXPOSE 8008 8448 CMD /build/run_dendrite.sh ` -func ptr(in string) *string { - return &in -} - // downloadArchive downloads an arbitrary github archive of the form: // https://github.com/matrix-org/dendrite/archive/v0.3.11.tar.gz // and re-tarballs it without the top-level directory which contains branch information. It inserts @@ -99,6 +95,7 @@ func downloadArchive(cli *http.Client, tmpDir, archiveURL string, dockerfile []b if err != nil { return nil, err } + // nolint:errcheck defer resp.Body.Close() if resp.StatusCode != 200 { return nil, fmt.Errorf("got HTTP %d", resp.StatusCode) @@ -106,6 +103,7 @@ func downloadArchive(cli *http.Client, tmpDir, archiveURL string, dockerfile []b if err = os.Mkdir(tmpDir, os.ModePerm); err != nil { return nil, fmt.Errorf("failed to make temporary directory: %s", err) } + // nolint:errcheck defer os.RemoveAll(tmpDir) // dump the tarball temporarily, stripping the top-level directory err = extract.Archive(context.Background(), resp.Body, tmpDir, func(inPath string) string { @@ -148,6 +146,7 @@ func buildDendrite(httpClient *http.Client, dockerClient *client.Client, tmpDir, if err != nil { return "", fmt.Errorf("failed to start building image: %s", err) } + // nolint:errcheck defer res.Body.Close() decoder := json.NewDecoder(res.Body) // {"aux":{"ID":"sha256:247082c717963bc2639fc2daed08838d67811ea12356cd4fda43e1ffef94f2eb"}} @@ -197,7 +196,7 @@ func getAndSortVersionsFromGithub(httpClient *http.Client) (semVers []*semver.Ve return semVers, nil } -func calculateVersions(cli *http.Client, from, to string) ([]string, error) { +func calculateVersions(cli *http.Client, from, to string) []string { semvers, err := getAndSortVersionsFromGithub(cli) if err != nil { log.Fatalf("failed to collect semvers from github: %s", err) @@ -222,7 +221,7 @@ func calculateVersions(cli *http.Client, from, to string) ([]string, error) { if err != nil { log.Fatalf("invalid --to: %s", err) } - i := len(semvers) - 1 + var i int for i = len(semvers) - 1; i >= 0; i-- { if semvers[i].GreaterThan(toVer) { continue @@ -238,7 +237,7 @@ func calculateVersions(cli *http.Client, from, to string) ([]string, error) { if to == "HEAD" { versions = append(versions, "HEAD") } - return versions, nil + return versions } func buildDendriteImages(httpClient *http.Client, dockerClient *client.Client, baseTempDir string, concurrency int, branchOrTagNames []string) map[string]string { @@ -342,10 +341,13 @@ func runImage(dockerClient *client.Client, volumeName, version, imageID string) return baseURL, containerID, lastErr } -func destroyContainer(dockerClient *client.Client, containerID string) error { - return dockerClient.ContainerRemove(context.TODO(), containerID, types.ContainerRemoveOptions{ +func destroyContainer(dockerClient *client.Client, containerID string) { + err := dockerClient.ContainerRemove(context.TODO(), containerID, types.ContainerRemoveOptions{ Force: true, }) + if err != nil { + log.Printf("failed to remove container %s : %s", containerID, err) + } } func loadAndRunTests(dockerClient *client.Client, volumeName, v string, branchToImageID map[string]string) error { @@ -376,7 +378,7 @@ func main() { httpClient := &http.Client{ Timeout: 60 * time.Second, } - dockerClient, err := client.NewEnvClient() + dockerClient, err := client.NewClientWithOpts(client.FromEnv) if err != nil { log.Fatalf("failed to make docker client: %s", err) } @@ -384,10 +386,7 @@ func main() { flag.Usage() os.Exit(1) } - versions, err := calculateVersions(httpClient, *flagFrom, *flagTo) - if err != nil { - log.Fatalf("failed to calculate versions to build: %s", err) - } + versions := calculateVersions(httpClient, *flagFrom, *flagTo) log.Printf("Testing dendrite versions: %v\n", versions) branchToImageID := buildDendriteImages(httpClient, dockerClient, *flagTempDir, *flagBuildConcurrency, versions) diff --git a/cmd/dendrite-upgrade-tests/tar.go b/cmd/dendrite-upgrade-tests/tar.go index c05dfefa0..9eadbb3de 100644 --- a/cmd/dendrite-upgrade-tests/tar.go +++ b/cmd/dendrite-upgrade-tests/tar.go @@ -17,7 +17,7 @@ func compress(src string, buf io.Writer) error { tw := tar.NewWriter(zr) // walk through every file in the folder - filepath.Walk(src, func(file string, fi os.FileInfo, err error) error { + _ = filepath.Walk(src, func(file string, fi os.FileInfo, e error) error { // generate tar header header, err := tar.FileInfoHeader(fi, file) if err != nil { diff --git a/cmd/dendrite-upgrade-tests/tests.go b/cmd/dendrite-upgrade-tests/tests.go index a666186c7..e02af92a9 100644 --- a/cmd/dendrite-upgrade-tests/tests.go +++ b/cmd/dendrite-upgrade-tests/tests.go @@ -96,13 +96,13 @@ func runTests(baseURL, branchName string) error { }) if err != nil { // this is okay and expected if the room already exists and the aliases clash // try to join it - _, domain, err := gomatrixserverlib.SplitID('@', users[0].userID) - if err != nil { - return fmt.Errorf("failed to split user ID: %s, %s", users[0].userID, err) + _, domain, err2 := gomatrixserverlib.SplitID('@', users[0].userID) + if err2 != nil { + return fmt.Errorf("failed to split user ID: %s, %s", users[0].userID, err2) } - joinRoomResp, err := users[0].client.JoinRoom(fmt.Sprintf("#global:%s", domain), "", nil) - if err != nil { - return fmt.Errorf("alice failed to join public room: %s", err) + joinRoomResp, err2 := users[0].client.JoinRoom(fmt.Sprintf("#global:%s", domain), "", nil) + if err2 != nil { + return fmt.Errorf("alice failed to join public room: %s", err2) } publicRoomID = joinRoomResp.RoomID } else {