mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-01-07 08:05:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/main' into 'next-release/main'

Browse source
This commit is contained in:
oauth 2024-09-26 15:05:24 +00:00
commit 5ea7c66c71
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 {
onlyAllowSecretForPlugins := len(s.AllowedPlugins) > 0
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...) {

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{
Image: "golang",
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{
Image: "not-golang",
Commands: yaml_base_types.StringOrSlice{},

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

@ -433,7 +433,7 @@
"saved": "Secret saved",
"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": "Available at the following events",