Skip to content

Commit

Permalink
Rename GroupQuorum to ShamirThreshold.
Browse files Browse the repository at this point in the history
Signed-off-by: Felix Fontein <[email protected]>
  • Loading branch information
felixfontein committed Sep 25, 2024
1 parent 349ad29 commit e481717
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions cmd/sops/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -643,12 +643,12 @@ func main() {
failedCounter := 0
for _, path := range c.Args() {
err := updatekeys.UpdateKeys(updatekeys.Opts{
InputPath: path,
GroupQuorum: c.Int("shamir-secret-sharing-threshold"),
KeyServices: keyservices(c),
Interactive: !c.Bool("yes"),
ConfigPath: configPath,
InputType: c.String("input-type"),
InputPath: path,
ShamirThreshold: c.Int("shamir-secret-sharing-threshold"),
KeyServices: keyservices(c),
Interactive: !c.Bool("yes"),
ConfigPath: configPath,
InputType: c.String("input-type"),
})

if c.NArg() == 1 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/sops/subcommand/updatekeys/updatekeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
// Opts represents key operation options and config
type Opts struct {
InputPath string
GroupQuorum int
ShamirThreshold int
KeyServices []keyservice.KeyServiceClient
DecryptionOrder []string
Interactive bool
Expand Down Expand Up @@ -70,8 +70,8 @@ func updateFile(opts Opts) error {
// TODO: use conf.ShamirThreshold instead of tree.Metadata.ShamirThreshold in the next line?
// Or make this configurable?
var shamirThreshold = tree.Metadata.ShamirThreshold
if opts.GroupQuorum != 0 {
shamirThreshold = opts.GroupQuorum
if opts.ShamirThreshold != 0 {
shamirThreshold = opts.ShamirThreshold
}
shamirThreshold = min(shamirThreshold, len(conf.KeyGroups))
var shamirThresholdWillChange = tree.Metadata.ShamirThreshold != shamirThreshold
Expand Down

0 comments on commit e481717

Please sign in to comment.