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.

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

fix: Uses google_cloud_kms_config correctly in mongodbatlas_encryption_at_rest creation #1962

Merged
merged 1 commit into from Feb 20, 2024

Conversation

DasLampe
Copy link
Contributor

Description

Fix mongodbatlas_encryption_at_rest terraform resource, when google_cloud_kms_config block is defined.
Because of the wrong check-in if statement the request body to MongoDB Atlas was empty if there was no azure_key_vault_config block, which resulted in a MISSING_ENCRYPTION_AT_REST_PROVIDER error.

Type of change:

  • [ x] 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.
  • Breaking change (fix or feature that would cause existing functionality to not work as expected). Please, add the "breaking change" label to the PR.
  • This change requires a documentation update
  • Documentation fix/enhancement

Required Checklist:

  • [x ] I have signed the MongoDB CLA
  • I have read the contribution guidelines
  • 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 defined an isolated PR with a relevant title as it will be used in the auto-generated changelog.
  • 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

@DasLampe DasLampe requested a review from a team as a code owner February 20, 2024 13:22
Copy link
Collaborator

@AgustinBettati AgustinBettati left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for the contribution!

@AgustinBettati AgustinBettati changed the title fix: mongodbatlas_encryption_at_rest resource with google_cloud_kms_config fix: Uses google_cloud_kms_config correctly in mongodbatlas_encryption_at_rest creation Feb 20, 2024
@AgustinBettati
Copy link
Collaborator

AgustinBettati commented Feb 20, 2024

Was able to reproduce the error and verified the fix when defining google_cloud_kms_config.
Ran the TestAccEncryptionAtRest_basicGCP locally (this test was catching the existing bug but is not run in our CI):

go test -timeout 2400s -run ^TestAccEncryptionAtRest_basicGCP$ github.com/mongodb/terraform-provider-mongodbatlas/internal/service/encryptionatrest

ok  	github.com/mongodb/terraform-provider-mongodbatlas/internal/service/encryptionatrest	5.601s

We can ignore the failing CI (due to PR coming from forked repository).

@AgustinBettati AgustinBettati merged commit c371c12 into mongodb:master Feb 20, 2024
42 of 46 checks passed
lantoli added a commit that referenced this pull request Feb 21, 2024
* master:
  chore: Bump dorny/paths-filter from 3.0.0 to 3.0.1 (#1964)
  chore: Bump github.com/aws/aws-sdk-go from 1.50.17 to 1.50.22 (#1965)
  chore: Upgrades `advanced_cluster` resource to auto-generated SDK (#1947)
  fix: mongodbatlas_encryption_at_rest resource with google_cloud_kms_config (#1962)
  chore: Restores atlas streams guide in examples section (#1958)
  chore: Signs created tag during release process (#1960)
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.

None yet

2 participants