-
Notifications
You must be signed in to change notification settings - Fork 15
PMM-15302 Verify no SSH key settings off AMI #1246
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
travagliad
wants to merge
10
commits into
main
Choose a base branch
from
claude/epic-hopper-nel1d2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fe58652
PMM-15302 Cover the AMI-only SSH key settings gate
travagliad 882c13e
Merge branch 'main' into claude/epic-hopper-nel1d2
travagliad c687d85
PMM-15302 Address review on the SSH key gate tests
claude 9bc8b54
Merge branch 'main' into claude/epic-hopper-nel1d2
travagliad 2f26775
PMM-15302 Address review on the SSH key gate tests
claude 5ccdf13
PMM-15302 Ungate the AMI SSH key test
travagliad 2813003
PMM-15302 Narrow the distribution method type
travagliad 021668d
PMM-15302 Drop the simulated AMI SSH key test
travagliad 7de182e
PMM-15302 Inline the SSH key, drop the restating comment
travagliad acdcc25
PMM-15302 Drop the distribution method type comment
travagliad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
54 changes: 54 additions & 0 deletions
54
e2e_tests/tests/dockerConfiguration/distributionMethodSshKey.test.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import pmmTest from '@fixtures/pmmTest'; | ||
| import { expect } from '@playwright/test'; | ||
| import GrafanaHelper from '@helpers/grafana.helper'; | ||
| import apiEndpoints from '@helpers/apiEndpoints'; | ||
|
|
||
| pmmTest.describe('SSH key settings are unavailable off an AMI deployment.', () => { | ||
| pmmTest.beforeEach(async ({ grafanaHelper, page }) => { | ||
| await page.goto(''); | ||
| await grafanaHelper.authorize(); | ||
| }); | ||
|
|
||
| pmmTest( | ||
| 'PMM-T2282 - Verify the SSH key tab is hidden and its URL redirects on a non-AMI deployment @docker-configuration', | ||
| async ({ api, page, settingsPage }) => { | ||
| expect(await api.serverApi.getDistributionMethod()).toEqual('DISTRIBUTION_METHOD_DOCKER'); | ||
|
|
||
| await pmmTest.step('Settings page offers no SSH key tab', async () => { | ||
| await page.goto(settingsPage.url); | ||
|
|
||
| await expect(settingsPage.tabs.metrics).toHaveAttribute('aria-selected', 'true'); | ||
| await expect(settingsPage.tabs.ssh).toHaveCount(0); | ||
|
travagliad marked this conversation as resolved.
|
||
| }); | ||
|
|
||
| await pmmTest.step('The SSH key URL redirects to the default tab', async () => { | ||
| await page.goto(settingsPage.urls.ssh); | ||
|
|
||
| await expect(settingsPage.tabs.metrics).toHaveAttribute('aria-selected', 'true'); | ||
| await expect(page).toHaveURL(new RegExp(`${settingsPage.url}$`)); | ||
| }); | ||
|
|
||
| await pmmTest.step('The server refuses an SSH key', async () => { | ||
| const settingsBefore = await api.settingsApi.getSettings(); | ||
| const response = await page.request.put(apiEndpoints.server.settings, { | ||
| data: { | ||
| ssh_key: | ||
| 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtU7ftdqg3rdRcv06kPAOnKX+WRmHlnG2UBpUNKw65h pmm-qa@distribution-method-test', | ||
| }, | ||
| headers: GrafanaHelper.getAuthHeader(), | ||
| }); | ||
|
|
||
| expect(response.status()).toEqual(500); | ||
|
|
||
| const body = (await response.json()) as { message: string }; | ||
|
|
||
| expect(body.message).toContain('SSH key can be set only on AMI distribution'); | ||
|
|
||
| const settingsAfter = await api.settingsApi.getSettings(); | ||
|
|
||
| expect(settingsBefore.settings.ssh_key).toEqual(''); | ||
| expect(settingsAfter.settings.ssh_key).toEqual(''); | ||
| }); | ||
| }, | ||
| ); | ||
| }); | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.