Skip to content

fix: main branch conflitct#374

Merged
qnen merged 7 commits intodevelopfrom
fix/fix-main-branch-conflitct
Mar 20, 2026
Merged

fix: main branch conflitct#374
qnen merged 7 commits intodevelopfrom
fix/fix-main-branch-conflitct

Conversation

@qnen
Copy link
Contributor

@qnen qnen commented Mar 20, 2026

Pull Request Checklist

Pull Request Type

  • Feature
  • Fix
  • Refactor
  • Pipeline
  • Tests
  • Documentation

Checklist

Please check each item after it's completed.

  • I have tested these changes locally.
  • I have updated the documentation accordingly.
  • I have added necessary comments to the code, especially in complex areas.
  • I have ensured that my changes adhere to the project's coding standards.
  • I have checked for any potential security issues.
  • I have ensured that all tests pass.
  • I have updated the version appropriately (if applicable).
  • I have confirmed this code is ready for review.

Additional Notes

Obs: Please, always remember to target your PR to develop branch instead of main.

qnen and others added 7 commits February 10, 2026 19:03
Using panic for license termination allowed recovery middleware to catch the failure, causing the app to continue running unlicensed. os.Exit(1) ensures the process terminates regardless of recovery middleware, so Docker can restart the container to retry license validation.

X-Lerian-Ref: 0x1
Deduplicates the os.Exit subprocess test pattern from TestDefaultHandler and TestTerminateSafe_WithDefaultHandler into a reusable runSubprocessTest t.Helper.

X-Lerian-Ref: 0x1
…ler-shutdown-behaviour

Hotfix/replace default handler shutdown behaviour
…ix-vulnerability

fix: bump go version to fix vulnerability GO-2026-4337
@qnen qnen self-assigned this Mar 20, 2026
@qnen qnen changed the title Fix/fix main branch conflitct fix: main branch conflitct Mar 20, 2026
Copy link
Contributor

@gandalf-at-lerian gandalf-at-lerian left a comment

Choose a reason for hiding this comment

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

LGTM. This is a conflict resolution bringing two main hotfixes into develop:

  1. fix(license): panicos.Exit(1) in DefaultHandler — correct call. panic can be caught by recovery middleware, letting the app continue unlicensed. os.Exit(1) is unrecoverable, ensuring Docker restarts and retries license validation.
  2. fix: Go version bump for GO-2026-4337 vulnerability — necessary.
  3. refactor: test helper extraction — clean dedup.

No net diff, pure merge resolution. ✅

@qnen qnen merged commit 977411b into develop Mar 20, 2026
7 checks passed
@qnen qnen deleted the fix/fix-main-branch-conflitct branch March 20, 2026 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants