3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-13 00:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

chore(deps): bump github.com/golangci/golangci-lint from 1.46.2 to 1.47.2 (#3499)

Browse source 
* chore(deps): bump github.com/golangci/golangci-lint

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.46.2 to 1.47.2.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/golangci/golangci-lint/compare/v1.46.2...v1.47.2)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* disable slowloris test

* fix lint

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Caleb Doxsey <cdoxsey@pomerium.com>
This commit is contained in:
dependabot[bot] 2022-07-29 09:57:12 -06:00 • committed by GitHub
parent 0ac7e45a21
commit 92a9251cde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 98 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/contextutil/contextutil_test.go
View file

@ -10,8 +10,8 @@ import (
func TestMerge(t *testing.T) {
t.Run("value", func(t *testing.T) {
ctx1 := context.WithValue(context.Background(), "key1", "value1") //nolint
ctx2 := context.WithValue(context.Background(), "key2", "value2") //nolint
ctx1 := context.WithValue(context.Background(), "key1", "value1")
ctx2 := context.WithValue(context.Background(), "key2", "value2")
ctx3, _ := Merge(ctx1, ctx2)
assert.Equal(t, "value1", ctx3.Value("key1"))
assert.Equal(t, "value2", ctx3.Value("key2"))