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

Add SSH support for age #1692

Merged
merged 8 commits into from
Feb 20, 2025
Merged

Add SSH support for age #1692

merged 8 commits into from
Feb 20, 2025

Conversation

haoqixu
Copy link
Contributor

@haoqixu haoqixu commented Dec 1, 2024 •
edited by felixfontein
Loading

Continues #1134.

Closes #1134
Closes #1496
Fixes #692

@haoqixu
Copy link
Contributor Author

haoqixu commented Dec 1, 2024

This PR rebases #1134 and includes _FILE in the environment variable according to the suggestion in #1134 (comment), but uses SopsAgeSshPrivateKeyFileEnv instead of SopsAgeSshPrivateKeyEnvFile to stay aligned with SopsAgeKeyFileEnv.

@haoqixu haoqixu marked this pull request as draft December 1, 2024 21:48
@haoqixu haoqixu marked this pull request as ready for review December 1, 2024 21:57
@haoqixu haoqixu mentioned this pull request Dec 1, 2024
Closed
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 2, 2024
View reviewed changes
This was referenced Dec 3, 2024
Closed
Closed
@haoqixu haoqixu force-pushed the age-ssh branch 2 times, most recently from 220e7dc to b325a74 Compare December 16, 2024 04:16
@felixfontein felixfontein added this to the 3.10.0 milestone Dec 24, 2024
felixfontein
felixfontein reviewed Jan 1, 2025
View reviewed changes
Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution, and sorry it took so long to review it...

@haoqixu haoqixu force-pushed the age-ssh branch 2 times, most recently from 1af2314 to 714f23d Compare January 2, 2025 08:14
felixfontein
felixfontein reviewed Jan 2, 2025
View reviewed changes
Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Looks good to me, up to two details in go.mod and the open discussions on the Code scanning warnings.

@brianmcgee
Copy link
Contributor

It looks like this PR is ready to roll once those codeql warnings are dismissed. Am I right, or is there anything else needing done?

@haoqixu
Copy link
Contributor Author

haoqixu commented Feb 7, 2025

It looks like this PR is ready to roll once those codeql warnings are dismissed. Am I right, or is there anything else needing done?

yes, I think so. 🤔

@felixfontein
Copy link
Contributor

@haoqixu can you rebase the PR and integrate getsops/docs#9 into README.rst in this repository? (README.rst is the current source of truth for SOPS documentation, not the docs repo.)

@haoqixu
Copy link
Contributor Author

haoqixu commented Feb 19, 2025

@haoqixu can you rebase the PR and integrate getsops/docs#9 into README.rst in this repository? (README.rst is the current source of truth for SOPS documentation, not the docs repo.)

No problem. Done.

felixfontein
felixfontein reviewed Feb 20, 2025
View reviewed changes
Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Besides that, LGTM.

@felixfontein
Copy link
Contributor

(I also dismissed the CodeQL warnings.)

@haoqixu @felixfontein
apply suggestions from code review
244a9a4 
Co-authored-by: Felix Fontein <[email protected]>
Signed-off-by: xu0o0 <[email protected]>
@felixfontein felixfontein merged commit 0cea11f into getsops:main Feb 20, 2025
16 checks passed
@felixfontein
Copy link
Contributor

@mstrangfeld @haoqixu thank you very much for your work on this, and thanks again @iamd3vil for getting it started in #898!
Also thanks to everyone involved in providing feedback and testing #898, #1134, and this PR!

This was referenced Feb 20, 2025
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
area/keyservice enhancement keyservice/age
Projects
None yet
Milestone
3.10.0
Development

Successfully merging this pull request may close these issues.

Adding support for ssh keys for encryption.
4 participants
@haoqixu @brianmcgee @felixfontein @mstrangfeld