chore(*): realign master branch to 3.0.0 release #144

nowNick · 2023-11-02T15:17:05Z

Description

This PR fixes master branch so that it points to the latest changes and to the release of 3.0.0 introduced here: #142

It reverts the master branch back to 1.3.0 release (which is: dc2a6b6) via commit: d4eac10 and then reapplies the changes introduced in 1.4.x, 1.5.x, 1.6.x and 3.0.0.

Issue reference:

KAG-2704

* fix(healthcheck) use single timer for all active checks * tests(*) removed tests that are not needed

Prevents a thundering herd issue whereby additional healthchecks are scheduled in the time in which it takes the healthcheck to complete.

* fix(healthcheck) record `last_run` when healthcheck is scheduled Prevents a thundering herd issue whereby additional healthchecks are scheduled in the time in which it takes the healthcheck to complete. * tests(active-probes) interval is respected Co-authored-by: Brian Fox <brianhfox@gmail.com>

Co-authored-by: Brian Fox <brianhfox@gmail.com> Co-authored-by: Brian Fox <brianhfox@gmail.com>

* chore(*) add GitHub Actions workflows * fix(healthcheck) lint error

* simplify start of the checking timer, ensuring only one worker actively sends healthchecks. one timer per worker, but before doing anything, tries to acquire an expiration lock. if fails, try again later. if the "winning" worker ever fails to renew it, some other worker would get it.

Also: - updated scm-1 rockspec - bumped openresty version in CI tests

Added new function delayed_clear. This function marks all targets to be removed, but do not actually remove them. If before the delay parameter any of them is re-added, it is unmarked for removal. This function makes it possible to keep target state during config changes, where the targets might be removed and then re-added.

* chore(readme) 1.5.0 release * docs(*) release 1.5.0 Also added docs missing to delayed_clear() function.

- added latest openresty to the CI matrix - added tests for when lua-resty-worker-events or lua-resty-events are used

* feat(healthcheck) support setting the events module * fix(healthcheck) defaults to lua-resty-worker-events * tests(workflows) fixed manual deps install * fix(healthcheck) check empty opts * chore(workflows) use last luarocks * test(workflows) use pre-built deps, test with or 1.13-1.21 * chore(workflows) install lua-resty-events in ci * tests(workflows) debug * fixed tests and resty-events usage * init resty-events in init_worker * fix(tests) init events module (#107) * add init_worker in 03-get_target_status.t * fix 03-get_target_status.t * fix 03-get_target_status_with_sleeps.t * fix 04-report_success.t * fix 05/06 * fix 07/08 * fix 09 * change 10 * fix 11 * fix 12 * change 13 * fix 15 * partial fix 16 * change 17 * fix 18 * change 13 * fix 16 * style 05 * fix 01/02 * use string.buffer in OpenResty 1.21.4.1 (#109) * use string.buffer in OpenResty 1.21.4.1 * remove cjson require * fix(healthcheck) use the events module set in defaults * tests(with_resty-events) disabled tests that need more work * fix(healthcheck) avoid breaking when opts are nil * tests(with_resty-events) removed unnecessary test * tests(with_resty-events) increased sleeps Co-authored-by: Chrono <chrono_cpp@me.com>

* docs(readme) release 1.6.0 * fix(rockspec) typo * chore(rockspec) release 1.6.0 * docs(*) release 1.6.0

* chore(workflows) bump deps versions * chore(helathcheck) support any lua-resty-events 0.1.x

* fix(healthchecker) port 2.x lock fixes to 1.5.x * chore(healthcheck) remove unused vars * chore(healthcheck) fix indent level * fix(healthcheck) correct duplicate handling in add_target * fix(healthchecker) handle fetch_target_list failure in checker callback * chore(healthcheck) apply suggestions from #112 Co-authored-by: Vinicius Mignot <vinicius.mignot@gmail.com>

) * chore(healthcheck) increase verbosity for locked function failures * tests(healthcheck) add tests for run_locked()

the health-check timer also checks if targets must be removed. to safely remove targets, the targets list is locked. if this check runs on every health-check cycle and there are a large number of targets, a bazillion locks will be created. this change avoids that by lowering the frequency the cleanup list is checked. the side-effect is that targets marked for cleanup may exist for more time (2.5s) than expected, and some unexpected active checks could happen.

${{ env.* }} is not evaluated in `with` causing gha tries to cache `/`.

* feat(ci/KAG-1800): add lint and sast workflows using shared actions * chore(ci): pin shared code quality actions * chore(*): backport - localize some functions A commit on master 80ee2e1 introduced localizing some functions. This commit backports that one. Backports: #92 * fix(healthcheck): fixed incorrect default http_statuses when new() was called multiple times (#83) * chore(lint): bump kong/public-shared-actions * docs(README): added 1.5.2 and 1.5.3 releases * chore(*) rename readme, add release instructions * chore(healthcheck): fix get_defaults function * fix(test): fix worker-events test * release 3.0.0 * chore(github): cancel in progress workflows when new pushed --------- Co-authored-by: saisatish karra <saisatish.karra@konghq.com> Co-authored-by: Shuoqing Ding <dsq704136@gmail.com> Co-authored-by: Vinicius Mignot <vinicius.mignot@gmail.com> Co-authored-by: Thijs Schreijer <thijs@thijsschreijer.nl>

This reverts the master branch backs to the commit of dc2a6b6 so that we can skip over 2.0.0 release. The 1.3.0 release is the first common commit between master branch and 1.6.x (also 3.0.x) branches.

CLAassistant · 2023-11-02T15:17:15Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
8 out of 10 committers have signed the CLA.

✅ mayocream
✅ kayano
✅ onematchfox
✅ ADD-SP
✅ oowl
✅ chronolaw
✅ flrgh
✅ nowNick
❌ Murillo Paula
❌ HansK-p

Murillo Paula seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

CLAassistant · 2023-11-02T15:17:17Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
8 out of 10 committers have signed the CLA.

✅ onematchfox
✅ kayano
✅ mayocream
✅ chronolaw
✅ oowl
✅ ADD-SP
✅ nowNick
✅ flrgh
❌ Murillo Paula
❌ HansK-p

Murillo Paula seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

docs/index.html

docs/topics/readme.md.html

t/with_worker-events/util/key.pem

locao

Just a few details.

lua-resty-healthcheck-2.0.0-1.src.rock

rockspecs/lua-resty-healthcheck-0.4.1-2.rockspec

README.md

rockspecs/lua-resty-healthcheck-2.0.0-1.rockspec

t/21-run_locked.t

Co-authored-by: Vinicius Mignot <vinicius.mignot@gmail.com>

Release 2.0.x introduced some rockspecs with fixes. Reverting back to 1.3.0 and reapplying changes from 3.0.0 reversed those fixes. This commit reintroduces them. KAG-2704

locao · 2023-11-08T12:42:16Z

.github/workflows/sast.yml

@@ -1,5 +1,10 @@
 name: SAST

+concurrency:
+  # for PR's cancel the running task, if another commit is pushed


This is great! 🙌

Thanks 😊 ! But I need to give credit where credit is due: @Tieske 👏
#142 (comment)

locao

Great work! 🎉

locao and others added 30 commits January 7, 2021 12:46

release 1.4.0

f95fee8

fix(healthcheck) use single timer for all active checks (#62)

0d816f5

* fix(healthcheck) use single timer for all active checks * tests(*) removed tests that are not needed

docs(*) docs for release 1.4.0

d056109

chore(ci) use newer openresty and luarocks releases (#68)

9e5561e

fix(healthcheck) single worker actively checks the status (#67)

45fc129

release 1.4.1

9e9a936

fix(healthcheck) record last_run when healthcheck is scheduled (#72)

03660ab

Prevents a thundering herd issue whereby additional healthchecks are scheduled in the time in which it takes the healthcheck to complete.

fix(healthcheck) remove event watcher when stopping hc (#74)

1edc9b1

Co-authored-by: Brian Fox <brianhfox@gmail.com> Co-authored-by: Brian Fox <brianhfox@gmail.com>

tests(*) avoid some flakiness (#75)

8634a82

release 1.4.2

6ab057d

chore(*) add GitHub Actions workflows (#82)

5e5a040

* chore(*) add GitHub Actions workflows * fix(healthcheck) lint error

chore(rockspec) added rockspec for release 1.5.0-1

806ea8f

Also: - updated scm-1 rockspec - bumped openresty version in CI tests

feat(*) add header support for active checks

00a1b12

feat(active) support map headers

54fb2d5

chore(readme) 1.5.0 release (#91)

a2bee12

* chore(readme) 1.5.0 release * docs(*) release 1.5.0 Also added docs missing to delayed_clear() function.

fix(healthcheck) Use pair instead ipair for hcs weak table (#93)

3f7efd1

release 1.5.1 (#95)

dff8fe6

chore(readme) update badges (#98)

3765587

docs(readme) updated with 1.4.x changes

ec40ce0

chore(workflows) updates for 1.6.0 release

fb5150a

- added latest openresty to the CI matrix - added tests for when lua-resty-worker-events or lua-resty-events are used

release 1.6.0 (#110)

71fef7e

* docs(readme) release 1.6.0 * fix(rockspec) typo * chore(rockspec) release 1.6.0 * docs(*) release 1.6.0

chore(*) localize string.format (#111)

26d50c6

fix(healthcheck) support any lua-resty-events 0.1.x (#118)

99a13ab

* chore(workflows) bump deps versions * chore(helathcheck) support any lua-resty-events 0.1.x

chore(healthcheck) increase verbosity for locked function failures (#114

b050953

) * chore(healthcheck) increase verbosity for locked function failures * tests(healthcheck) add tests for run_locked()

ADD-SP and others added 6 commits September 6, 2023 09:24

fix(mtls) use OpenResty's API for mtls (#99)

88ad1b4

chore(ci): fix cache path (#136)

e666583

${{ env.* }} is not evaluated in `with` causing gha tries to cache `/`.

release 1.6.3 (#135)

d5754c2

chore(*): revert commits back to 1.3.0

d4eac10

This reverts the master branch backs to the commit of dc2a6b6 so that we can skip over 2.0.0 release. The 1.3.0 release is the first common commit between master branch and 1.6.x (also 3.0.x) branches.

Merge branch 'release/3.0.x' into chore/revert-master-branch

ec83652

github-advanced-security bot found potential problems Nov 2, 2023

View reviewed changes

docs/index.html Fixed Show fixed Hide fixed

docs/topics/readme.md.html Fixed Show fixed Hide fixed

t/with_worker-events/util/key.pem Dismissed Show dismissed Hide dismissed

chore(docs): fix semgrep https warnings

2f9ed19

nowNick force-pushed the chore/revert-master-branch branch from 84648c0 to 2f9ed19 Compare November 6, 2023 14:59

nowNick marked this pull request as ready for review November 6, 2023 15:31

nowNick requested a review from locao November 6, 2023 16:04

nowNick self-assigned this Nov 6, 2023

nowNick requested a review from Tieske November 6, 2023 16:04

Tieske previously approved these changes Nov 6, 2023

View reviewed changes

locao requested changes Nov 7, 2023

View reviewed changes

docs(readme): update shield badges

945bf65

Co-authored-by: Vinicius Mignot <vinicius.mignot@gmail.com>

nowNick dismissed Tieske’s stale review via 945bf65 November 8, 2023 08:24

nowNick changed the title ~~chore/revert master branch~~ chore(*): realign master branch to 3.0.0 release Nov 8, 2023

chore(*): add 2.0.0 rockspecs and fix tests

b590ba1

Release 2.0.x introduced some rockspecs with fixes. Reverting back to 1.3.0 and reapplying changes from 3.0.0 reversed those fixes. This commit reintroduces them. KAG-2704

nowNick force-pushed the chore/revert-master-branch branch from efab78c to b590ba1 Compare November 8, 2023 11:09

nowNick requested review from locao and Tieske November 8, 2023 12:11

Tieske approved these changes Nov 8, 2023

View reviewed changes

locao reviewed Nov 8, 2023

View reviewed changes

locao approved these changes Nov 8, 2023

View reviewed changes

nowNick merged commit 7478c5f into master Nov 8, 2023
6 of 7 checks passed

nowNick deleted the chore/revert-master-branch branch November 8, 2023 13:33

nowNick mentioned this pull request Nov 8, 2023

fix(mtls) update to use newer mTLS api #89

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(*): realign master branch to 3.0.0 release #144

chore(*): realign master branch to 3.0.0 release #144

nowNick commented Nov 2, 2023 •

edited by jira bot

CLAassistant commented Nov 2, 2023 •

edited

CLAassistant commented Nov 2, 2023

locao left a comment

locao Nov 8, 2023

nowNick Nov 8, 2023

locao left a comment

chore(*): realign master branch to 3.0.0 release #144

chore(*): realign master branch to 3.0.0 release #144

Conversation

nowNick commented Nov 2, 2023 • edited by jira bot

Description

Issue reference:

CLAassistant commented Nov 2, 2023 • edited

CLAassistant commented Nov 2, 2023

locao left a comment

Choose a reason for hiding this comment

locao Nov 8, 2023

Choose a reason for hiding this comment

nowNick Nov 8, 2023

Choose a reason for hiding this comment

locao left a comment

Choose a reason for hiding this comment

nowNick commented Nov 2, 2023 •

edited by jira bot

CLAassistant commented Nov 2, 2023 •

edited