Rendering: Fix Windows plugin signature check #76123
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
AgnesToulet
requested review from
wbrowne,
marefr and
xnyo
and removed request for
a team
wbrowne
approved these changes
Oct 6, 2023
| @@ -209,7 +209,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu | |||
| f = toSlash(f) | |||
|
|
|||
| // Ignoring unsigned Chromium debug.log so it doesn't invalidate the signature for Renderer plugin running on Windows | |||
| if runningWindows && plugin.JSONData.Type == plugins.TypeRenderer && f == "chrome-win/debug.log" { | |||
| if runningWindows && plugin.JSONData.Type == plugins.TypeRenderer && strings.HasSuffix(f, "debug.log") { | |||
There was a problem hiding this comment.
Nit: Maybe filepath.Base is the most appropriate func to use here now 🤔
There was a problem hiding this comment.
Good idea, I updated the PR.
|
Yes, I agree! Do we have an issue about how we could fix this? |
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.
What is this feature?
With the recent puppeteer upgrade in the grafana-image-renderer plugin, the path to the
debug.logfile was updated fromchrome/debug.logtochrome/win64-<chrome version>/chrome-win64/debug.log. This PR updates the signature check accordingly (but still support old versions of the image renderer).Why do we need this feature?
Without this, new versions of the image renderer plugin won't be able to load once the
debug.logis created by the Chrome process.Who is this feature for?
Windows users using the grafana-image-renderer plugin.
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer:
Please check that: