Skip to content

Conversation

lantoli
Copy link
Member

@lantoli lantoli commented Oct 20, 2025

Description

Move CloseTokenSource call out of defer.

This is an improvement so we can call Fatal (as it was before) if tf6server.Serve returns an error. We can't use defer because os.Exit in Fatal doesn't call deferred methods.

Link to any related issue(s):

Type of change:

  • Bug fix (non-breaking change which fixes an issue). Please, add the "bug" label to the PR.
  • New feature (non-breaking change which adds functionality). Please, add the "enhancement" label to the PR. A migration guide must be created or updated if the new feature will go in a major version.
  • Breaking change (fix or feature that would cause existing functionality to not work as expected). Please, add the "breaking change" label to the PR. A migration guide must be created or updated.
  • This change requires a documentation update
  • Documentation fix/enhancement

Required Checklist:

  • I have signed the MongoDB CLA
  • I have read the contributing guides
  • I have checked that this change does not generate any credentials and that they are NOT accidentally logged anywhere.
  • I have added tests that prove my fix is effective or that my feature works per HashiCorp requirements
  • I have added any necessary documentation (if appropriate)
  • I have run make fmt and formatted my code
  • If changes include deprecations or removals I have added appropriate changelog entries.
  • If changes include removal or addition of 3rd party GitHub actions, I updated our internal document. Reach out to the APIx Integration slack channel to get access to the internal document.

Further comments

@lantoli lantoli marked this pull request as ready for review October 20, 2025 18:27
@lantoli lantoli requested a review from a team as a code owner October 20, 2025 18:27
@Copilot Copilot AI review requested due to automatic review settings October 20, 2025 18:27
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR improves error handling in the provider's main function by moving the CloseTokenSource cleanup call out of a deferred execution. The change enables proper error handling with log.Fatal, which would otherwise skip deferred functions due to its use of os.Exit.

  • Moved config.CloseTokenSource() from defer to direct call after tf6server.Serve
  • Changed error handling from log.Println to log.Fatal for critical server startup failures

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

config.CloseTokenSource() // Revoke SA token when the plugin is exiting because Terraform command finished.
if err != nil {
log.Println(err)
log.Fatal(err)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice

@lantoli lantoli merged commit 8ea03a9 into master Oct 20, 2025
88 checks passed
@lantoli lantoli deleted the sa_main branch October 20, 2025 19:06
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.

2 participants