Update tests from (#98) to use specific values

Author: kpcraig

internal/proxy/proxy.go

@@ -19,6 +19,7 @@ import (
 
 const (
 	VaultCacheControlHeaderName = "X-Vault-Cache-Control"
+	proxyUserAgent              = "; requesting from proxy"
 )
 
 // New returns an unstarted HTTP server with health and proxy handlers.
@@ -83,10 +84,6 @@ func proxyHandler(logger hclog.Logger, client *vault.Client, cache *Cache) func(
 			}
 		}
 
-		// add user agent header
-		ua := config.GetUserAgentBase(client.Name, client.Version)
-		fwReq.Header.Set("User-Agent", ua+"; requesting from proxy")
-
 		resp, err := client.VaultConfig.HttpClient.Do(fwReq)
 		if err != nil {
 			http.Error(w, fmt.Sprintf("failed to proxy request: %s", err), http.StatusBadGateway)
@@ -143,6 +140,10 @@ func proxyRequest(r *http.Request, vaultAddress string, token string) (*http.Req
 	fwReq.Header = r.Header
 	fwReq.Header.Add(consts.AuthHeaderName, token)
 
+	// add user agent header
+	ua := config.GetUserAgentBase(config.ExtensionName, config.ExtensionVersion)
+	fwReq.Header.Set("User-Agent", ua+proxyUserAgent)
+
 	return fwReq, nil
 }
 

internal/proxy/proxy_test.go

@@ -77,7 +77,7 @@ func TestProxy(t *testing.T) {
 
 		// the stored request should be the one _from the proxy_ since it's stored by
 		// the (fake) vault.
-		require.NotEmpty(t, vaultRequests[0].Header.Get("User-Agent"))
+		require.Contains(t, vaultRequests[1].Header.Get("User-Agent"), proxyUserAgent)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode)
 		defer resp.Body.Close()
@@ -97,7 +97,7 @@ func TestProxy(t *testing.T) {
 		require.NoError(t, err)
 		resp, err := proxyVaultClient.Logical().Read("secret/data/foo")
 
-		require.NotEmpty(t, vaultRequests[0].Header.Get("User-Agent"))
+		require.Contains(t, vaultRequests[0].Header.Get("User-Agent"), proxyUserAgent)
 		require.NoError(t, err)
 		require.Equal(t, "bar", resp.Data["foo"])
 	})