Merge pull request #3849 from snyk/fix/cliv2_HMMR-547

chore: Upgrade go-httpauth to support basic auth
snyk · Sep 15, 2022 · d2c45e5 · d2c45e5
2 parents 1c2428e + 875f0e9
commit d2c45e5
Show file tree

Hide file tree

Showing 8 changed files with 293 additions and 278 deletions.
diff --git a/cliv2/Makefile b/cliv2/Makefile
@@ -190,12 +190,8 @@ whiteboxtest:
 	@echo "$(LOG_PREFIX) Running $@"
 	@$(GOCMD) test -cover ./...
 
-.PHONY: acceptancetest 
-acceptancetest: build
-	TEST_SNYK_COMMAND="$(BUILD_DIR)/$(V2_EXECUTABLE_NAME)" npx jest
-
 .PHONY: test
-test: whiteboxtest blackboxtest acceptancetest
+test: whiteboxtest blackboxtest
 
 .PHONY: lint
 lint:

diff --git a/cliv2/go.mod b/cliv2/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/elazarl/goproxy v0.0.0-20220328115640-894aeddb713e
 	github.com/hashicorp/go-uuid v1.0.3
-	github.com/snyk/go-httpauth v0.0.0-20220912133144-d51219ca664d
+	github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd
 	github.com/spf13/viper v1.13.0
 	github.com/stretchr/testify v1.8.0
 )

diff --git a/cliv2/go.sum b/cliv2/go.sum
@@ -174,8 +174,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/snyk/go-httpauth v0.0.0-20220912133144-d51219ca664d h1:dT2rfoDxGDWeplsnXWajWZcZ7zo8R6Hif3jufvkXcUE=
-github.com/snyk/go-httpauth v0.0.0-20220912133144-d51219ca664d/go.mod h1:v6t6wKizOcHXT3p4qKn6Bda7yNIjCQ54Xyl31NjgXkY=
+github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd h1:zjDhcQ642rIVI8aIjfG5uVcw+OGotQtX2l9VHe7IqCQ=
+github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd/go.mod h1:v6t6wKizOcHXT3p4qKn6Bda7yNIjCQ54Xyl31NjgXkY=
 github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
 github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=

diff --git a/cliv2/test/acceptance/proxy_authentication.spec.ts b/cliv2/test/acceptance/proxy_authentication.spec.ts
diff --git a/...est/fixtures/squid_environment/Dockerfile → test/fixtures/squid_environment/Dockerfile b/...est/fixtures/squid_environment/Dockerfile → test/fixtures/squid_environment/Dockerfile
diff --git a/...ures/squid_environment/docker-compose.yml → ...ures/squid_environment/docker-compose.yml b/...ures/squid_environment/docker-compose.yml → ...ures/squid_environment/docker-compose.yml
diff --git a/...xtures/squid_environment/scripts/setup.sh → ...xtures/squid_environment/scripts/setup.sh b/...xtures/squid_environment/scripts/setup.sh → ...xtures/squid_environment/scripts/setup.sh