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

Revert intro of WithError for most key sources #1146

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Revert intro of WithError for most key sources #1146

merged 1 commit into from
Jul 11, 2023

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Nov 21, 2022

Attempt to start to move things from develop into master. This PR addresses one issue reported by @ajvb via email.

  1. Errors would be reported multiple times in some cases, especially where a loop would happen on e.g. a series of keys. After close inspection of main versus develop, reverting all WithError calls aligns things again to match original UX is the answer.
  2. Edge-case backwards compatibility issue for GCP key source, cherry-picked from @ajvb's own https://github.com/mozilla/sops/commits/ajvb/fixes.

Point 2 will be handled separately.

@hiddeco hiddeco added this to the v3.8.0 milestone Jul 4, 2023
@hiddeco hiddeco changed the title Solve backwards compatibility issues introduced in rewrites Revert intro of WithError for most key sources Jul 4, 2023
@hiddeco hiddeco changed the title Revert intro of WithError for most key sources Revert intro of WithError for most key sources Jul 4, 2023
@hiddeco hiddeco requested a review from a team July 4, 2023 20:46
Most of the rewritten key sources introduced `WithError` calls, which
does not appear to go well with the UX of the CLI. This reverts it to
be the semi equal to current `master`.

During the diff, I noticed the current age implementation in master
does make use of `WithError`. Which makes me wonder if errors are not
returned twice at present in the CLI.

Signed-off-by: Hidde Beydals <hello@hidde.co>
@onedr0p onedr0p merged commit 1ea4a74 into getsops:main Jul 11, 2023
7 checks passed
@hiddeco hiddeco deleted the revert-log-unify branch July 11, 2023 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants