-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ingress-controller/config: support go durations in annotations (#1047)
* ingress-controller/config: support go durations in annotations * update * update spelling
- Loading branch information
1 parent
6e3ac1b
commit 743d129
Showing
5 changed files
with
147 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| package pomerium | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "google.golang.org/protobuf/encoding/protojson" | ||
| "google.golang.org/protobuf/proto" | ||
| "google.golang.org/protobuf/reflect/protoreflect" | ||
| "google.golang.org/protobuf/types/known/durationpb" | ||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| func unmarshalAnnotations(dst proto.Message, kvs map[string]string) error { | ||
| // first convert the map[string]string to a map[string]any via yaml | ||
| src := make(map[string]any, len(kvs)) | ||
| for k, v := range kvs { | ||
| var out any | ||
| if err := yaml.Unmarshal([]byte(v), &out); err != nil { | ||
| return fmt.Errorf("%s: %w", k, err) | ||
| } | ||
| src[k] = out | ||
| } | ||
|
|
||
| // pre-process the json to handle custom formats | ||
| preprocessAnnotationMessage(dst.ProtoReflect().Descriptor(), src) | ||
|
|
||
| // marshal as json so it can be unmarshaled via protojson | ||
| data, err := json.Marshal(src) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return protojson.Unmarshal(data, dst) | ||
| } | ||
|
|
||
| func preprocessAnnotationMessage(md protoreflect.MessageDescriptor, data any) any { | ||
| switch md.FullName() { | ||
| case "google.protobuf.Duration": | ||
| // convert go duration strings into protojson duration strings | ||
| if v, ok := data.(string); ok { | ||
| return goDurationStringToProtoJSONDurationString(v) | ||
| } | ||
| default: | ||
| // preprocess all the fields | ||
| if v, ok := data.(map[string]any); ok { | ||
| fds := md.Fields() | ||
| for i := 0; i < fds.Len(); i++ { | ||
| fd := fds.Get(i) | ||
| name := string(fd.Name()) | ||
| vv, ok := v[name] | ||
| if ok { | ||
| v[name] = preprocessAnnotationField(fd, vv) | ||
| } | ||
| } | ||
| return v | ||
| } | ||
| } | ||
| return data | ||
| } | ||
|
|
||
| func preprocessAnnotationField(fd protoreflect.FieldDescriptor, data any) any { | ||
| // if this is a repeated field, handle each of the field values separately | ||
| if fd.IsList() { | ||
| vs, ok := data.([]any) | ||
| if ok { | ||
| nvs := make([]any, len(vs)) | ||
| for i, v := range vs { | ||
| nvs[i] = preprocessAnnotationFieldValue(fd, v) | ||
| } | ||
| return nvs | ||
| } | ||
| } | ||
|
|
||
| return preprocessAnnotationFieldValue(fd, data) | ||
| } | ||
|
|
||
| func preprocessAnnotationFieldValue(fd protoreflect.FieldDescriptor, data any) any { | ||
| // convert map[string]any -> map[string]string | ||
| if fd.IsMap() && fd.MapKey().Kind() == protoreflect.StringKind && fd.MapValue().Kind() == protoreflect.StringKind { | ||
| if v, ok := data.(map[string]any); ok { | ||
| m := make(map[string]string, len(v)) | ||
| for k, vv := range v { | ||
| m[k] = fmt.Sprint(vv) | ||
| } | ||
| return m | ||
| } | ||
| } | ||
|
|
||
| switch fd.Kind() { | ||
| case protoreflect.MessageKind: | ||
| return preprocessAnnotationMessage(fd.Message(), data) | ||
| } | ||
|
|
||
| return data | ||
| } | ||
|
|
||
| func goDurationStringToProtoJSONDurationString(in string) string { | ||
| dur, err := time.ParseDuration(in) | ||
| if err != nil { | ||
| return in | ||
| } | ||
|
|
||
| bs, err := protojson.Marshal(durationpb.New(dur)) | ||
| if err != nil { | ||
| return in | ||
| } | ||
|
|
||
| str := strings.Trim(string(bs), `"`) | ||
| return str | ||
| } |