Skip to content

Commit d2c45e5

Browse files
authored
Merge pull request #3849 from snyk/fix/cliv2_HMMR-547
chore: Upgrade go-httpauth to support basic auth
2 parents 1c2428e + 875f0e9 commit d2c45e5

File tree

8 files changed

+293
-278
lines changed

8 files changed

+293
-278
lines changed

cliv2/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,8 @@ whiteboxtest:
190190
@echo "$(LOG_PREFIX) Running $@"
191191
@$(GOCMD) test -cover ./...
192192

193-
.PHONY: acceptancetest
194-
acceptancetest: build
195-
TEST_SNYK_COMMAND="$(BUILD_DIR)/$(V2_EXECUTABLE_NAME)" npx jest
196-
197193
.PHONY: test
198-
test: whiteboxtest blackboxtest acceptancetest
194+
test: whiteboxtest blackboxtest
199195

200196
.PHONY: lint
201197
lint:

cliv2/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/elazarl/goproxy v0.0.0-20220328115640-894aeddb713e
77
github.com/hashicorp/go-uuid v1.0.3
8-
github.com/snyk/go-httpauth v0.0.0-20220912133144-d51219ca664d
8+
github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd
99
github.com/spf13/viper v1.13.0
1010
github.com/stretchr/testify v1.8.0
1111
)

cliv2/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
174174
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
175175
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
176176
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
177-
github.com/snyk/go-httpauth v0.0.0-20220912133144-d51219ca664d h1:dT2rfoDxGDWeplsnXWajWZcZ7zo8R6Hif3jufvkXcUE=
178-
github.com/snyk/go-httpauth v0.0.0-20220912133144-d51219ca664d/go.mod h1:v6t6wKizOcHXT3p4qKn6Bda7yNIjCQ54Xyl31NjgXkY=
177+
github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd h1:zjDhcQ642rIVI8aIjfG5uVcw+OGotQtX2l9VHe7IqCQ=
178+
github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd/go.mod h1:v6t6wKizOcHXT3p4qKn6Bda7yNIjCQ54Xyl31NjgXkY=
179179
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
180180
github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
181181
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=

cliv2/test/acceptance/proxy_authentication.spec.ts

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)