Update credential watcher to allow second credential watcher #1132
Conversation
This file contains hidden or 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
sean-breen
reviewed
Jun 19, 2025
| @@ -29,55 +32,74 @@ var emptyEvent = fsnotify.Event{ | |||
|
|
|||
| type CredentialUpdateMessage struct { | |||
| CorrelationID slog.Attr | |||
| Conn *grpc.GrpcConnection | |||
| SeverType command.ServerType | |||
dhurley
reviewed
Jun 20, 2025
| ch <- CredentialUpdateMessage{CorrelationID: logger.CorrelationIDAttr(newCtx)} | ||
| ch <- CredentialUpdateMessage{ | ||
| CorrelationID: logger.CorrelationIDAttr(newCtx), | ||
| SeverType: cws.serverType, Conn: conn, |
There was a problem hiding this comment.
Suggested change
| SeverType: cws.serverType, Conn: conn, | |
| SeverType: cws.serverType, | |
| Conn: conn, |
| @@ -29,55 +32,74 @@ var emptyEvent = fsnotify.Event{ | |||
|
|
|||
| type CredentialUpdateMessage struct { | |||
| CorrelationID slog.Attr | |||
| Conn *grpc.GrpcConnection | |||
There was a problem hiding this comment.
Suggested change
| Conn *grpc.GrpcConnection | |
| grpcConnection *grpc.GrpcConnection |
john-david3
reviewed
Jun 23, 2025
| commandSever := cws.agentConfig.Command | ||
|
|
||
| if cws.serverType == model.Auxiliary { | ||
| commandSever = cws.agentConfig.AuxiliaryCommand |
There was a problem hiding this comment.
Should this be commandServer?
| return | ||
| } | ||
|
|
||
| cws.watcher = watcher | ||
|
|
||
| cws.watchFiles(ctx, credentialPaths(cws.agentConfig)) | ||
| cws.watcherMutex.Lock() | ||
| commandSever := cws.agentConfig.Command |
There was a problem hiding this comment.
Should this be commandServer?
| commandSever = cws.agentConfig.AuxiliaryCommand | ||
| } | ||
|
|
||
| cws.watchFiles(newCtx, credentialPaths(commandSever)) |
| commandSever = cws.agentConfig.AuxiliaryCommand | ||
| } | ||
|
|
||
| conn, err := grpc.NewGrpcConnection(newCtx, cws.agentConfig, commandSever) |
john-david3
approved these changes
Jun 27, 2025
dhurley
reviewed
Jun 27, 2025
| @@ -122,11 +122,13 @@ func FileMode(mode string) os.FileMode { | |||
| func GenerateConfigVersion(fileSlice []*mpi.File) string { | |||
| var hashes string | |||
|
|
|||
| slices.SortFunc(fileSlice, func(a, b *mpi.File) int { | |||
| files := make([]*mpi.File, len(fileSlice)) | |||
| copy(files, fileSlice) | |||
There was a problem hiding this comment.
Whats the reason for the copy?
There was a problem hiding this comment.
Race condition, files were being sorted while the other file plugin was reading them. I could use a lock but wasn't sure if locaking the nginxConfigContext files for everything was the best idea so thought copy would be better. Can change it though
| case message := <-w.credentialUpdatesChannel: | ||
| slog.DebugContext(ctx, "Received credential update event") | ||
| newCtx := context.WithValue(ctx, logger.CorrelationIDContextKey, message.CorrelationID) | ||
| case message := <-w.commandCredentialUpdatesChannel: |
There was a problem hiding this comment.
Is this code being duplicated here?
Seems like the same code can be used for both messages coming from commandCredentialUpdatesChannel or auxiliaryCredentialUpdatesChannel.
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.
Proposed changes
Updated credential watcher to allow a second credential watcher to be started to monitor auxiliary command sever.
Checklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTINGdocumentmake install-toolsand have attached any dependency changes to this pull requestREADME.md)