Skip to content

Remove expiry-js#233774

Merged
legrego merged 2 commits intoelastic:mainfrom
legrego:remove-expiry-hs
Sep 2, 2025
Merged

Remove expiry-js#233774
legrego merged 2 commits intoelastic:mainfrom
legrego:remove-expiry-hs

Conversation

@legrego
Copy link
Member

@legrego legrego commented Sep 2, 2025

Summary

Removes the outdated expiry-js dependency in favor of a simple first-party implementation.
Thank you @spalger for the comprehensive unit tests which made this effort significantly easier 💚

@legrego legrego added chore Team:Security Platform Security: Auth, Users, Roles, Spaces, Audit Logging, etc t// release_note:skip Skip the PR/issue when compiling release notes backport:version Backport to applied version labels dependency-reduction initiative to reduce the number of Kibana's third-party dependencies v9.1.4 v9.0.7 v8.18.7 v8.19.4 labels Sep 2, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 2, 2025

⏳ Build in-progress, with failures

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #42 / Machine learning rule execution logic API @ess @serverless Machine learning type rules @skipInServerlessMKI generates max alerts warning when circuit breaker is exceeded
  • [job] [logs] FTR Configs #42 / Machine learning rule execution logic API @ess @serverless Machine learning type rules with value list exception generates no alerts when a value list exception is added for an ML rule
  • [job] [logs] FTR Configs #118 / Serverless Observability - Deployment-agnostic APM API integration tests APM diagnostics Diagnostics: Index pattern settings When data is ingested returns APM index templates
  • [job] [logs] FTR Configs #118 / Serverless Observability - Deployment-agnostic APM API integration tests APM diagnostics Diagnostics: Index pattern settings When data is ingested returns APM index templates
  • [job] [logs] FTR Configs #23 / Stateful Observability - Deployment-agnostic AI Assistant API integration tests observability AI Assistant Knowledge base: when upgrading from 8.10 to 8.18 before running migrations cannot add new entries to KB until reindex has completed
  • [job] [logs] FTR Configs #23 / Stateful Observability - Deployment-agnostic AI Assistant API integration tests observability AI Assistant Knowledge base: when upgrading from 8.10 to 8.18 before running migrations cannot add new entries to KB until reindex has completed
  • [job] [logs] FTR Configs #121 / Stateful Observability - Deployment-agnostic APM API integration tests APM diagnostics Diagnostics: Index pattern settings When data is ingested returns APM index templates
  • [job] [logs] FTR Configs #121 / Stateful Observability - Deployment-agnostic APM API integration tests APM diagnostics Diagnostics: Index pattern settings When data is ingested returns APM index templates

History

@legrego legrego marked this pull request as ready for review September 2, 2025 19:31
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-security (Team:Security)

@legrego legrego requested review from a team September 2, 2025 19:31
Copy link
Contributor

@kc13greiner kc13greiner left a comment

Choose a reason for hiding this comment

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

LGTM!

@legrego legrego merged commit 5e76487 into elastic:main Sep 2, 2025
15 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.18, 8.19, 9.0, 9.1

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

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 2, 2025
(cherry picked from commit 5e76487)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 2, 2025
(cherry picked from commit 5e76487)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 2, 2025
(cherry picked from commit 5e76487)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
8.18 Backport failed because of merge conflicts

You might need to backport the following PRs to 8.18:
- Upgrade Puppeteer to 24.17.0 (#232984)
- Upgrade puppeteer to v24.14.0 (#229045)
8.19
9.0
9.1

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 233774

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Sep 3, 2025
# Backport

This will backport the following commits from `main` to `9.0`:
- [Remove expiry-js
(#233774)](#233774)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Larry
Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2025-09-02T22:30:37Z","message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","backport:version","v9.2.0","dependency-reduction","v9.1.4","v9.0.7","v8.18.7","v8.19.4"],"title":"Remove
expiry-js","number":233774,"url":"https://github.com/elastic/kibana/pull/233774","mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","9.0","8.18","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233774","number":233774,"mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},{"branch":"9.1","label":"v9.1.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Larry Gregory <larry.gregory@elastic.co>
kibanamachine added a commit that referenced this pull request Sep 3, 2025
# Backport

This will backport the following commits from `main` to `9.1`:
- [Remove expiry-js
(#233774)](#233774)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Larry
Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2025-09-02T22:30:37Z","message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","backport:version","v9.2.0","dependency-reduction","v9.1.4","v9.0.7","v8.18.7","v8.19.4"],"title":"Remove
expiry-js","number":233774,"url":"https://github.com/elastic/kibana/pull/233774","mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","9.0","8.18","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233774","number":233774,"mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},{"branch":"9.1","label":"v9.1.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Larry Gregory <larry.gregory@elastic.co>
kibanamachine added a commit that referenced this pull request Sep 3, 2025
# Backport

This will backport the following commits from `main` to `8.19`:
- [Remove expiry-js
(#233774)](#233774)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Larry
Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2025-09-02T22:30:37Z","message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","backport:version","v9.2.0","dependency-reduction","v9.1.4","v9.0.7","v8.18.7","v8.19.4"],"title":"Remove
expiry-js","number":233774,"url":"https://github.com/elastic/kibana/pull/233774","mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","9.0","8.18","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233774","number":233774,"mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},{"branch":"9.1","label":"v9.1.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Larry Gregory <larry.gregory@elastic.co>
kowalczyk-krzysztof pushed a commit to kowalczyk-krzysztof/kibana that referenced this pull request Sep 3, 2025
legrego added a commit to legrego/kibana that referenced this pull request Sep 3, 2025
(cherry picked from commit 5e76487)

# Conflicts:
#	yarn.lock
@legrego
Copy link
Member Author

legrego commented Sep 3, 2025

💚 All backports created successfully

Status Branch Result
8.18

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

Questions ?

Please refer to the Backport tool documentation

legrego added a commit that referenced this pull request Sep 3, 2025
# Backport

This will backport the following commits from `main` to `8.18`:
- [Remove expiry-js
(#233774)](#233774)

<!--- Backport version: 10.0.1 -->

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

<!--BACKPORT [{"author":{"name":"Larry
Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2025-09-02T22:30:37Z","message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","backport:version","v9.2.0","dependency-reduction","v9.1.4","v9.0.7","v8.18.7","v8.19.4"],"title":"Remove
expiry-js","number":233774,"url":"https://github.com/elastic/kibana/pull/233774","mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},"sourceBranch":"main","suggestedTargetBranches":["8.18"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233774","number":233774,"mergeCommit":{"message":"Remove
expiry-js
(#233774)","sha":"5e7648741747f0c2b8d5b44f3641989aef7a8ee7"}},{"branch":"9.1","label":"v9.1.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/233804","number":233804,"state":"MERGED","mergeCommit":{"sha":"b98b997e4c628a0974e61bbc04e546fb96299e4c","message":"[9.1]
Remove expiry-js (#233774) (#233804)\n\n# Backport\n\nThis will backport
the following commits from `main` to `9.1`:\n- [Remove
expiry-js\n(#233774)](https://github.com/elastic/kibana/pull/233774)\n\n\n\n###
Questions ?\nPlease refer to the [Backport
tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by:
Larry Gregory
<larry.gregory@elastic.co>"}},{"branch":"9.0","label":"v9.0.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/233803","number":233803,"state":"MERGED","mergeCommit":{"sha":"c269fdb303e7dec3dba748ea06de3da5fb625e9a","message":"[9.0]
Remove expiry-js (#233774) (#233803)\n\n# Backport\n\nThis will backport
the following commits from `main` to `9.0`:\n- [Remove
expiry-js\n(#233774)](https://github.com/elastic/kibana/pull/233774)\n\n\n\n###
Questions ?\nPlease refer to the [Backport
tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by:
Larry Gregory
<larry.gregory@elastic.co>"}},{"branch":"8.18","label":"v8.18.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/233802","number":233802,"state":"MERGED","mergeCommit":{"sha":"bd70dcc53a8cecd775c0a16f3cb01200241c386b","message":"[8.19]
Remove expiry-js (#233774) (#233802)\n\n# Backport\n\nThis will backport
the following commits from `main` to `8.19`:\n- [Remove
expiry-js\n(#233774)](https://github.com/elastic/kibana/pull/233774)\n\n\n\n###
Questions ?\nPlease refer to the [Backport
tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by:
Larry Gregory <larry.gregory@elastic.co>"}}]}] BACKPORT-->

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
ymao1 pushed a commit to ymao1/kibana that referenced this pull request Sep 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels chore dependency-reduction initiative to reduce the number of Kibana's third-party dependencies release_note:skip Skip the PR/issue when compiling release notes Team:Security Platform Security: Auth, Users, Roles, Spaces, Audit Logging, etc t// v8.18.7 v8.19.4 v9.0.7 v9.1.4 v9.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants