Skip to content

fixed same condition #125

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

Merged
frikky merged 2 commits into from
Nov 30, 2024
Merged

fixed same condition #125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
715f309
fixed same condition
yashsinghcodes Nov 21, 2024
ae9e061
Merge branch 'main' into quick-fixes
frikky Nov 30, 2024
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
28 changes: 3 additions & 25 deletions shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17888,7 +17888,6 @@ func PrepareSingleAction(ctx context.Context, user User, fileId string, body []b
}
}


if runValidationAction {
log.Printf("[INFO] Running validation action for %s for org %s (%s)", app.Name, user.ActiveOrg.Name, user.ActiveOrg.Id)

Expand Down Expand Up @@ -24547,10 +24546,8 @@ func GetExternalClient(baseUrl string) *http.Client {
}
}

// Normal proxying?
if (len(httpProxy) > 0 || len(httpsProxy) > 0) && baseUrl != "http://shuffle-backend:5001" {
//client = &http.Client{}
if len(httpProxy) > 0 && httpProxy != "noproxy" {
if (len(httpProxy) > 0 || len(httpsProxy) > 0) && (strings.ToLower(httpProxy) != "noproxy" || strings.ToLower(httpsProxy) != "noproxy") {
if len(httpProxy) > 0 && strings.ToLower(httpProxy) != "noproxy" {
log.Printf("[INFO] Running with HTTP proxy %s (env: HTTP_PROXY)", httpProxy)

url_i := url.URL{}
Expand All @@ -24559,27 +24556,8 @@ func GetExternalClient(baseUrl string) *http.Client {
transport.Proxy = http.ProxyURL(url_proxy)
}
}
if len(httpsProxy) > 0 && httpsProxy != "noproxy" {
log.Printf("[INFO] Running with HTTPS proxy %s (env: HTTPS_PROXY)", httpsProxy)

url_i := url.URL{}
url_proxy, err := url_i.Parse(httpsProxy)
if err == nil {
transport.Proxy = http.ProxyURL(url_proxy)
}
}
} else {
// keeping this here for now
if len(httpProxy) > 0 && httpProxy != "noproxy" {
log.Printf("[INFO] Running with HTTP proxy %s (env: HTTP_PROXY)", httpProxy)

url_i := url.URL{}
url_proxy, err := url_i.Parse(httpProxy)
if err == nil {
transport.Proxy = http.ProxyURL(url_proxy)
}
}
if len(httpsProxy) > 0 && httpsProxy != "noproxy" {
if len(httpsProxy) > 0 && strings.ToLower(httpsProxy) != "noproxy" {
log.Printf("[INFO] Running with HTTPS proxy %s (env: HTTPS_PROXY)", httpsProxy)

url_i := url.URL{}
Expand Down
Loading