Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

storage/s3: Fix proxy with no-verify-ssl flag #457

Merged
merged 17 commits into from
Jul 20, 2022
Merged

storage/s3: Fix proxy with no-verify-ssl flag #457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4b966a2
storage/s3: Fix proxy with no-verify-ssl flag
boraberke Jul 4, 2022
afd6208
change Setenv method
boraberke Jul 4, 2022
7db028d
remove unused param
boraberke Jul 4, 2022
bc5b0af
Add comment to explain nil proxy
boraberke Jul 5, 2022
38b58ab
storage/s3: Fix proxy with no-verify-ssl flag
boraberke Jul 4, 2022
01018f7
change Setenv method
boraberke Jul 4, 2022
38e9696
remove unused param
boraberke Jul 4, 2022
c7187e6
Merge branch 'peak:master' into fix-proxy-when-used-with-no-verify-ss…
boraberke Jul 6, 2022
a4058f6
Merge branch 'fix-proxy-when-used-with-no-verify-ssl-flag' of github.…
boraberke Jul 6, 2022
fab87bc
fix test and change proxy localhost url
boraberke Jul 6, 2022
f843152
Fix suggestions
boraberke Jul 18, 2022
9b7c6d6
Update s3_fake.go
boraberke Jul 18, 2022
940b1bf
Change ParseRequestURI to Parse
boraberke Jul 18, 2022
860aada
Merge branch 'master' into fix-proxy-when-used-with-no-verify-ssl-flag
boraberke Jul 18, 2022
da3d935
Change structure of proxy_fake
boraberke Jul 19, 2022
accd2b6
Merge branch 'master' into fix-proxy-when-used-with-no-verify-ssl-flag
boraberke Jul 19, 2022
8355aec
Fix changes from the code review
boraberke Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unused param
  • Loading branch information
@boraberke
boraberke committed Jul 4, 2022
commit 7db028d2ad0883c32f0e47a4a64536c6baebc0af
2 changes: 1 addition & 1 deletion e2e/app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func TestAppProxy(t *testing.T) {
for _, tc := range testcases {
tc := tc
t.Run(tc.name, func(t *testing.T) {
httpProxy, cleanupProxy := proxyFake(t)
httpProxy, cleanupProxy := proxyFake()
defer cleanupProxy()
igungor marked this conversation as resolved.
Show resolved Hide resolved
os.Setenv("http_proxy", httpProxy)
_, s5cmd, cleanup := setup(t, withFakeProxy())
Expand Down
5 changes: 2 additions & 3 deletions e2e/proxy_fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package e2e

import (
io "io"
"io"
"log"
"net"
"net/http"
"net/http/httptest"
"strings"
"testing"
)

// Hop-by-hop headers. These are removed when sent to the backend.
Expand Down Expand Up @@ -104,7 +103,7 @@ func successfulRequests() bool {
}
return true
}
func proxyFake(t *testing.T) (string, func()) {
func proxyFake() (string, func()) {
handler := &proxy{}
proxysrv := httptest.NewServer(handler)
cleanup := func() {
Expand Down