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

upgrade sops from v3.4.0 to v3.5.0 #1062

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Conversation

jmhodges
Copy link
Contributor

@jmhodges jmhodges commented Nov 8, 2024

The change from v3.4.0 to v3.5.0 is the first version where the Go
module had a real version associated with it. This also includes the
first of two module import path changes sops went through to on its way
to the current v3.9.1 version. This one is from go.mozilla.org/sops to
go.mozilla.org/sops/v3.

v3.5.0 dates back 4 years, but an update directly to 3.9.1 was around
500,000 new lines of code being added at once. Partially, because in
v3.8.0, the sops maintainers changed the module path again from
go.mozilla.org/sops/v3 to github.com/getsops/sops/v3.

There's good reason to do that larger update (mostly, it's holding on to
very old versions of other dependencies), but we choose to break that
upgrade across multiple bumps for reviewer ease.

My current plan is to bump us to v3.5.0, then to v3.7.3 (the last
version before the second getsops import path change), and then to
v3.9.1.

I could be told we should just do the one big leap to avoid the two
different import path changes.

@jmhodges jmhodges force-pushed the upgrade-sops-to-v3.5.0-gnight branch 3 times, most recently from 55c3b7d to fac670e Compare November 8, 2024 18:14
The change from v3.4.0 to v3.5.0 is the first version where the Go
module had a real version associated with it. This also includes the
first of two module import path changes sops went through to on its way
to the current v3.9.1 version. This one is from `go.mozilla.org/sops` to
`go.mozilla.org/sops/v3`.

v3.5.0 dates back 4 years, but an update directly to 3.9.1 was around
500,000 new lines of code being added at once. Partially, because in
v3.8.0, the sops maintainers changed the module path again from
`go.mozilla.org/sops/v3` to `github.com/getsops/sops/v3`.

There's good reason to do that larger update (mostly, it's holding on to
very old versions of other dependencies), but we choose to break that
upgrade across multiple bumps for reviewer ease.

My current plan is to bump us to v3.5.0, then to v3.7.3 (the last
version before the second `getsops` import path change), and then to
v3.9.1.

I could be told we should just do the one big leap to avoid the two
different import path changes.
@jmhodges jmhodges force-pushed the upgrade-sops-to-v3.5.0-gnight branch from fac670e to 6a0d957 Compare December 7, 2024 05:23
@jmhodges jmhodges marked this pull request as ready for review December 9, 2024 22:16
@jmhodges jmhodges requested review from a team as code owners December 9, 2024 22:17
@jmhodges jmhodges requested review from bhearsum and removed request for a team December 9, 2024 22:17
Copy link
Contributor

@say-yawn say-yawn left a comment

Choose a reason for hiding this comment

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

My current plan is to bump us to v3.5.0, then to v3.7.3 (the last
version before the second getsops import path change), and then to
v3.9.1.

I like the plan of gradually updating the instead of doing one big push.

@jmhodges jmhodges requested a review from say-yawn December 10, 2024 20:17
Comment on lines +229 to +230
// LoadEncryptedFileWithBugFixes is a wrapper around LoadEncryptedFile which includes
// check for the issue described in https://github.com/mozilla/sops/pull/435
Copy link
Contributor

@say-yawn say-yawn Dec 12, 2024

Choose a reason for hiding this comment

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

Note: The config repo uses SOPS 3.9.1, the bug was fixed on 3.3.0. Since our repo uses newer version highly unlikely this will be a breaking change.

@jmhodges jmhodges merged commit 570798a into main Dec 12, 2024
15 checks passed
@jmhodges jmhodges deleted the upgrade-sops-to-v3.5.0-gnight branch December 12, 2024 20:54
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.

3 participants