Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion age/keysource.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func formatError(msg string, err error, errs errSet, unusedLocations []string) e
} else if count == 2 {
unusedSuffix = fmt.Sprintf("s '%s' and '%s'", unusedLocations[0], unusedLocations[1])
} else {
unusedSuffix = fmt.Sprintf("s '%s', and '%s'", strings.Join(unusedLocations[:count - 1], "', '"), unusedLocations[count - 1])
unusedSuffix = fmt.Sprintf("s '%s', and '%s'", strings.Join(unusedLocations[:count-1], "', '"), unusedLocations[count-1])
}
unusedSuffix = fmt.Sprintf(". Did not find keys in location%s.", unusedSuffix)
}
Expand Down
2 changes: 1 addition & 1 deletion age/tui.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var pluginTerminalUI = &plugin.ClientUI{
if testing.Testing() && testOnlyAgePassword != "" {
return testOnlyAgePassword, nil
}
return pluginTerminalUIImpl.RequestValue(name, message, isSecret);
return pluginTerminalUIImpl.RequestValue(name, message, isSecret)
},
Confirm: func(name, message, yes, no string) (choseYes bool, err error) {
return pluginTerminalUIImpl.Confirm(name, message, yes, no)
Expand Down
2 changes: 1 addition & 1 deletion azkv/keysource.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
}

func (key *MasterKey) ensureKeyHasVersion(ctx context.Context) error {
if (key.Version != "") {
if key.Version != "" {
// Nothing to do
return nil
}
Expand Down
1 change: 0 additions & 1 deletion stores/stores.go
Original file line number Diff line number Diff line change
Expand Up @@ -605,4 +605,3 @@ func ValToString(v interface{}) string {
return fmt.Sprintf("%v", v)
}
}

12 changes: 5 additions & 7 deletions stores/stores_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,20 @@ import (
"github.com/stretchr/testify/assert"
)


func TestValToString(t *testing.T) {
assert.Equal(t, "1", ValToString(1))
assert.Equal(t, "1.0", ValToString(1.0))
assert.Equal(t, "1.1", ValToString(1.10))
assert.Equal(t, "1.23", ValToString(1.23))
assert.Equal(t, "1.2345678901234567", ValToString(1.234567890123456789))
assert.Equal(t, "200000.0", ValToString(2E5))
assert.Equal(t, "-2E+10", ValToString(-2E10))
assert.Equal(t, "2E-10", ValToString(2E-10))
assert.Equal(t, "1.2345E+100", ValToString(1.2345E100))
assert.Equal(t, "1.2345E-100", ValToString(1.2345E-100))
assert.Equal(t, "200000.0", ValToString(2e5))
assert.Equal(t, "-2E+10", ValToString(-2e10))
assert.Equal(t, "2E-10", ValToString(2e-10))
assert.Equal(t, "1.2345E+100", ValToString(1.2345e100))
assert.Equal(t, "1.2345E-100", ValToString(1.2345e-100))
assert.Equal(t, "true", ValToString(true))
assert.Equal(t, "false", ValToString(false))
ts, _ := time.Parse(time.RFC3339, "2025-01-02T03:04:05Z")
assert.Equal(t, "2025-01-02T03:04:05Z", ValToString(ts))
assert.Equal(t, "a string", ValToString("a string"))
}