Skip to content

Commit f4fb5ef

Browse files
joe0BABjoe0BAB
authored
Merge pull request #517 from docker/feat/statusmessage-field
feat(x): status message field
2 parents baa5e70 + e8f72ca commit f4fb5ef

12 files changed

Lines changed: 97 additions & 52 deletions

File tree

‎client/client.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,13 @@ func (c client) ListPlugins(ctx context.Context) ([]PluginInfo, error) {
251251
continue
252252
}
253253
info := PluginInfo{
254-
Name: name,
255-
Version: version,
256-
Disabled: item.GetDisabled(),
257-
External: item.GetExternal(),
258-
Configurable: item.GetConfigurable(),
259-
RunStatus: item.GetRunStatus(),
254+
Name: name,
255+
Version: version,
256+
Disabled: item.GetDisabled(),
257+
External: item.GetExternal(),
258+
Configurable: item.GetConfigurable(),
259+
RunStatus: item.GetRunStatus(),
260+
StatusMessage: item.GetStatusMessage(),
260261
}
261262
if sp := item.GetSecretsProvider(); sp != nil {
262263
pattern, err := secrets.ParsePattern(sp.GetPattern())
@@ -297,6 +298,7 @@ type PluginInfo struct {
297298
External bool
298299
Configurable bool
299300
RunStatus pluginsv1.RunStatus
301+
StatusMessage string
300302
SecretsProvider *SecretsProviderMetadata
301303
}
302304

‎client/client_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ func (m mockPluginsList) ListPlugins(_ context.Context, _ *connect.Request[plugi
7878
version = plugin.Version.String()
7979
}
8080
b := pluginsv1.Plugin_builder{
81-
Name: proto.String(name),
82-
Version: proto.String(version),
83-
Disabled: proto.Bool(plugin.Disabled),
84-
External: proto.Bool(plugin.External),
85-
Configurable: proto.Bool(plugin.Configurable),
86-
RunStatus: plugin.RunStatus.Enum(),
81+
Name: proto.String(name),
82+
Version: proto.String(version),
83+
Disabled: proto.Bool(plugin.Disabled),
84+
External: proto.Bool(plugin.External),
85+
Configurable: proto.Bool(plugin.Configurable),
86+
RunStatus: plugin.RunStatus.Enum(),
87+
StatusMessage: proto.String(plugin.StatusMessage),
8788
}
8889
if plugin.SecretsProvider != nil {
8990
b.SecretsProvider = pluginsv1.SecretsProvider_builder{
@@ -165,6 +166,7 @@ func Test_ListPlugins(t *testing.T) {
165166
SecretsProvider: &SecretsProviderMetadata{Pattern: secrets.MustParsePattern("**")},
166167
External: true,
167168
RunStatus: pluginsv1.RunStatus_RUN_STATUS_CRASHED,
169+
StatusMessage: "exit status 1: connection refused",
168170
},
169171
}
170172
socket := mockListPluginsEngine(t, plugins)

‎client/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/secrets-engine/client
22

3-
go 1.25.8
3+
go 1.25.10
44

55
// This `replace` is only for CI to function.
66
// The correct version will get resolved from below when this module is

‎go.work‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.25.8
1+
go 1.25.10
22

33
use (
44
./client

‎plugin/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/secrets-engine/plugin
22

3-
go 1.25.8
3+
go 1.25.10
44

55
// This `replace` is only for CI to function.
66
// The correct version will get resolved from below when this module is

‎plugins/credentialhelper/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/secrets-engine/plugins/credentialhelper
22

3-
go 1.25.8
3+
go 1.25.10
44

55
// This `replace` is only for CI to function.
66
// The correct version will get resolved from below when this module is

‎plugins/pass/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/secrets-engine/plugins/pass
22

3-
go 1.25.8
3+
go 1.25.10
44

55
replace github.com/docker/secrets-engine/store => ./../../store
66

‎store/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/secrets-engine/store
22

3-
go 1.25.8
3+
go 1.25.10
44

55
// This `replace` is only for CI to function.
66
// The correct version will get resolved from below when this module is

‎vendor/modules.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ github.com/davecgh/go-spew/spew
4040
github.com/docker/docker-credential-helpers/client
4141
github.com/docker/docker-credential-helpers/credentials
4242
# github.com/docker/secrets-engine/plugin v0.0.22 => ./plugin
43-
## explicit; go 1.25.8
43+
## explicit; go 1.25.10
4444
# github.com/docker/secrets-engine/store v0.0.23 => ./store
45-
## explicit; go 1.25.8
45+
## explicit; go 1.25.10
4646
# github.com/docker/secrets-engine/x v0.0.30-do.not.use => ./x
47-
## explicit; go 1.25.8
47+
## explicit; go 1.25.10
4848
# github.com/go-logr/logr v1.4.3
4949
## explicit; go 1.18
5050
github.com/go-logr/logr

‎x/api/plugins/v1/api.pb.go‎

Lines changed: 66 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)