Store a pointer to a bearerToken in tokenCache

We will want to add a lock to it, so we must stop copying it by value. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
containers · Jul 11, 2024 · e7155e1 · e7155e1
1 parent 10367f7
commit e7155e1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/docker/docker_client.go b/docker/docker_client.go
@@ -118,7 +118,7 @@ type dockerClient struct {
 
 	// Private state for setupRequestAuth (key: string, value: bearerToken)
 	tokenCacheLock sync.Mutex // Protects tokenCache
-	tokenCache     map[string]bearerToken
+	tokenCache     map[string]*bearerToken
 	// Private state for detectProperties:
 	detectPropertiesOnce  sync.Once // detectPropertiesOnce is used to execute detectProperties() at most once.
 	detectPropertiesError error     // detectPropertiesError caches the initial error.
@@ -270,7 +270,7 @@ func newDockerClient(sys *types.SystemContext, registry, reference string) (*doc
 		registry:         registry,
 		userAgent:        userAgent,
 		tlsClientConfig:  tlsClientConfig,
-		tokenCache:       map[string]bearerToken{},
+		tokenCache:       map[string]*bearerToken{},
 		reportedWarnings: set.New[string](),
 	}, nil
 }
@@ -752,7 +752,7 @@ func (c *dockerClient) obtainBearerToken(ctx context.Context, challenge challeng
 		scopes = append(scopes, *extraScope)
 	}
 
-	var token bearerToken
+	var token *bearerToken
 	var inCache bool
 	func() { // A scope for defer
 		c.tokenCacheLock.Lock()
@@ -773,7 +773,7 @@ func (c *dockerClient) obtainBearerToken(ctx context.Context, challenge challeng
 			return "", err
 		}
 
-		token = *t
+		token = t
 		func() { // A scope for defer
 			c.tokenCacheLock.Lock()
 			defer c.tokenCacheLock.Unlock()