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

sops/azkv: ensure compatibility with upstream #604

Merged
merged 2 commits into from
Mar 29, 2022
Merged

sops/azkv: ensure compatibility with upstream #604

merged 2 commits into from
Mar 29, 2022

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Mar 29, 2022 •
edited
Loading 

=== RUN   TestMasterKey_Encrypt
--- PASS: TestMasterKey_Encrypt (1.35s)
=== RUN   TestMasterKey_Decrypt
--- PASS: TestMasterKey_Decrypt (0.34s)
=== RUN   TestMasterKey_EncryptDecrypt_RoundTrip
--- PASS: TestMasterKey_EncryptDecrypt_RoundTrip (0.53s)
=== RUN   TestMasterKey_Encrypt_SOPS_Compat
--- PASS: TestMasterKey_Encrypt_SOPS_Compat (1.00s)
=== RUN   TestMasterKey_Decrypt_SOPS_Compat
--- PASS: TestMasterKey_Decrypt_SOPS_Compat (0.59s)

From: https://github.com/fluxcd/kustomize-controller/runs/5735891476

Ref: #595

@hiddeco hiddeco force-pushed the sops-azkv-compat branch 2 times, most recently from 6e1eb50 to 03ec6ca Compare March 29, 2022 11:14
hiddeco added 2 commits March 29, 2022 13:22
@hiddeco
sops/azkv: test compatibility with upstream
da09e21 
Add integration tests to ensure compatibility between our own Azure
keyservice implementation and upstream.
Tests are enabled to only run for `main`.

Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco
sops/azkv: ensure compatibility with upstream
692e4a7 
To please the older Azure SDK, the upstream SOPS implementation base64
URL encodes data before encryption, and decodes it afterwards. With the
new SDK, this has changed, requiring us to do the opposite to ensure
compatibility.

Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco hiddeco marked this pull request as ready for review March 29, 2022 11:30
@hiddeco hiddeco added the area/sops SOPS related issues and pull requests label Mar 29, 2022
stefanprodan
stefanprodan approved these changes Mar 29, 2022
View reviewed changes
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @hiddeco

@hiddeco hiddeco merged commit 55b0f4f into main Mar 29, 2022
@hiddeco hiddeco deleted the sops-azkv-compat branch March 29, 2022 11:44
@hiddeco hiddeco added the bug Something isn't working label Mar 29, 2022
@hiddeco hiddeco mentioned this pull request Mar 30, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanprodan stefanprodan stefanprodan approved these changes

Assignees
No one assigned
Labels
area/sops SOPS related issues and pull requests bug Something isn't working
Projects
Maintainers' Focus
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hiddeco @stefanprodan