fix client caching #54
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bKiralyWdf
previously approved these changes
Jun 19, 2024
bKiralyWdf
approved these changes
Jun 20, 2024
Comment on lines
+108
to
+129
| // look up CF client in cache | ||
| identifier := clientIdentifier{url: url, username: username} | ||
| cacheEntry, isInCache := clientCache[identifier] | ||
|
|
||
| var err error = nil | ||
| var client *organizationClient = nil | ||
| if isInCache { | ||
| // re-use CF client and wrap it as organizationClient | ||
| client = &organizationClient{organizationName: organizationName, client: cacheEntry.client} | ||
| if cacheEntry.password != password { | ||
| // password was rotated => delete client from cache and create a new one below | ||
| delete(clientCache, identifier) | ||
| isInCache = false | ||
| } | ||
| } | ||
|
|
||
| if !isInCache { | ||
| // create new CF client and wrap it as organizationClient | ||
| client, err = newOrganizationClient(organizationName, url, username, password) | ||
| if err == nil { | ||
| orgClientCache[identifier] = client | ||
| } | ||
| } else { | ||
| // If the password has changed since we cached the client, we want to update it to the new one | ||
| if client.password != password { | ||
| client.password = password | ||
| // add CF client to cache | ||
| clientCache[identifier] = &clientCacheEntry{url: url, username: username, password: password, client: client.client} |
There was a problem hiding this comment.
That's a little bit of an odd way of doing it, but it should work.
Comment on lines
+140
to
+161
| // look up CF client in cache | ||
| identifier := clientIdentifier{url: url, username: username} | ||
| cacheEntry, isInCache := clientCache[identifier] | ||
|
|
||
| var err error = nil | ||
| var client *spaceClient = nil | ||
| if isInCache { | ||
| // re-use CF client from cache and wrap it as spaceClient | ||
| client = &spaceClient{spaceGuid: spaceGuid, client: cacheEntry.client} | ||
| if cacheEntry.password != password { | ||
| // password was rotated => delete client from cache and create a new one below | ||
| delete(clientCache, identifier) | ||
| isInCache = false | ||
| } | ||
| } | ||
|
|
||
| if !isInCache { | ||
| // create new CF client and wrap it as spaceClient | ||
| client, err = newSpaceClient(spaceGuid, url, username, password) | ||
| if err == nil { | ||
| spaceClientCache[identifier] = client | ||
| } | ||
| } else { | ||
| // If the password has changed since we cached the client, we want to update it to the new one | ||
| if client.password != password { | ||
| client.password = password | ||
| // add CF client to cache | ||
| clientCache[identifier] = &clientCacheEntry{url: url, username: username, password: password, client: client.client} |
There was a problem hiding this comment.
For now I think we should merge this, but later think about factoring out this part.
TheBigElmo
approved these changes
Jun 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Client caches were based on organizationClient and spaceClient structures that also contain values like organizationName and spaceGuid. However, this was not reflected in the key for the caching.
This causes re-use of clients that do not interact with the desired organization or space.
This PR will just cache the actual CF client and some metadata like url, username and password.
However, the structures organizationClient and spaceClient will always be created with updated values for organizationName resp spaceGuid.
Two tests are added as well to test two different organizations and two different spaces.