Move dynoid middleware out of hmiddleware to dynoid package.

heroku · Mar 14, 2024 · 4642012 · 4642012
1 parent c4ed38f
commit 4642012
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/dynoid/dynoid.go b/dynoid/dynoid.go
@@ -16,10 +16,10 @@ import (
 )
 
 const (
-	DefaultAudience = "heroku"
+	defaultAudience = "heroku"
 
 	//nolint: gosec
-	DefaultTokenPath = "/etc/heroku/dyno_id_token"
+	defaultTokenPath = "/etc/heroku/dyno_id_token"
 )
 
 // Returned by an IssuerCallback getting an issuer it doesn't trust
@@ -146,8 +146,8 @@ func (t *Token) LogValue() slog.Value {
 
 // LocalTokenPath returns the path on disk to the token for the given audience
 func LocalTokenPath(audience string) string {
-	if audience == DefaultAudience {
-		return DefaultTokenPath
+	if audience == defaultAudience {
+		return defaultTokenPath
 	}
 
 	return fmt.Sprintf("/etc/heroku/dyno-id/%s/token", audience)

diff --git a/hmiddleware/dynoid/dynoid.go → dynoid/middleware/dynoid.go b/hmiddleware/dynoid/dynoid.go → dynoid/middleware/dynoid.go
@@ -1,4 +1,4 @@
-package dynoid
+package middleware
 
 import (
 	"context"

diff --git a/hmiddleware/dynoid/dynoid_test.go → dynoid/middleware/dynoid_test.go b/hmiddleware/dynoid/dynoid_test.go → dynoid/middleware/dynoid_test.go
@@ -1,4 +1,4 @@
-package dynoid_test
+package middleware_test
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 
 	"github.com/heroku/x/dynoid"
 	"github.com/heroku/x/dynoid/dynoidtest"
-	middleware "github.com/heroku/x/hmiddleware/dynoid"
+	"github.com/heroku/x/dynoid/middleware"
 )
 
 func TestAuthorize(t *testing.T) {