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

Inherit OS stdio in curl command #147

Merged
merged 2 commits into from
Jan 15, 2023
Merged

Inherit OS stdio in curl command #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f3da00
Inherit OS stdio in curl command
timdp Jan 4, 2023
f88b900
Hide curl progress bar in integration tests
timdp Jan 9, 2023
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
12 changes: 7 additions & 5 deletions integration/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
//
// Copyright 2019 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -325,7 +324,8 @@ func Test3LOFlow(t *testing.T) {
},
{
"curl; 3lo",
[]string{"curl", "--scope", "pubsub", "--credentials", "integration/fixtures/fake-client-secrets.json", "--url", "http://localhost:8080/curl"},
[]string{"curl", "--scope", "pubsub", "--credentials", "integration/fixtures/fake-client-secrets.json", "--url", "http://localhost:8080/curl",
"--", "-s"},
"curl-3lo.golden",
false,
},
Expand Down Expand Up @@ -417,7 +417,8 @@ func Test3LOLoopbackFlow(t *testing.T) {
"curl; 3lo loopback",
[]string{"curl", "--scope", "pubsub", "--credentials", "integration/fixtures/fake-client-secrets-3lo-loopback.json", "--url", "http://localhost:8080/curl",
"--consentPageInteractionTimeout", CONSENT_PAGE_TIMEOUT, "--consentPageInteractionTimeoutUnits", CONSENT_PAGE_TIMEOUT_UNITS,
"--disableAutoOpenConsentPage"},
"--disableAutoOpenConsentPage",
"--", "-s"},
"curl-3lo-loopback.golden",
false,
},
Expand Down Expand Up @@ -588,7 +589,8 @@ func Test2LOFlow(t *testing.T) {
},
{
"curl; 2lo",
[]string{"curl", "--scope", "pubsub", "--credentials", "integration/fixtures/fake-service-account.json", "--url", "http://localhost:8080/curl"},
[]string{"curl", "--scope", "pubsub", "--credentials", "integration/fixtures/fake-service-account.json", "--url", "http://localhost:8080/curl",
"--", "-s"},
"curl-2lo.golden",
false,
},
Expand Down
10 changes: 5 additions & 5 deletions util/curl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package util

import (
"bytes"
"fmt"
"os"
"os/exec"
)

Expand All @@ -33,11 +33,11 @@ func CurlCommand(cli string, header string, url string, extraArgs ...string) {
cmdArgs := append(requiredArgs, extraArgs...)

cmd := exec.Command(cli, cmdArgs...)
var out bytes.Buffer
cmd.Stdout = &out
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
fmt.Println(err)
fmt.Fprintln(os.Stderr, err)
}
print(out.String())
}