Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Synthetics] migrate first set of tests #198950

Merged
merged 31 commits into from
Dec 12, 2024
Merged

[Synthetics] migrate first set of tests #198950

merged 31 commits into from
Dec 12, 2024

Conversation

dominiqueclarke
Copy link
Contributor

@dominiqueclarke dominiqueclarke commented Nov 5, 2024 •
edited by kibanamachine
Loading

Summary

Relates to #196229

Migrates Synthetics tests to deployment agnostic

@dominiqueclarke
Copy link
Contributor Author

/ci

dominiqueclarke
dominiqueclarke commented Nov 14, 2024
View reviewed changes
...ck/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.ts
const { apiKey, isValid } = await getAPIKeyForSyntheticsService({ server: this.server });
if (!isValid) {
// do not check for api key validity if inspecting
if (!isValid && !inspect) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed when I was adjusting the inspect tests, that they would sometime fail on api key not valid. No need to check api key when doing an inspect.

dominiqueclarke
dominiqueclarke commented Nov 14, 2024
View reviewed changes
x-pack/test/api_integration/deployment_agnostic/apis/observability/synthetics/create_monitor.ts Outdated
import { getFixtureJson } from './helpers/get_fixture_json';
import { SyntheticsMonitorTestService } from '../../../services/synthetics_monitor';

// adjust the type of samlAuth
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realized I left this as a comment for myself because samlAuth is set to any here. Didn't get to fixing it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like to preface comments like this with TODO to signify that the PR has new tech debt to resolve before merging.

It's a nice reminder to the author themselves and it gives a much stronger indicator to reviewers that something is unfinished.

@dominiqueclarke
Copy link
Contributor Author

/ci

@dominiqueclarke
Copy link
Contributor Author

/ci

@dominiqueclarke
Copy link
Contributor Author

/ci

@dominiqueclarke
Copy link
Contributor Author

/ci

@dominiqueclarke
Copy link
Contributor Author

/ci

@dominiqueclarke
update test
a3f500b
@dominiqueclarke
Merge branch 'chore/synthetics-deployment-agnostic' of github.com:dom…
f139c1d 
…iniqueclarke/kibana into chore/synthetics-deployment-agnostic
@dominiqueclarke
Copy link
Contributor Author

/ci

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 11, 2024 •
edited
Loading

💚 Build Succeeded

  • Buildkite Build
  • Commit: 7bce1ca
  • Kibana Serverless Image: docker.elastic.co/kibana-ci/kibana-serverless:pr-198950-7bce1ca2d862

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
@kbn/test-suites-xpack 727 729 +2

Total ESLint disabled count

id before after diff
@kbn/test-suites-xpack 752 754 +2

History

wayneseymour
wayneseymour requested changes Dec 11, 2024
View reviewed changes
Copy link
Member

@wayneseymour wayneseymour left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a question.

x-pack/test/api_integration/deployment_agnostic/services/synthetics_monitor.ts Outdated
this.supertest = getService('supertestWithoutAuth');
this.samlAuth = getService('samlAuth');
this.getService = getService;
this.supertestWithoutAuth = getService('supertestWithoutAuth');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it's still imported twice?

wayneseymour
wayneseymour approved these changes Dec 12, 2024
View reviewed changes
Copy link
Member

@wayneseymour wayneseymour left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR only, LGTM

@dominiqueclarke dominiqueclarke merged commit b74b935 into elastic:main Dec 12, 2024
8 checks passed
@dominiqueclarke dominiqueclarke deleted the chore/synthetics-deployment-agnostic branch December 12, 2024 14:41
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.17, 8.x

https://github.com/elastic/kibana/actions/runs/12298691592

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.17 Backport failed because of merge conflicts

You might need to backport the following PRs to 8.17:
- [UA] Remove 7->8 multitype check (#203995)
- [UA] kibana-core ownership (#203410)
❌ 8.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 198950

Questions ?

Please refer to the Backport tool documentation

This was referenced Dec 12, 2024
Merged
Closed
@dominiqueclarke
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
✅ 8.x
✅ 8.17

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

dominiqueclarke added a commit to dominiqueclarke/kibana that referenced this pull request Dec 12, 2024
@dominiqueclarke
[Synthetics] migrate first set of tests (elastic#198950)
5d27c61 
## Summary

Relates to elastic#196229

Migrates Synthetics tests to deployment agnostic

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Shahzad <shahzad31comp@gmail.com>
(cherry picked from commit b74b935)

# Conflicts:
#	.github/CODEOWNERS
#	x-pack/test/api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
This was referenced Dec 12, 2024
Merged
Merged
Merged
@wayneseymour wayneseymour mentioned this pull request Dec 13, 2024
Open
This was referenced Dec 13, 2024
Merged
Merged
dominiqueclarke added a commit that referenced this pull request Dec 13, 2024
@dominiqueclarke
[8.x] [Synthetics] migrate first set of tests (#198950) (#204083)
16f7615 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Synthetics] migrate first set of tests
(#198950)](#198950)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Dominique
Clarke","email":"dominique.clarke@elastic.co"},"sourceCommit":{"committedDate":"2024-12-12T14:41:03Z","message":"[Synthetics]
migrate first set of tests (#198950)\n\n## Summary\r\n\r\nRelates to
#196229 \r\n\r\nMigrates Synthetics tests to deployment
agnostic\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by:
Shahzad
<shahzad31comp@gmail.com>","sha":"b74b93593cecec34e2745c30811c6929bf8a72c7","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-management","v8.17.0"],"number":198950,"url":"https://github.com/elastic/kibana/pull/198950","mergeCommit":{"message":"[Synthetics]
migrate first set of tests (#198950)\n\n## Summary\r\n\r\nRelates to
#196229 \r\n\r\nMigrates Synthetics tests to deployment
agnostic\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by:
Shahzad
<shahzad31comp@gmail.com>","sha":"b74b93593cecec34e2745c30811c6929bf8a72c7"}},"sourceBranch":"main","suggestedTargetBranches":["8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198950","number":198950,"mergeCommit":{"message":"[Synthetics]
migrate first set of tests (#198950)\n\n## Summary\r\n\r\nRelates to
#196229 \r\n\r\nMigrates Synthetics tests to deployment
agnostic\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by:
Shahzad
<shahzad31comp@gmail.com>","sha":"b74b93593cecec34e2745c30811c6929bf8a72c7"}},{"branch":"8.17","label":"v8.17.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
@kibanamachine kibanamachine added v8.18.0 backport missing Added to PRs automatically when the are determined to be missing a backport. labels Dec 13, 2024
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

2 similar comments
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinkambic justinkambic justinkambic left review comments

@wayneseymour wayneseymour wayneseymour approved these changes

@shahzad31 shahzad31 shahzad31 approved these changes

Assignees
No one assigned
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) chore ci:project-deploy-observability Create an Observability project release_note:skip Skip the PR/issue when compiling release notes Team:obs-ux-management Observability Management User Experience Team v8.17.0 v8.18.0 v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dominiqueclarke @elasticmachine @pheyos @kibanamachine @shahzad31 @wayneseymour @justinkambic