mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-04-26 21:44:44 +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-12-16 17:38:17 +00:00
commit 98e2e61c0e
3 changed files with 19 additions and 2 deletions

2
pipeline/backend/docker/backend_options.go
View file

@ -16,6 +16,6 @@ func parseBackendOptions(step *backend.Step) (BackendOptions, error) {
if step == nil || step.BackendOptions == nil {
return result, nil
}
err := mapstructure.Decode(step.BackendOptions[EngineName], &result)
err := mapstructure.WeakDecode(step.BackendOptions[EngineName], &result)
return result, err
}

2
pipeline/backend/kubernetes/backend_options.go
View file

@ -89,6 +89,6 @@ func parseBackendOptions(step *backend.Step) (BackendOptions, error) {
if step == nil || step.BackendOptions == nil {
return result, nil
}
err := mapstructure.Decode(step.BackendOptions[EngineName], &result)
err := mapstructure.WeakDecode(step.BackendOptions[EngineName], &result)
return result, err
}

17
pipeline/backend/kubernetes/backend_options_test.go
View file

@ -114,6 +114,23 @@ func Test_parseBackendOptions(t *testing.T) {
},
},
},
{
name: "number options",
step: &backend.Step{BackendOptions: map[string]any{
"kubernetes": map[string]any{
"resources": map[string]any{
"requests": map[string]int{"memory": 128, "cpu": 1000},
"limits": map[string]int{"memory": 256, "cpu": 2},
},
},
}},
want: BackendOptions{
Resources: Resources{
Requests: map[string]string{"memory": "128", "cpu": "1000"},
Limits: map[string]string{"memory": "256", "cpu": "2"},
},
},
},
}
for _, tt := range tests {