Change permissions used for finishing plugin setup #2242
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
joeyorlando
approved these changes
Jun 15, 2023
joeyorlando
approved these changes
Jun 15, 2023
mderynck
added
the
pr:no public docs
…roken and can be repaired or unable to communicate with backend to get maintenance status
joeyorlando
reviewed
Jun 21, 2023
joeyorlando
reviewed
Jun 21, 2023
joeyorlando
reviewed
Jun 21, 2023
joeyorlando
approved these changes
Jun 21, 2023
…es to be less confusing when not self hosting, add fallback for if plugin should treat as cloud configured when unable to connect to backend, fix tests
mderynck
commented
Jun 21, 2023
| @@ -302,7 +302,7 @@ describe('PluginConfigPage', () => { | |||
| // click the confirm button within the modal, which actually triggers the callback | |||
| await userEvent.click(screen.getByText('Remove')); | |||
|
|
|||
| await screen.findByTestId(successful ? PLUGIN_CONFIGURATION_FORM_DATA_ID : STATUS_MESSAGE_BLOCK_DATA_ID); | |||
| // await screen.findByTestId(successful ? PLUGIN_CONFIGURATION_FORM_DATA_ID : STATUS_MESSAGE_BLOCK_DATA_ID); | |||
There was a problem hiding this comment.
Need some help on fixing this test properly now that the page is reloading on reset.
There was a problem hiding this comment.
hmm, this type of assertion may no longer be possible for the successful scenario. maybe we just replace this assertion by mocking window.location.reload and assert that it was called in this scenario?
We're expecting the configuration form to be present here, but that is reliant on a full page/state reload to arrive at this state. It might be beyond what @testing-library/react and @testing-library/user-event are capable of? Curious to hear what someone from @grafana/grafana-oncall-frontend thinks here?
joeyorlando
reviewed
Jun 22, 2023
grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx
Outdated
Show resolved
Hide resolved
joeyorlando
reviewed
Jun 22, 2023
joeyorlando
approved these changes
Jun 22, 2023
grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx
Outdated
Show resolved
Hide resolved
grafana-plugin/src/containers/PluginConfigPage/PluginConfigPage.tsx
Outdated
Show resolved
Hide resolved
brojd
pushed a commit
that referenced
this pull request
Sep 18, 2024
Fixes issue where user not having `plugins:install`permission were unable to complete setup of OnCall. - Check multiple Grafana permissions to complete OnCall setup instead of `plugins:install` since the plugin is already installed at this point - Use the following permissions - `plugins:write` - Plugin setup will write to plugin config - `users:read` - Grafana API key being granted to OnCall will be used to read users from Grafana - `teams:read` - Grafana API key being granted to OnCall will be used to read teams from Grafana - `apikeys:create` - If Grafana API key does not exist it will be created - `apikeys:delete` - If existing Grafana API key does not work it will be deleted and recreated Closes grafana/oncall-private#1925 TODO: - [x] Fix tests
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.
Fixes issue where user not having
plugins:installpermission were unable to complete setup of OnCall.plugins:installsince the plugin is already installed at this pointplugins:write- Plugin setup will write to plugin configusers:read- Grafana API key being granted to OnCall will be used to read users from Grafanateams:read- Grafana API key being granted to OnCall will be used to read teams from Grafanaapikeys:create- If Grafana API key does not exist it will be createdapikeys:delete- If existing Grafana API key does not work it will be deleted and recreatedCloses https://github.com/grafana/oncall-private/issues/1925
TODO: