From a17de82d3ea38de4a587ea600ce145e1211c76cf Mon Sep 17 00:00:00 2001 From: Patrick Jones Date: Wed, 18 Nov 2020 11:03:03 -0800 Subject: [PATCH] google: fix spelling and go fmt Change-Id: Ifc55814018bf66d2e77752d770a51c716376cabc --- google/internal/externalaccount/sts_exchange.go | 3 +-- .../internal/externalaccount/sts_exchange_test.go | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/google/internal/externalaccount/sts_exchange.go b/google/internal/externalaccount/sts_exchange.go index fb90be3..cc2c99a 100644 --- a/google/internal/externalaccount/sts_exchange.go +++ b/google/internal/externalaccount/sts_exchange.go @@ -16,7 +16,7 @@ import ( "strings" ) -// ExchangeToken preforms a oauth2 token exchange with the provided endpoint. +// ExchangeToken performs an oauth2 token exchange with the provided endpoint. // The first 4 fields are all mandatory. headers can be used to pass additional // headers beyond the bare minimum required by the token exchange. options can // be used to pass additional JSON-structured options to the remote server. @@ -67,7 +67,6 @@ func ExchangeToken(ctx context.Context, endpoint string, request *STSTokenExchan } - return &stsResp, nil } diff --git a/google/internal/externalaccount/sts_exchange_test.go b/google/internal/externalaccount/sts_exchange_test.go index e8bc0d0..bd4034a 100644 --- a/google/internal/externalaccount/sts_exchange_test.go +++ b/google/internal/externalaccount/sts_exchange_test.go @@ -57,7 +57,7 @@ func TestExchangeToken(t *testing.T) { if got, want := r.Header.Get("Authorization"), "Basic cmJyZ25vZ25yaG9uZ28zYmk0Z2I5Z2hnOWc6bm90c29zZWNyZXQ="; got != want { t.Errorf("Unexpected authorization header, got %v, want %v", got, want) } - if got, want := r.Header.Get("Content-Type"), "application/x-www-form-urlencoded"; got != want{ + if got, want := r.Header.Get("Content-Type"), "application/x-www-form-urlencoded"; got != want { t.Errorf("Unexpected Content-Type header, got %v, want %v", got, want) } body, err := ioutil.ReadAll(r.Body) @@ -84,8 +84,6 @@ func TestExchangeToken(t *testing.T) { t.Errorf("mismatched messages received by mock server. \nWant: \n%v\n\nGot:\n%v", expectedToken, *resp) } - - } func TestExchangeToken_Err(t *testing.T) { @@ -102,12 +100,15 @@ func TestExchangeToken_Err(t *testing.T) { t.Errorf("Expected handled error; instead got nil.") } } + /* Lean test specifically for options, as the other features are tested earlier. */ type testOpts struct { - First string `json:"first"` + First string `json:"first"` Second string `json:"second"` } -var optsValues = [][]string{{"foo", "bar"},{"cat", "pan"}} + +var optsValues = [][]string{{"foo", "bar"}, {"cat", "pan"}} + func TestExchangeToken_Opts(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { body, err := ioutil.ReadAll(r.Body) @@ -179,4 +180,4 @@ func TestExchangeToken_Opts(t *testing.T) { inputOpts["one"] = firstOption inputOpts["two"] = secondOption ExchangeToken(context.Background(), ts.URL, &tokenRequest, auth, headers, inputOpts) -} \ No newline at end of file +}