scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 02:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audit: small tidy up (#22232)

Browse Source 
* options => opts

* Standardise receiver letter, specify interface
This commit is contained in:
Peter Wilson
2023-08-08 16:05:58 +01:00
committed by GitHub
parent ea1b8e95c6
commit cd02421c7a
8 changed files with 95 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
internal/observability/event/options_test.go
View File

@@ -82,16 +82,16 @@ func TestOptions_WithID(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()
options := &options{}
opts := &options{}
applyOption := WithID(tc.Value)
err := applyOption(options)
err := applyOption(opts)
switch {
case tc.IsErrorExpected:
require.Error(t, err)
require.EqualError(t, err, tc.ExpectedErrorMessage)
default:
require.NoError(t, err)
require.Equal(t, tc.ExpectedValue, options.withID)
require.Equal(t, tc.ExpectedValue, opts.withID)
}
})
}
@@ -222,11 +222,11 @@ func TestOptions_WithFacility(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()
options := &options{}
opts := &options{}
applyOption := WithFacility(tc.Value)
err := applyOption(options)
err := applyOption(opts)
require.NoError(t, err)
require.Equal(t, tc.ExpectedValue, options.withFacility)
require.Equal(t, tc.ExpectedValue, opts.withFacility)
})
}
}
@@ -260,11 +260,11 @@ func TestOptions_WithTag(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()
options := &options{}
opts := &options{}
applyOption := WithTag(tc.Value)
err := applyOption(options)
err := applyOption(opts)
require.NoError(t, err)
require.Equal(t, tc.ExpectedValue, options.withTag)
require.Equal(t, tc.ExpectedValue, opts.withTag)
})
}
}
@@ -298,11 +298,11 @@ func TestOptions_WithSocketType(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()
options := &options{}
opts := &options{}
applyOption := WithSocketType(tc.Value)
err := applyOption(options)
err := applyOption(opts)
require.NoError(t, err)
require.Equal(t, tc.ExpectedValue, options.withSocketType)
require.Equal(t, tc.ExpectedValue, opts.withSocketType)
})
}
}
@@ -346,16 +346,16 @@ func TestOptions_WithMaxDuration(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()
options := &options{}
opts := &options{}
applyOption := WithMaxDuration(tc.Value)
err := applyOption(options)
err := applyOption(opts)
switch {
case tc.IsErrorExpected:
require.Error(t, err)
require.EqualError(t, err, tc.ExpectedErrorMessage)
default:
require.NoError(t, err)
require.Equal(t, tc.ExpectedValue, options.withMaxDuration)
require.Equal(t, tc.ExpectedValue, opts.withMaxDuration)
}
})
}
@@ -402,9 +402,9 @@ func TestOptions_WithFileMode(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()
options := &options{}
opts := &options{}
applyOption := WithFileMode(tc.Value)
err := applyOption(options)
err := applyOption(opts)
switch {
case tc.IsErrorExpected:
require.Error(t, err)
@@ -414,10 +414,10 @@ func TestOptions_WithFileMode(t *testing.T) {
switch {
case tc.IsNilExpected:
// Optional Option 'not supplied' (i.e. was whitespace/empty string)
require.Nil(t, options.withFileMode)
require.Nil(t, opts.withFileMode)
default:
// Dereference the pointer, so we can examine the file mode.
require.Equal(t, tc.ExpectedValue, *options.withFileMode)
require.Equal(t, tc.ExpectedValue, *opts.withFileMode)
}
}
})