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.

Sign up for GitHub

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

Jump to bottom

feat(KMS): derive keys for logs and async #2338

Merged
merged 16 commits into from
Aug 14, 2024
Merged

feat(KMS): derive keys for logs and async #2338

merged 16 commits into from
Aug 14, 2024

Conversation

gak
Copy link
Contributor

@gak gak commented Aug 13, 2024 •
edited
Loading

Fixes #2290
Follows #2312
Needs work: #2346 #2348

Caution

Will nuke logs and async columns!

  • Uses KMS via tink FTL_KMS_URI, so fake-kms:// or aws-kms:// will work. Omitting will not encrypt.
  • Remove old plaintext keys envs.

@github-actions github-actions bot changed the title Gak/kms 2 feat: Gak/kms 2 Aug 13, 2024
@ftl-robot ftl-robot mentioned this pull request Aug 13, 2024
Open
@gak gak force-pushed the gak/kms-2 branch 2 times, most recently from d9dd7f8 to ac1ec1e Compare August 13, 2024 20:42
@gak gak changed the title feat: Gak/kms 2 feat: KMS/derive keys for logs and async Aug 13, 2024
@gak gak marked this pull request as ready for review August 13, 2024 21:49
@gak gak requested a review from alecthomas as a code owner August 13, 2024 21:49
@gak gak requested review from a team and deniseli and removed request for a team August 13, 2024 21:49
@gak gak changed the title feat: KMS/derive keys for logs and async feat!: KMS/derive keys for logs and async Aug 13, 2024
@alecthomas alecthomas requested a review from matt2e August 13, 2024 21:55
alecthomas
alecthomas approved these changes Aug 13, 2024
View reviewed changes
Copy link
Collaborator

@alecthomas alecthomas left a comment

Choose a reason for hiding this comment

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

LGTM but let's refactor in a followup.

backend/controller/dal/encryption.go Show resolved Hide resolved
@gak gak mentioned this pull request Aug 13, 2024
Closed
@github-actions github-actions bot changed the title feat!: KMS/derive keys for logs and async feat(KMS): derive keys for logs and async Aug 13, 2024
alecthomas
alecthomas requested changes Aug 13, 2024
View reviewed changes
Copy link
Collaborator

@alecthomas alecthomas left a comment

Choose a reason for hiding this comment

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

Just pulling this out of approved because I believe feat! will push us to 1.0 which we do not want.

@alecthomas
Copy link
Collaborator

NM our AI overlords fixed it for us!

@gak gak added this pull request to the merge queue Aug 14, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 14, 2024
@matt2e matt2e added this pull request to the merge queue Aug 14, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 14, 2024
@matt2e matt2e enabled auto-merge August 14, 2024 01:54
@matt2e matt2e added this pull request to the merge queue Aug 14, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 14, 2024
@matt2e matt2e enabled auto-merge August 14, 2024 02:12
@matt2e matt2e added this pull request to the merge queue Aug 14, 2024
Merged via the queue into main with commit 2a3edbc Aug 14, 2024
17 checks passed
@matt2e matt2e deleted the gak/kms-2 branch August 14, 2024 02:20
matt2e added a commit that referenced this pull request Aug 14, 2024
@matt2e
Revert "feat(KMS): derive keys for logs and async (#2338)"
0607e55 
This reverts commit 2a3edbc.
@matt2e matt2e mentioned this pull request Aug 14, 2024
Closed
@matt2e matt2e added the approved Marks an already closed PR as approved label Aug 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alecthomas alecthomas alecthomas approved these changes

@deniseli deniseli Awaiting requested review from deniseli

@matt2e matt2e Awaiting requested review from matt2e

Assignees
No one assigned
Labels
approved Marks an already closed PR as approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Key derivation to replace individual keys in encryptor
3 participants
@gak @alecthomas @matt2e