From 1551070a28eb4f73a32520afecd815fdb2a0ba5e Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Wed, 14 Jul 2021 21:52:46 -0400 Subject: [PATCH 1/2] fix: add query support for token (self-hosted) --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index 3c1d771..96fa439 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1,2 +1,2 @@ -e4d733969fda19538f8a2b2a357701ff92a4d212 codecov +d658ba50c7e58f1f755e7333977a0390db717aea codecov 8b75c056bddd46e8dbfaa475935fbba6f6a33c77 env diff --git a/SHA256SUM b/SHA256SUM index 7e41602..c876502 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1,2 +1,2 @@ -e277ff457c867d4becb8cfcf0ee4d984a736ba79f90a2428ab9703b2385944a8 codecov +6a6c5fb57a0bfd928ad272b5f36adbd1f2fa916c817128efc0ffdcfb9d54b1e5 codecov 8d0fa7c26d1e95f361b054649a1ad6afe5e2a1a0f128289149c7227e15eefc28 env diff --git a/SHA512SUM b/SHA512SUM index c176946..7b3fd75 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1,2 +1,2 @@ -5668cf545cbd0adcbb7f3c8077a8db60244b793a768aacfe97a489c33f8d6a3677cba3ebd0e934ef0b63e230e72fc1ab3d37ac5408b204e40d9267192f7a451c codecov +333cc5669d2c5a2c121badf7a1903a995710fdf23b8550c3a80049db17109640891e1004b508642d09af08c02772799536ab7771f8cf0acb5d56e64f4620e7c0 codecov 47689572d9bcf89be411a63129a5eb95257558b5d8df6ae96a973bde6c954e9bc943f6a87c2884440abc831637b967f2da748564ff0f61d99dcf9b0a1447d1df env diff --git a/codecov b/codecov index f2a1e12..6c1fe89 100755 --- a/codecov +++ b/codecov @@ -1803,7 +1803,7 @@ else say " ${e}query:${x} $query" # Full query (to display on terminal output) - query=$(echo "package=$package-$VERSION&$query" | tr -d ' ') + query=$(echo "package=$package-$VERSION&token=$token&$query" | tr -d ' ') if [ "$ft_s3" = "1" ]; then From 9bc19f15169e2f4aa3187d4f47697775104a79e4 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Wed, 14 Jul 2021 21:55:09 -0400 Subject: [PATCH 2/2] fix: mask the token in output --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index 96fa439..5878ebe 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1,2 +1,2 @@ -d658ba50c7e58f1f755e7333977a0390db717aea codecov +7070b61784ebda10bb05046a156953aa1023dbd4 codecov 8b75c056bddd46e8dbfaa475935fbba6f6a33c77 env diff --git a/SHA256SUM b/SHA256SUM index c876502..4221473 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1,2 +1,2 @@ -6a6c5fb57a0bfd928ad272b5f36adbd1f2fa916c817128efc0ffdcfb9d54b1e5 codecov +c2059615276ccc1ddda18f4350e30b11d103c96cbd4659185dbf0e5d6548e144 codecov 8d0fa7c26d1e95f361b054649a1ad6afe5e2a1a0f128289149c7227e15eefc28 env diff --git a/SHA512SUM b/SHA512SUM index 7b3fd75..6180711 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1,2 +1,2 @@ -333cc5669d2c5a2c121badf7a1903a995710fdf23b8550c3a80049db17109640891e1004b508642d09af08c02772799536ab7771f8cf0acb5d56e64f4620e7c0 codecov +6774e73b3c96ed2d826e7728e96b3270f3d23c668eaa6cc5042efd1f911330957a95a686fe12b75880d03bcfb0350ed4cbe846c4a088ea686eb8fa1a03f04670 codecov 47689572d9bcf89be411a63129a5eb95257558b5d8df6ae96a973bde6c954e9bc943f6a87c2884440abc831637b967f2da748564ff0f61d99dcf9b0a1447d1df env diff --git a/codecov b/codecov index 6c1fe89..7b353f6 100755 --- a/codecov +++ b/codecov @@ -1804,11 +1804,12 @@ else # Full query (to display on terminal output) query=$(echo "package=$package-$VERSION&token=$token&$query" | tr -d ' ') + queryNoToken=$(echo "package=$package-$VERSION&token=&$query" | tr -d ' ') if [ "$ft_s3" = "1" ]; then say "${e}->${x} Pinging Codecov" - say "$url/upload/v4?$query" + say "$url/upload/v4?$queryNoToken" # shellcheck disable=SC2086,2090 res=$(curl $curl_s -X POST $cacert \ --retry 5 --retry-delay 2 --connect-timeout 2 \