use consts / linter (#1119)

Signed-off-by: James Ranson <james@ranson.org>

Author: jranson

.golangci.yml

@@ -29,9 +29,9 @@ linters:
     - mirror
     - importas
     - perfsprint
+    - goconst
   disable:
     - errcheck
-    - goconst # re-enable after sudden influx of findings are addressed
   settings:
     dupl:
       threshold: 150 # default is 100; have brought current codebase down to 75, but leaving default at 150 for now

README.md

@@ -1,4 +1,4 @@
-# <img src="./docs/images/logos/trickster-logo.svg" width=90 />&nbsp;&nbsp;&nbsp;&nbsp;<img src="./docs/images/logos/trickster-text.svg" width=420 /> [![Follow on Twitter](https://img.shields.io/twitter/follow/trickstercache.svg?style=social&logo=twitter)](https://twitter.com/trickstercache)
+# <img src="./docs/images/logos/trickster-horizontal.svg" width=550 /> [![Follow on Twitter](https://img.shields.io/twitter/follow/trickstercache.svg?style=social&logo=twitter)](https://twitter.com/trickstercache)
 
 [![License](https://img.shields.io/github/license/trickstercache/trickster)](/LICENSE)
 [![Coverage Status](https://coveralls.io/repos/github/trickstercache/trickster/badge.svg)](https://coveralls.io/github/trickstercache/trickster)

cmd/trickster/main.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/trickstercache/trickster/v2/pkg/appinfo"
 	"github.com/trickstercache/trickster/v2/pkg/daemon"
+	"github.com/trickstercache/trickster/v2/pkg/observability/keys"
 	"github.com/trickstercache/trickster/v2/pkg/observability/logging"
 	"github.com/trickstercache/trickster/v2/pkg/observability/logging/logger"
 )
@@ -34,16 +35,12 @@ var (
 	applicationVersion     string
 )
 
-const (
-	applicationName = "trickster"
-)
-
 func main() {
-	appinfo.Set(applicationName, applicationVersion,
+	appinfo.Set(appinfo.AppName, applicationVersion,
 		applicationBuildTime, applicationGitCommitID)
 	err := daemon.Start(context.Background(), os.Args[1:]...)
 	if err != nil {
 		logger.Fatal(1, "trickster daemon failed to start",
-			logging.Pairs{"error": err})
+			logging.Pairs{keys.Error: err})
 	}
 }

docs/images/logos/trickster-horizontal-sm.png

@@ -1,4 +1,4 @@
-# <img src="https://github.com/${REPO}/raw/v${TAG}/docs/images/logos/trickster-logo.svg" width=60 />&nbsp;&nbsp;&nbsp;&nbsp;<img src="https://github.com/${REPO}/raw/v${TAG}/docs/images/logos/trickster-text.svg" width=280 />
+# <img src="https://github.com/${REPO}/raw/v${TAG}/docs/images/logos/trickster-horizontal.svg" width=400 />
 
 Welcome to Trickster ${TAG}! :tada:
 

docs/images/logos/trickster-horizontal.png

@@ -33,6 +33,8 @@ import (
 
 	"github.com/trickstercache/trickster/v2/integration/internal/portutil"
 	"github.com/trickstercache/trickster/v2/integration/promstub"
+	"github.com/trickstercache/trickster/v2/pkg/cache/status"
+	"github.com/trickstercache/trickster/v2/pkg/proxy/headers"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -241,7 +243,7 @@ func TestALBCache(t *testing.T) {
 		}, 5*time.Second, 100*time.Millisecond, "alb pool never queried the bad-encoding member")
 
 		t.Logf("status=%d X-Trickster-Result=%q body=%s",
-			resp.StatusCode, resp.Header.Get("X-Trickster-Result"), string(body))
+			resp.StatusCode, resp.Header.Get(headers.NameTricksterResult), string(body))
 
 		require.GreaterOrEqual(t, resp.StatusCode, 200,
 			"expected a response, got status=%d body=%s", resp.StatusCode, string(body))
@@ -265,8 +267,8 @@ func TestALBCache(t *testing.T) {
 		require.NotEmpty(t, series,
 			"expected merged series from members 0+1; body=%s", string(body))
 
-		raw := resp.Header.Get("X-Trickster-Result")
-		hasPhit := strings.Contains(raw, "phit")
+		raw := resp.Header.Get(headers.NameTricksterResult)
+		hasPhit := strings.Contains(raw, status.StatusPartialHit)
 		hasWarn := strings.Contains(string(body), `"warnings"`) ||
 			strings.Contains(string(body), "encoding") ||
 			strings.Contains(string(body), "unsupported")
@@ -368,13 +370,13 @@ func TestALBCache(t *testing.T) {
 		body, _ := io.ReadAll(resp.Body)
 		resp.Body.Close()
 
-		raw := resp.Header.Get("X-Trickster-Result")
+		raw := resp.Header.Get(headers.NameTricksterResult)
 		t.Logf("status=%d X-Trickster-Result=%q m1Hits=%d m2Hits=%d body=%s",
 			resp.StatusCode, raw, m1Hits.Load(), m2Hits.Load(), string(body))
 
 		require.Equal(t, http.StatusOK, resp.StatusCode)
 
-		assert.Containsf(t, raw, "phit",
+		assert.Containsf(t, raw, status.StatusPartialHit,
 			"mixed cache hit/miss across pool members did not surface phit in X-Trickster-Result=%q",
 			raw)
 	})
@@ -463,7 +465,7 @@ func TestALBCache(t *testing.T) {
 		}, 10*time.Second, 250*time.Millisecond, "proxy-only TSM pool never merged both members")
 
 		t.Logf("status=%d X-Trickster-Result=%q m1Hits=%d m2Hits=%d body=%s",
-			resp.StatusCode, resp.Header.Get("X-Trickster-Result"), m1Hits.Load(), m2Hits.Load(), string(body))
+			resp.StatusCode, resp.Header.Get(headers.NameTricksterResult), m1Hits.Load(), m2Hits.Load(), string(body))
 
 		var pr promResponse
 		require.NoError(t, json.Unmarshal(body, &pr),