Skip to content

Fix basic auth for async report #117

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
merged 1 commit into from
Feb 1, 2022
+5 −5
Merged

Fix basic auth for async report #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func main() {
}

if config.GatewayInvoke == false {
statusCode, reportErr := postReport(&client, req.Function, status, timeTaken, config.GatewayAddressURL(), credentials)
statusCode, reportErr := postReport(&client, req.Function, status, timeTaken, &config, credentials)
if reportErr != nil {
log.Printf("[#%d] Error posting report: %s\n", i, reportErr)
} else {
Expand Down Expand Up @@ -179,7 +179,7 @@ func main() {
}

if config.GatewayInvoke == false {
statusCode, reportErr := postReport(&client, req.Function, res.StatusCode, timeTaken, config.GatewayAddressURL(), credentials)
statusCode, reportErr := postReport(&client, req.Function, res.StatusCode, timeTaken, &config, credentials)
if reportErr != nil {
log.Printf("[#%d] Error posting report: %s\n", i, reportErr.Error())
} else {
Expand Down Expand Up @@ -304,18 +304,18 @@ func copyHeaders(destination http.Header, source *http.Header) {
}
}

func postReport(client *http.Client, function string, statusCode int, timeTaken float64, gatewayAddress string, credentials *auth.BasicAuthCredentials) (int, error) {
func postReport(client *http.Client, function string, statusCode int, timeTaken float64, config *QueueWorkerConfig, credentials *auth.BasicAuthCredentials) (int, error) {
req := AsyncReport{
FunctionName: function,
StatusCode: statusCode,
TimeTaken: timeTaken,
}

targetPostback := fmt.Sprintf("http://%s/system/async-report", gatewayAddress)
targetPostback := fmt.Sprintf("http://%s/system/async-report", config.GatewayAddressURL())
reqBytes, _ := json.Marshal(req)
request, err := http.NewRequest(http.MethodPost, targetPostback, bytes.NewReader(reqBytes))

if os.Getenv("basic_auth") == "true" && credentials != nil {
if config.BasicAuth && credentials != nil {
request.SetBasicAuth(credentials.User, credentials.Password)
}

Expand Down