Merge remote-tracking branch 'origin/main' into impersonation-proxy

This commit is contained in:
Margo Crawford 2021-03-24 17:22:40 -07:00
commit 6bf8bfe9a8
3 changed files with 66 additions and 0 deletions

View File

@ -0,0 +1 @@
<svg width="2390" height="600" viewBox="0 0 2390 600" xmlns="http://www.w3.org/2000/svg"><title>Logo text</title><g fill="none" fill-rule="evenodd"><g fill-rule="nonzero"><path d="M282.663 541.603L99.75 435.998a35.108 35.108 0 0 1-17.555-30.405v-211.21a35.108 35.108 0 0 1 17.555-30.408L282.663 58.37a35.114 35.114 0 0 1 35.11 0l182.914 105.605a35.111 35.111 0 0 1 17.555 30.407v211.21a35.11 35.11 0 0 1-17.555 30.406L317.772 541.603a35.108 35.108 0 0 1-35.109 0" fill="#1B2B39"/><path d="M285.377 441.852l13.7 42.117c.304.928 1.616.928 1.917 0l13.7-42.117c16.924-1.718 33.205-6.404 48.23-13.804l15.837 14.25a.505.505 0 0 0 .83-.478l-4.373-20.608a143.649 143.649 0 0 0 25.595-20.363c8.39-8.39 15.605-17.642 21.562-27.556l21.646 4.593a.503.503 0 0 0 .479-.83l-15.166-16.855c6.612-14.197 10.836-29.46 12.463-45.286l42.682-13.884c.928-.303.928-1.615 0-1.916l-42.682-13.885c-2.223-21.624-9.293-42.194-20.68-60.433-3.147-5.038-10.172-5.829-14.372-1.629a9.228 9.228 0 0 0-1.315 11.404c12.083 19.37 18.979 42.293 18.723 66.812C423.457 368.39 369.07 423.1 302.07 424.18c-24.345.392-47.137-6.27-66.472-18.065a9.223 9.223 0 0 0-11.323 1.364c-4.22 4.22-3.404 11.296 1.692 14.406 17.99 10.987 38.194 17.811 59.41 19.967z" fill="#FFF"/><path d="M322.48 324.576L412.257 188.6c1.632-2.473-1.314-5.397-3.776-3.748l-135.15 90.608-90.518 135.215c-1.648 2.462 1.28 5.406 3.751 3.772l135.916-89.87z" fill="#1698CB"/><path d="M178.216 226.107l-20.927-4.44a.503.503 0 0 0-.479.83l14.599 16.224a142.872 142.872 0 0 0-13.123 46.623l-42.33 13.77c-.927.303-.927 1.615 0 1.916l42.308 13.763c2.024 19.836 8.13 38.786 17.901 55.867 3.007 5.255 10.212 6.176 14.493 1.895l.032-.03c2.96-2.96 3.518-7.523 1.446-11.16-10.264-17.994-16.16-38.789-16.223-60.931-.196-68.29 55.435-124.268 123.724-124.484 21.972-.07 42.639 5.604 60.584 15.597 3.635 2.024 8.16 1.445 11.103-1.497l.001-.002c4.35-4.349 3.299-11.632-2.076-14.626-16.722-9.32-35.19-15.154-54.496-17.123l-13.758-42.295c-.303-.928-1.615-.928-1.916 0l-13.759 42.294c-18.673 1.903-36.563 7.42-52.847 16.211l-16.353-14.716a.504.504 0 0 0-.83.48l4.642 21.873a144.308 144.308 0 0 0-22.408 18.917 141.889 141.889 0 0 0-19.308 25.044z" fill="#FFF"/></g><path d="M865.417 433l-97.66-174.04 77.9-91.96h-64.22l-74.48 90.82c-7.22 8.74-17.1 20.9-20.9 26.98.38-8.36.76-32.3.76-42.18V167h-53.2v266h53.2v-78.28l42.56-50.16 72.2 128.44h63.84zm200.083 0V233.5h-52.44v109.06c0 34.58-12.54 45.22-34.2 45.22-21.66 0-33.82-10.64-33.82-46.36V233.5H892.6v112.48c0 56.24 22.8 91.2 73.72 91.2 20.9 0 37.62-7.98 46.74-17.48V433h52.44zm219.083-97.28c0 59.66-28.12 101.46-77.52 101.46-17.48 0-32.68-6.84-42.18-15.58V433h-52.44V182.2l52.44-26.22v90.06c9.88-8.74 23.18-16.72 42.18-16.72 42.56 0 77.52 31.92 77.52 106.4zm-53.2 1.14c0-41.04-13.68-58.14-34.2-58.14-16.34 0-24.7 6.84-32.3 16.72v75.24c7.98 11.02 20.14 17.1 35.34 17.1 20.14 0 31.16-17.48 31.16-50.92zm253.284-3.42c0 7.6-.38 12.92-.76 16.72h-119.32c1.9 27.36 22.04 37.62 41.04 37.62 14.44 0 26.6-5.32 34.2-14.06l37.24 31.16c-15.96 20.52-44.84 32.3-71.44 32.3-57.38 0-93.86-40.66-93.86-103.74 0-61.18 38.38-104.12 88.92-104.12 53.2 0 83.98 47.12 83.98 104.12zm-50.92-22.8c-1.52-17.86-12.16-35.72-35.72-35.72-19 0-30.78 15.58-32.68 35.72h68.4zM1684.75 433h-52.44v-13.3c-9.5 9.88-26.22 17.48-44.84 17.48-37.24 0-74.48-22.8-74.48-71.06 0-44.08 35.72-66.12 80.94-66.12 18.24 0 30.02 3.8 38.38 7.98v-9.88c0-14.06-9.5-25.46-28.5-25.46-23.94 0-36.48 3.42-54.72 13.3l-20.14-36.48c23.18-13.3 42.56-20.14 74.86-20.14 48.26 0 80.94 25.08 80.94 69.92V433zm-52.44-58.52V349.4c-9.12-5.7-17.86-8.36-36.48-8.36-19.76 0-30.4 9.12-30.4 25.08 0 14.06 7.98 26.6 30.4 26.6 17.1 0 30.78-8.74 36.48-18.24zm269.623-38.76c0 59.66-28.12 101.46-77.52 101.46-17.48 0-32.68-6.84-42.18-15.58v58.52l-52.44 26.22V233.5h52.44v12.54c9.88-8.74 23.18-16.72 42.18-16.72 42.56 0 77.52 31.92 77.52 106.4zm-53.2 1.14c0-41.04-13.68-58.14-34.2-58.14-16.34 0-24.7 6.84-32.3 16.72v75.24c7.98 11.02 20.14 17.1 35.34 17.1 20.14 0 31.16-17.48 31.16-50.92zm262.784-1.14c0 59.66-28.12 101.46-77.52 101.46-17.48 0-32.68-6.84-42.18-15.58v58.52l-52.44 26.22V233.5h52.44v12.54c9.88-8.74 23.18-16.72 42.18-16.72 42.56 0 77.52 31.92 77.52 106.4zm-53.2 1.14c0-41.04-13.68-58.14-34.2-58.14-16.34 0-24.7 6.84-32.3 16.72v75.24c7.98 11.02 20.14 17.1 35.34 17.1 20.14 0 31.16-17.48 31.16-50.92zm248.343 38c0-39.9-30.78-52.82-66.5-64.6-35.34-11.4-41.42-14.82-41.42-23.18 0-8.74 5.7-12.92 26.98-12.92 16.72 0 38.38 5.32 58.14 15.96l16.72-41.42c-21.28-11.78-48.64-19.38-73.72-19.38-46.74 0-79.8 17.86-79.8 59.28 0 42.18 30.78 53.96 78.66 68.4 22.04 6.46 29.26 11.02 29.26 20.14 0 10.26-6.08 15.2-26.6 15.2-25.46 0-47.88-6.46-69.16-18.24l-17.48 39.9c21.28 14.06 52.06 23.18 83.6 23.18 44.84 0 81.32-16.34 81.32-62.32z" fill="#1B2B39"/></g></svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 278.8 77" style="enable-background:new 0 0 278.8 77;" xml:space="preserve">
<style type="text/css">
.st0{fill:#238FCF;}
.st1{fill:#1BBFD3;}
.st2{fill:#79BF43;}
.st3{fill:#1D4489;}
</style>
<g>
<g>
<path class="st0" d="M54.1,57.3H37.2c-0.7,0-1.3-0.3-1.7-0.8L24.9,43.2c-0.4-0.5-0.6-1.2-0.4-1.9l4.1-16.3
c0.2-0.6,0.6-1.1,1.1-1.4l15-7.5c0.6-0.3,1.3-0.3,1.9,0l15.2,7.5c0.6,0.3,1,0.8,1.2,1.5l3.9,16.3c0.2,0.7,0,1.3-0.4,1.9L55.8,56.5
C55.3,57,54.7,57.3,54.1,57.3z M37.3,55.1H54l10.7-13.3l-3.9-16.3L45.7,18l-15,7.5l-4,16.3L37.3,55.1z"/>
<g>
<polygon class="st1" points="65,20.5 66.9,18.9 46.8,9 46.8,11.5 "/>
<polygon class="st2" points="20.9,43.9 18.5,44.4 32.5,62 33.6,59.8 "/>
<polygon class="st1" points="44.6,11.5 44.6,9 24.7,18.9 26.6,20.5 "/>
<polygon class="st3" points="25.3,22.4 23.3,20.7 18,42.2 20.5,41.7 "/>
<polygon class="st3" points="70.9,41.7 73.4,42.2 68.3,20.7 66.4,22.3 "/>
<polygon class="st2" points="70.4,43.9 57.6,59.8 58.7,62 72.9,44.4 "/>
<polygon class="st1" points="35.6,60.7 34.5,63 56.7,63 55.6,60.7 "/>
</g>
</g>
<g>
<path d="M107.7,26.5l-7.1,16.5H98l-7.1-16.5h2.7l5.8,13.4l5.7-13.4H107.7z"/>
<path d="M110.8,26.5h2.4l5.8,10.8l5.8-10.8h2.4v16.5h-2.4V31.2L119,42l-5.8-10.8v11.7h-2.4V26.5z"/>
<path d="M130,30.5h2.4l2.8,9.2l3.1-9.2h2l3.1,9.2l2.9-9.2h2.4l-4.2,12.4h-2.2l-3-9.2l-3,9.2h-2.2L130,30.5z"/>
<path d="M159.5,31.7c0.9,0.9,1.4,2.2,1.4,3.8v7.5h-2.3v-1.7c-0.4,0.6-1,1.1-1.8,1.5c-0.8,0.3-1.5,0.5-2.3,0.5
c-1.3,0-2.4-0.4-3.3-1.1s-1.3-1.7-1.3-2.9c0-0.8,0.2-1.5,0.7-2.1c0.4-0.6,1-1.1,1.8-1.5c0.8-0.3,1.6-0.5,2.5-0.5
c1.2,0,2.4,0.2,3.7,0.7v-0.4c0-0.9-0.2-1.7-0.7-2.3s-1.3-0.9-2.4-0.9c-1,0-2.1,0.3-3.5,1l-0.9-1.8c1.7-0.8,3.2-1.2,4.7-1.2
C157.4,30.2,158.6,30.7,159.5,31.7z M157.2,40.7c0.7-0.4,1.2-1,1.3-1.7v-1.7c-1.1-0.3-2.2-0.5-3.4-0.5c-0.8,0-1.6,0.2-2.2,0.6
s-0.9,1-0.9,1.6c0,0.7,0.3,1.2,0.8,1.6c0.5,0.4,1.2,0.6,2,0.6C155.8,41.4,156.5,41.2,157.2,40.7z"/>
<path d="M168.7,31c0.8-0.5,1.7-0.7,2.8-0.7v2.1c-0.9,0-1.7,0.2-2.4,0.5c-0.7,0.3-1.2,0.8-1.6,1.4c-0.4,0.6-0.6,1.3-0.6,2.1v6.6
h-2.4V30.5h2.4V33C167.3,32.1,167.9,31.5,168.7,31z"/>
<path d="M181.8,40.9c0.7-0.3,1.2-0.6,1.6-1l1.4,1.5c-0.5,0.6-1.3,1-2.2,1.4c-1,0.4-1.9,0.5-2.8,0.5c-1.1,0-2.2-0.3-3.2-0.8
c-1-0.6-1.8-1.3-2.4-2.3c-0.6-1-0.9-2.1-0.9-3.3c0-1.2,0.3-2.3,0.8-3.3c0.6-1,1.3-1.8,2.3-2.3c1-0.6,2-0.8,3.1-0.8
c1.2,0,2.3,0.3,3.2,0.9c0.9,0.6,1.6,1.4,2.1,2.5s0.7,2.4,0.7,3.8h-9.9c0.1,1.1,0.6,2,1.3,2.7c0.7,0.7,1.6,1,2.7,1
C180.4,41.3,181.1,41.1,181.8,40.9z M177.1,33.2c-0.7,0.6-1.2,1.5-1.4,2.6h7.6c-0.1-1-0.5-1.9-1.1-2.5c-0.6-0.7-1.5-1-2.5-1
C178.6,32.2,177.8,32.5,177.1,33.2z"/>
<path d="M199.1,28.7h-5.4v-2.3h13.2v2.3h-5.4v14.2h-2.4V28.7z"/>
<path d="M218,31.7c0.9,0.9,1.4,2.2,1.4,3.8v7.5h-2.3v-1.7c-0.4,0.6-1,1.1-1.8,1.5c-0.8,0.3-1.5,0.5-2.3,0.5
c-1.3,0-2.4-0.4-3.3-1.1s-1.3-1.7-1.3-2.9c0-0.8,0.2-1.5,0.7-2.1c0.4-0.6,1-1.1,1.8-1.5c0.8-0.3,1.6-0.5,2.5-0.5
c1.2,0,2.4,0.2,3.7,0.7v-0.4c0-0.9-0.2-1.7-0.7-2.3s-1.3-0.9-2.4-0.9c-1,0-2.1,0.3-3.5,1l-0.9-1.8c1.7-0.8,3.2-1.2,4.7-1.2
C215.8,30.2,217.1,30.7,218,31.7z M215.7,40.7c0.7-0.4,1.2-1,1.3-1.7v-1.7c-1.1-0.3-2.2-0.5-3.4-0.5c-0.8,0-1.6,0.2-2.2,0.6
s-0.9,1-0.9,1.6c0,0.7,0.3,1.2,0.8,1.6c0.5,0.4,1.2,0.6,2,0.6C214.2,41.4,215,41.2,215.7,40.7z"/>
<path d="M231.7,30.8c0.7,0.4,1.3,1,1.6,1.7c0.4,0.7,0.6,1.6,0.6,2.5v7.9h-2.3v-7.5c0-0.9-0.3-1.7-0.8-2.3
c-0.5-0.6-1.2-0.9-2.1-0.9c-0.6,0-1.2,0.1-1.7,0.4c-0.5,0.3-0.9,0.6-1.2,1.1c-0.3,0.4-0.5,0.9-0.5,1.5v7.7H223V30.5h2.4v1.8
c0.4-0.6,0.9-1.1,1.6-1.5c0.7-0.4,1.5-0.6,2.3-0.6C230.2,30.2,231,30.4,231.7,30.8z"/>
<path d="M236.5,41.2l7-8.5h-6.8v-2.1h10l0,1.8l-7,8.5h7v2.1h-10.2V41.2z"/>
<path d="M260.1,30.5v12.4h-2.4v-1.8c-0.4,0.6-0.9,1.1-1.6,1.5c-0.7,0.4-1.5,0.6-2.3,0.6c-0.9,0-1.7-0.2-2.4-0.6
c-0.7-0.4-1.3-1-1.6-1.7c-0.4-0.7-0.6-1.6-0.6-2.5v-7.9h2.3V38c0,0.9,0.3,1.7,0.8,2.3c0.5,0.6,1.2,0.9,2.1,0.9
c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.2-1.1c0.3-0.4,0.5-0.9,0.5-1.5v-7.7H260.1z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -5,6 +5,7 @@ package library
import (
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"sync"
@ -25,6 +26,13 @@ var pinnipedCLIBinaryCache struct {
// PinnipedCLIPath returns the path to the Pinniped CLI binary, built on demand and cached between tests.
func PinnipedCLIPath(t *testing.T) string {
t.Helper()
// Allow a pre-built binary passed in via $PINNIPED_TEST_CLI. This is how our tests run in CI for efficiency.
if ext, ok := os.LookupEnv("PINNIPED_TEST_CLI"); ok {
t.Log("using externally provided pinniped CLI binary")
return ext
}
pinnipedCLIBinaryCache.mutex.Lock()
defer pinnipedCLIBinaryCache.mutex.Unlock()
path := filepath.Join(testutil.TempDir(t), "pinniped")