Fix lint issues in config_test and gitaly_integration

workhorse/cmd/gitlab-workhorse/gitaly_integration_test.go

@@ -32,6 +32,8 @@ var (
 	gitalyAddresses []string
 )
 
+const repo1 = "repo-1"
+
 // Convert from tcp://127.0.0.1:8075 to dns scheme variants:
 // * dns:127.0.0.1:8075
 // * dns:///127.0.0.1:8075
@@ -77,22 +79,22 @@ func realGitalyOkBody(t *testing.T, gitalyAddress string) *api.Response {
 	return realGitalyAuthResponse(gitalyAddress, gitOkBody(t))
 }
 
-func ensureGitalyRepository(t *testing.T, apiResponse *api.Response) error {
+func ensureGitalyRepository(_ *testing.T, apiResponse *api.Response) error {
 	ctx, repository, err := gitaly.NewRepositoryClient(context.Background(), apiResponse.GitalyServer)
 	if err != nil {
 		return err
 	}
 
 	// Remove the repository if it already exists, for consistency
-	if _, err := repository.RepositoryServiceClient.RemoveRepository(ctx, &gitalypb.RemoveRepositoryRequest{
+	if _, removeRepoErr := repository.RepositoryServiceClient.RemoveRepository(ctx, &gitalypb.RemoveRepositoryRequest{
 		Repository: &gitalypb.Repository{
 			StorageName:  apiResponse.Repository.StorageName,
 			RelativePath: apiResponse.Repository.RelativePath,
 		},
-	}); err != nil {
-		status, ok := status.FromError(err)
+	}); removeRepoErr != nil {
+		status, ok := status.FromError(removeRepoErr)
 		if !ok || !(status.Code() == codes.NotFound && status.Message() == "repository does not exist") {
-			return fmt.Errorf("remove repository: %w", err)
+			return fmt.Errorf("remove repository: %w", removeRepoErr)
 		}
 
 		// Repository didn't exist.
@@ -227,6 +229,8 @@ func TestAllowedGetGitBlob(t *testing.T) {
 			)
 
 			resp, body, err := doSendDataRequest(t, "/something", "git-blob", jsonParams)
+			defer func() { _ = resp.Body.Close() }()
+
 			require.NoError(t, err)
 			shortBody := string(body[:len(expectedBody)])
 
@@ -248,7 +252,7 @@ func TestAllowedGetGitArchive(t *testing.T) {
 			require.NoError(t, ensureGitalyRepository(t, apiResponse))
 
 			archivePath := path.Join(t.TempDir(), "my/path")
-			archivePrefix := "repo-1"
+			archivePrefix := repo1
 
 			msg := serializedProtoMessage("GetArchiveRequest", &gitalypb.GetArchiveRequest{
 				Repository: &apiResponse.Repository,
@@ -260,6 +264,8 @@ func TestAllowedGetGitArchive(t *testing.T) {
 			jsonParams := buildGitalyRPCParams(gitalyAddress, rpcArg{"ArchivePath", archivePath}, msg)
 
 			resp, body, err := doSendDataRequest(t, "/archive.tar", "git-archive", jsonParams)
+			defer func() { _ = resp.Body.Close() }()
+
 			require.NoError(t, err)
 			require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
 			requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
@@ -295,7 +301,7 @@ func TestAllowedGetGitArchiveOldPayload(t *testing.T) {
 			require.NoError(t, ensureGitalyRepository(t, apiResponse))
 
 			archivePath := path.Join(t.TempDir(), "my/path")
-			archivePrefix := "repo-1"
+			archivePrefix := repo1
 
 			jsonParams := fmt.Sprintf(
 				`{
@@ -309,6 +315,8 @@ func TestAllowedGetGitArchiveOldPayload(t *testing.T) {
 			)
 
 			resp, body, err := doSendDataRequest(t, "/archive.tar", "git-archive", jsonParams)
+			defer func() { _ = resp.Body.Close() }()
+
 			require.NoError(t, err)
 			require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
 			requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
@@ -351,6 +359,7 @@ func TestAllowedGetGitDiff(t *testing.T) {
 
 			resp, body, err := doSendDataRequest(t, "/something", "git-diff", jsonParams)
 			require.NoError(t, err)
+			defer func() { _ = resp.Body.Close() }()
 
 			require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
 			requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
@@ -380,6 +389,7 @@ func TestAllowedGetGitFormatPatch(t *testing.T) {
 
 			resp, body, err := doSendDataRequest(t, "/something", "git-format-patch", jsonParams)
 			require.NoError(t, err)
+			defer func() { _ = resp.Body.Close() }()
 
 			require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
 			requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)

workhorse/internal/config/config_test.go

@@ -52,7 +52,7 @@ func TestLoadEmptyConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Empty(t, cfg.AltDocumentRoot)
-	require.Equal(t, cfg.ImageResizerConfig.MaxFilesize, uint64(250000))
+	require.Equal(t, uint64(250000), cfg.ImageResizerConfig.MaxFilesize)
 	require.GreaterOrEqual(t, cfg.ImageResizerConfig.MaxScalerProcs, uint32(2))
 
 	require.Equal(t, ObjectStorageCredentials{}, cfg.ObjectStorageCredentials)