3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-27 15:08:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix unused key warnings in routes (#3711)

Browse source
This commit is contained in:
Denis Mishin 2022-10-28 14:59:43 -04:00 • committed by GitHub
parent 3f9dfbef76
commit d8f4355f66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/options.go
View file

@ -11,6 +11,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"regexp"
"strings" "strings"
"time" "time"
@ -403,10 +404,15 @@ func optionsFromViper(configFile string) (*Options, error) {
return o, nil return o, nil
} }
var (
// policy's embedded protobuf structs are decoded by separate hook and are unknown to mapstructure
routesEmbeddedFieldsRe = regexp.MustCompile(`(routes|policy)\[\.*`)
)
func checkUnusedConfigFields(configFile string, unused []string) { func checkUnusedConfigFields(configFile string, unused []string) {
keys := make([]string, 0, len(unused)) keys := make([]string, 0, len(unused))
for _, k := range unused { for _, k := range unused {
if !strings.HasPrefix(k, "policy[") { // policy's embedded protobuf structs are decoded by separate hook and are unknown to mapstructure if !routesEmbeddedFieldsRe.MatchString(k) {
keys = append(keys, k) keys = append(keys, k)
} }
} }