Use CurlRedact when Curl contains credentials

[#163530540](https://www.pivotaltracker.com/story/show/163530540)

Signed-off-by: Chris Dutra <[email protected]>

backend_compatibility/backend_compatibility.go

@@ -50,7 +50,7 @@ var _ = BackendCompatibilityDescribe("Backend Compatibility", func() {
 			token := v3_helpers.GetAuthToken()
 			uploadUrl := fmt.Sprintf("%s%s/v2/apps/%s/droplet/upload", Config.Protocol(), Config.GetApiEndpoint(), appGuid)
 			bits := fmt.Sprintf(`droplet=@%s`, dropletPath)
-			curl := helpers.Curl(Config, "-v", uploadUrl, "-X", "PUT", "-F", bits, "-H", fmt.Sprintf("Authorization: %s", token)).Wait()
+			curl := helpers.CurlRedact(token, Config, uploadUrl, "-X", "PUT", "-F", bits, "-H", fmt.Sprintf("Authorization: %s", token)).Wait()
 			Expect(curl).To(Exit(0), string(curl.Err.Contents()))
 
 			var job struct {

cats_suite_helpers/cats_suite_helpers.go

@@ -159,7 +159,6 @@ func LoggingIsolationSegmentsDescribe(description string, callback func()) bool
 	})
 }
 
-
 func ZipkinDescribe(description string, callback func()) bool {
 	return Describe("[routing]", func() {
 		BeforeEach(func() {

helpers/app_helpers/app_droplet.go

@@ -39,7 +39,7 @@ func (droplet *AppDroplet) UploadFrom(uploadPath string) {
 	token := v3_helpers.GetAuthToken()
 	uploadURL := fmt.Sprintf("%s%s/v2/apps/%s/droplet/upload", droplet.config.Protocol(), droplet.config.GetApiEndpoint(), droplet.appGuid)
 	bits := fmt.Sprintf(`droplet=@%s`, uploadPath)
-	curl := helpers.Curl(droplet.config, "-v", uploadURL, "-X", "PUT", "-F", bits, "-H", fmt.Sprintf("Authorization: %s", token)).Wait()
+	curl := helpers.CurlRedact(token, droplet.config, uploadURL, "-X", "PUT", "-F", bits, "-H", fmt.Sprintf("Authorization: %s", token)).Wait()
 	Expect(curl).To(Exit(0))
 
 	var job struct {

helpers/services/sso.go

@@ -83,7 +83,7 @@ func AuthenticateUser(authorizationEndpoint string, username string, password st
 	sessionId := jsessionRegEx.FindString(apiResponse)
 	vcapId := vcapidRegEx.FindString(apiResponse)
 	cookie = fmt.Sprintf("%v;%v", sessionId, vcapId)
-	return
+	return cookie
 }
 
 func RequestScopes(cookie string, config OAuthConfig) (authCode string, httpCode string) {

helpers/v3_helpers/v3.go

@@ -273,13 +273,13 @@ func EntitleOrgToIsolationSegment(orgGuid, isoSegGuid string) {
 func FetchRecentLogs(appGuid, oauthToken string, config config.CatsConfig) *Session {
 	loggregatorEndpoint := getHttpLoggregatorEndpoint()
 	logUrl := fmt.Sprintf("%s/apps/%s/recentlogs", loggregatorEndpoint, appGuid)
-	session := helpers.Curl(Config, logUrl, "-H", fmt.Sprintf("Authorization: %s", oauthToken))
+	session := helpers.CurlRedact(oauthToken, Config, logUrl, "-H", fmt.Sprintf("Authorization: %s", oauthToken))
 	Expect(session.Wait()).To(Exit(0))
 	return session
 }
 
 func GetAuthToken() string {
-	session := cf.Cf("oauth-token")
+	session := cf.CfSilent("oauth-token")
 	bytes := session.Wait().Out.Contents()
 	return strings.TrimSpace(string(bytes))
 }
@@ -465,7 +465,7 @@ func UnsetDefaultIsolationSegment(orgGuid string) {
 
 func UploadPackage(uploadUrl, packageZipPath, token string) {
 	bits := fmt.Sprintf(`bits=@%s`, packageZipPath)
-	curl := helpers.Curl(Config, "-v", "-s", uploadUrl, "-F", bits, "-H", fmt.Sprintf("Authorization: %s", token)).Wait()
+	curl := helpers.CurlRedact(token, Config, "-s", uploadUrl, "-F", bits, "-H", fmt.Sprintf("Authorization: %s", token)).Wait()
 	Expect(curl).To(Exit(0))
 }