mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-10-23 02:23:53 +00:00
Code Issues Projects Releases Wiki Activity

Update image filter error message (#4143)

Browse source
This commit is contained in:
Patrick Schratz 2024-09-26 14:04:07 +02:00 committed by GitHub
parent fcc57dfc38
commit b75a2cac10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pipeline/frontend/yaml/compiler/compiler.go
View file

@ -46,7 +46,7 @@ type Secret struct {
func (s *Secret) Available(event string, container *yaml_types.Container) error { func (s *Secret) Available(event string, container *yaml_types.Container) error {
onlyAllowSecretForPlugins := len(s.AllowedPlugins) > 0 onlyAllowSecretForPlugins := len(s.AllowedPlugins) > 0
if onlyAllowSecretForPlugins && !container.IsPlugin() { if onlyAllowSecretForPlugins && !container.IsPlugin() {
return fmt.Errorf("secret %q only allowed to be used by plugins by step %q", s.Name, container.Name) return fmt.Errorf("secret %q is only allowed to be used by plugins (a filter has been set on the secret). Note: Image filters do not work for normal steps", s.Name)
} }
if onlyAllowSecretForPlugins && !utils.MatchImageDynamic(container.Image, s.AllowedPlugins...) { if onlyAllowSecretForPlugins && !utils.MatchImageDynamic(container.Image, s.AllowedPlugins...) {

2
pipeline/frontend/yaml/compiler/compiler_test.go
View file

@ -50,7 +50,7 @@ func TestSecretAvailable(t *testing.T) {
assert.ErrorContains(t, secret.Available("push", &yaml_types.Container{ assert.ErrorContains(t, secret.Available("push", &yaml_types.Container{
Image: "golang", Image: "golang",
Commands: yaml_base_types.StringOrSlice{"echo 'this is not a plugin'"}, Commands: yaml_base_types.StringOrSlice{"echo 'this is not a plugin'"},
}), "only allowed to be used by plugins by step") }), "is only allowed to be used by plugins (a filter has been set on the secret). Note: Image filters do not work for normal steps")
assert.ErrorContains(t, secret.Available("push", &yaml_types.Container{ assert.ErrorContains(t, secret.Available("push", &yaml_types.Container{
Image: "not-golang", Image: "not-golang",
Commands: yaml_base_types.StringOrSlice{}, Commands: yaml_base_types.StringOrSlice{},

2
web/src/assets/locales/en.json
View file

@ -433,7 +433,7 @@
"saved": "Secret saved", "saved": "Secret saved",
"plugins": { "plugins": {
"images": "Available only for the following plugins", "images": "Available only for the following plugins",
"desc": "List of plugins images where this secret is available, leave empty to allow for all plugins and general steps." "desc": "List of plugin images where this secret is available. Leave empty to allow for all plugins and normal steps."
}, },
"events": { "events": {
"events": "Available at the following events", "events": "Available at the following events",