diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadata.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadata.kt index 71eaa8e6e..8845714bf 100644 --- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadata.kt +++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadata.kt @@ -81,7 +81,8 @@ fun getPathNormalization(proto: Value?, snapshotProperties: SnapshotProperties): return PathNormalizationConfig( normalizationEnabled = proto.field("enabled")?.boolValue ?: defaultNormalizationConfig.normalizationEnabled, mergeSlashes = proto.field("merge_slashes")?.boolValue ?: defaultNormalizationConfig.mergeSlashes, - pathWithEscapedSlashesAction = proto.field("path_with_escaped_slashes_action")?.stringValue ?: defaultNormalizationConfig.pathWithEscapedSlashesAction + pathWithEscapedSlashesAction = proto.field("path_with_escaped_slashes_action")?.stringValue + ?: defaultNormalizationConfig.pathWithEscapedSlashesAction ) } diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/HttpConnectionManagerFactory.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/HttpConnectionManagerFactory.kt index 1a092c2b2..7a76a4d30 100644 --- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/HttpConnectionManagerFactory.kt +++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/HttpConnectionManagerFactory.kt @@ -68,7 +68,9 @@ class HttpConnectionManagerFactory( .setDelayedCloseTimeout(Duration.newBuilder().setSeconds(0).build()) .setCommonHttpProtocolOptions(httpProtocolOptions) .setNormalizePath(BoolValue.newBuilder().setValue(normalizationConfig.normalizationEnabled).build()) - .setPathWithEscapedSlashesAction(normalizationConfig.pathWithEscapedSlashesAction.toPathWithEscapedSlashesActionEnum()) + .setPathWithEscapedSlashesAction( + normalizationConfig.pathWithEscapedSlashesAction.toPathWithEscapedSlashesActionEnum() + ) .setMergeSlashes(normalizationConfig.mergeSlashes) .setCodecType(HttpConnectionManager.CodecType.AUTO) .setHttpProtocolOptions(ingressHttp1ProtocolOptions(group.serviceName)) diff --git a/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/TestNodeFactory.kt b/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/TestNodeFactory.kt index 5658ee227..115a59b2c 100644 --- a/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/TestNodeFactory.kt +++ b/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/TestNodeFactory.kt @@ -145,7 +145,6 @@ fun pathNormalizationProto( } } - fun accessLogBooleanFilterProto(value: Boolean? = null, fieldName: String): Value = struct { when { value != null -> putFields(fieldName, boolean(value))