conformance: Enable HTTPRouteBackendProtocolH2C conformance test #2136

zirain · 2023-10-31T10:39:06Z

fixes: #2076

Signed-off-by: zirain <zirain2009@gmail.com>

codecov · 2023-10-31T11:20:55Z

Codecov Report

Merging #2136 (61226f2) into main (6e81fb3) will decrease coverage by 0.09%.
The diff coverage is 83.87%.

@@            Coverage Diff             @@
##             main    #2136      +/-   ##
==========================================
- Coverage   64.36%   64.28%   -0.09%     
==========================================
  Files         107      107              
  Lines       14668    14684      +16     
==========================================
- Hits         9441     9439       -2     
- Misses       4663     4677      +14     
- Partials      564      568       +4

Files	Coverage Δ
internal/ir/xds.go	`74.37% <ø> (ø)`
internal/xds/translator/accesslog.go	`98.22% <100.00%> (ø)`
internal/xds/translator/cluster.go	`100.00% <100.00%> (ø)`
internal/xds/translator/jwt_authn.go	`73.25% <ø> (-0.11%)`	⬇️
internal/xds/translator/ratelimit.go	`86.34% <100.00%> (ø)`
internal/xds/translator/tracing.go	`95.19% <100.00%> (ø)`
internal/xds/translator/translator.go	`79.78% <ø> (-0.57%)`	⬇️
internal/gatewayapi/route.go	`88.04% <76.19%> (-0.20%)`	⬇️

... and 2 files with indirect coverage changes

Signed-off-by: zirain <zirain2009@gmail.com>

zirain · 2023-10-31T13:45:51Z

/retest

internal/ir/xds.go

arkodg · 2023-10-31T15:28:40Z

internal/ir/xds.go

-	Weight    *uint32                `json:"weight,omitempty" yaml:"weight,omitempty"`
+	Weight *uint32 `json:"weight,omitempty" yaml:"weight,omitempty"`
+	// Protocol associated with this destination/port.
+	Protocol  model.AppProtocol      `json:"protocol" yaml:"protocol"`


can we move protocol to the IR lib ?

into which type/struct?

the same type works, into this file

also should this be a ptr, since its optional ?

you means move model.AppProtocol to package ir? it's OK if you insist.
I put it under model, just because of it's common, shouldn't be too close to package IR.

also should this be a ptr, since its optional?

it can be, but right now make TCP as default.

Signed-off-by: zirain <zirain2009@gmail.com>

arkodg · 2023-10-31T22:57:33Z

internal/xds/translator/cluster.go

@@ -60,7 +61,15 @@ func buildXdsCluster(args *xdsClusterArgs) *clusterv3.Cluster {
 		cluster.RespectDnsTtl = true
 	}

-	if args.protocol == HTTP2 {
+	isHTTP2 := false


just a nit, feel free to ignore

if args.settings != nil && args.settings[0].Protocol ..........

zirain · 2023-10-31T23:19:17Z

/retest

Signed-off-by: zirain <zirain2009@gmail.com>

arkodg

LGTM thanks !

Xunzhuo

LGTM

Xunzhuo · 2023-11-01T03:29:42Z

internal/ir/protocol.go

+package ir
+
+type AppProtocol string
+


Thanks, here is a better place to keep it.

…oyproxy#2136) * nit Signed-off-by: zirain <zirain2009@gmail.com> * build Cluster depends on route type and service appProtocol Signed-off-by: zirain <zirain2009@gmail.com> * enable HTTPRouteBackendProtocolH2C conformance test Signed-off-by: zirain <zirain2009@gmail.com> * lint Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * address comment Signed-off-by: zirain <zirain2009@gmail.com> * move to package internal/ir Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> (cherry picked from commit 6d532c1) Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* Fix TestE2E/RateLimitBasedJwtClaims test (#2097) * Revert "Skip RateLimitBasedJwtClaimsTest test (#2096)" This reverts commit ef7a2a4. fix e2e test Signed-off-by: huabing zhao <zhaohuabing@gmail.com> * fix XValidation Signed-off-by: huabing zhao <zhaohuabing@gmail.com> --------- Signed-off-by: huabing zhao <zhaohuabing@gmail.com> (cherry picked from commit f301527) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * add a newer PR reference in rc release docs (#2101) Signed-off-by: Arko Dasgupta <arko@tetrate.io> (cherry picked from commit fae8cd8) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix: panic when using nil xdsRouteAction (#2104) Signed-off-by: bitliu <bitliu@tencent.com> (cherry picked from commit 77445de) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * remove cors, jwt, rl assignment from route translator (#2105) All the translations and assignments now happen in the policy translators Signed-off-by: Arko Dasgupta <arko@tetrate.io> (cherry picked from commit d65ab59) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix: use lowercases of eg admin config fields (#2107) (cherry picked from commit ef5e450) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix: testGatewayClassWithParamRef e2e test flaky (#2114) (cherry picked from commit 4047268) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * build(deps): bump sigs.k8s.io/yaml from 1.3.0 to 1.4.0 (#2118) Bumps [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/kubernetes-sigs/yaml/releases) - [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/yaml@v1.3.0...v1.4.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/yaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit bf93a4e) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * build(deps): bump github.com/bufbuild/buf from 1.27.1 to 1.27.2 in /tools/src/buf (#2121) build(deps): bump github.com/bufbuild/buf in /tools/src/buf Bumps [github.com/bufbuild/buf](https://github.com/bufbuild/buf) from 1.27.1 to 1.27.2. - [Release notes](https://github.com/bufbuild/buf/releases) - [Changelog](https://github.com/bufbuild/buf/blob/main/CHANGELOG.md) - [Commits](bufbuild/buf@v1.27.1...v1.27.2) --- updated-dependencies: - dependency-name: github.com/bufbuild/buf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 58146ff) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * build(deps): bump github.com/go-logr/logr from 1.2.4 to 1.3.0 (#2117) Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.2.4 to 1.3.0. - [Release notes](https://github.com/go-logr/logr/releases) - [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md) - [Commits](go-logr/logr@v1.2.4...v1.3.0) --- updated-dependencies: - dependency-name: github.com/go-logr/logr dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit d1cbf5e) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * build(deps): bump envoyproxy/toolshed from actions-v0.0.25 to 0.1.2 (#2116) Bumps [envoyproxy/toolshed](https://github.com/envoyproxy/toolshed) from actions-v0.0.25 to 0.1.2. This release includes the previously tagged commit. - [Release notes](https://github.com/envoyproxy/toolshed/releases) - [Commits](envoyproxy/toolshed@actions-v0.0.25...actions-v0.1.2) --- updated-dependencies: - dependency-name: envoyproxy/toolshed dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7b6344d) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * build(deps): bump actions/setup-node from 3 to 4 (#2115) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 5523099) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * chore: add more EnvoyProxy cases (#2120) Signed-off-by: zirain <zirain2009@gmail.com> (cherry picked from commit 268a6ef) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * build(deps): bump github.com/golangci/golangci-lint from 1.55.0 to 1.55.1 in /tools/src/golangci-lint (#2119) build(deps): bump github.com/golangci/golangci-lint Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.55.0 to 1.55.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.55.0...v1.55.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit be86295) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * feat: CEL Validation in BackendTrafficPolicy (#2110) * feat: CEL Validation in BackendTrafficPolicy Signed-off-by: slayer321 <sachin.maurya7666@gmail.com> * leastRequest with consistentHash nil test Signed-off-by: slayer321 <sachin.maurya7666@gmail.com> --------- Signed-off-by: slayer321 <sachin.maurya7666@gmail.com> (cherry picked from commit b45ae24) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * e2e: eg controlplane metrics (#2106) * e2e: eg controlplane metrics Signed-off-by: zirain <zirain2009@gmail.com> * update Signed-off-by: zirain <zirain2009@gmail.com> * update Signed-off-by: zirain <zirain2009@gmail.com> * update name Signed-off-by: zirain <zirain2009@gmail.com> * rename Signed-off-by: zirain <zirain2009@gmail.com> * wait more Signed-off-by: zirain <zirain2009@gmail.com> * add comment Signed-off-by: zirain <zirain2009@gmail.com> * update Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> (cherry picked from commit 046a593) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * chore: fix http2_protocol_options warning message (#2048) chore:fix http2_protocol_options warning message Signed-off-by: zhaonan <zhaonan06@corp.netease.com> (cherry picked from commit 179d265) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix Failed to update SecurityPolicy status (#2128) fix #2127 Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com> (cherry picked from commit 57e1aec) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix: add missing status equal for SecurityPolicy (#2134) (cherry picked from commit 71c09f2) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix jwt doc (#2135) Signed-off-by: huabing zhao <zhaohuabing@gmail.com> (cherry picked from commit df1e209) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * Bump Gateway API to v1.0.0 (#2142) (cherry picked from commit 3dd0ee7) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * Enable HTTPRouteRewritePath test (#2112) * Enable HTTPRouteRewritePath test Fixes: #2004 Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix prefix match Signed-off-by: Arko Dasgupta <arko@tetrate.io> * make testdata Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix path match Signed-off-by: Arko Dasgupta <arko@tetrate.io> * rm trailing / Signed-off-by: Arko Dasgupta <arko@tetrate.io> * sort on path match type Signed-off-by: Arko Dasgupta <arko@tetrate.io> * make testdata Signed-off-by: Arko Dasgupta <arko@tetrate.io> * temp var Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix url rewrite Signed-off-by: Arko Dasgupta <arko@tetrate.io> --------- Signed-off-by: Arko Dasgupta <arko@tetrate.io> (cherry picked from commit 2b3bc9f) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * helm: remove kube-rbac-proxy and update metrics service (#2108) (cherry picked from commit 0c5b054) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * doc: user doc for CORS (#2137) * cors docs Signed-off-by: huabing zhao <zhaohuabing@gmail.com> * address comments Signed-off-by: huabing zhao <zhaohuabing@gmail.com> --------- Signed-off-by: huabing zhao <zhaohuabing@gmail.com> (cherry picked from commit d0dc987) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix(ci): bump go version to 1.21 (#2144) * fix(ci): bump go version to 1.21 Signed-off-by: bitliu <bitliu@tencent.com> * update Signed-off-by: bitliu <bitliu@tencent.com> --------- Signed-off-by: bitliu <bitliu@tencent.com> (cherry picked from commit 6e81fb3) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * conformance: Enable HTTPRouteBackendProtocolH2C conformance test (#2136) * nit Signed-off-by: zirain <zirain2009@gmail.com> * build Cluster depends on route type and service appProtocol Signed-off-by: zirain <zirain2009@gmail.com> * enable HTTPRouteBackendProtocolH2C conformance test Signed-off-by: zirain <zirain2009@gmail.com> * lint Signed-off-by: zirain <zirain2009@gmail.com> * fix Signed-off-by: zirain <zirain2009@gmail.com> * address comment Signed-off-by: zirain <zirain2009@gmail.com> * move to package internal/ir Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com> (cherry picked from commit 6d532c1) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * Fix attachedRoutes computation (#2085) * Fix attachedRoutes computation * Fixes: #2077 * Fixes: #1916 Signed-off-by: Arko Dasgupta <arko@tetrate.io> * make testdata Signed-off-by: Arko Dasgupta <arko@tetrate.io> --------- Signed-off-by: Arko Dasgupta <arko@tetrate.io> (cherry picked from commit 93a12e7) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix comments in loadbalancer api (#2145) Signed-off-by: zhaonan <zhaonan06@corp.netease.com> (cherry picked from commit 77bcb3c) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix(docs): incorrect quickstart links (#2146) Signed-off-by: bitliu <bitliu@tencent.com> (cherry picked from commit defed57) Signed-off-by: Arko Dasgupta <arko@tetrate.io> * fix: null pointer when CORS maxAge is not specified (#2133) fix nullpointer Signed-off-by: huabing zhao <zhaohuabing@gmail.com> Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com> (cherry picked from commit 35c4fea) Signed-off-by: Arko Dasgupta <arko@tetrate.io> --------- Signed-off-by: huabing zhao <zhaohuabing@gmail.com> Signed-off-by: Arko Dasgupta <arko@tetrate.io> Signed-off-by: bitliu <bitliu@tencent.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: zirain <zirain2009@gmail.com> Signed-off-by: slayer321 <sachin.maurya7666@gmail.com> Signed-off-by: zhaonan <zhaonan06@corp.netease.com> Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com> Co-authored-by: Huabing Zhao <zhaohuabing@gmail.com> Co-authored-by: Xunzhuo <bitliu@tencent.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: zirain <zirain2009@gmail.com> Co-authored-by: Sachin Maurya <57769917+slayer321@users.noreply.github.com> Co-authored-by: tmsnan <zhaonan06@corp.netease.com>

zirain added 3 commits October 31, 2023 18:35

nit

b4a6b99

Signed-off-by: zirain <zirain2009@gmail.com>

build Cluster depends on route type and service appProtocol

6a6717c

Signed-off-by: zirain <zirain2009@gmail.com>

enable HTTPRouteBackendProtocolH2C conformance test

01de829

Signed-off-by: zirain <zirain2009@gmail.com>

zirain requested a review from a team as a code owner October 31, 2023 10:39

lint

deba3d6

Signed-off-by: zirain <zirain2009@gmail.com>

zirain marked this pull request as draft October 31, 2023 11:47

fix

b374b29

Signed-off-by: zirain <zirain2009@gmail.com>

zirain marked this pull request as ready for review October 31, 2023 13:52

arkodg reviewed Oct 31, 2023

View reviewed changes

internal/ir/xds.go Outdated Show resolved Hide resolved

arkodg reviewed Oct 31, 2023

View reviewed changes

address comment

79d84d2

Signed-off-by: zirain <zirain2009@gmail.com>

arkodg reviewed Oct 31, 2023

View reviewed changes

move to package internal/ir

118f799

Signed-off-by: zirain <zirain2009@gmail.com>

zirain requested a review from arkodg November 1, 2023 01:12

arkodg previously approved these changes Nov 1, 2023

View reviewed changes

arkodg requested review from zhaohuabing, Xunzhuo, a team and chauhanshubham and removed request for a team November 1, 2023 02:04

Merge branch 'main' into conformance/HTTPRouteBackendProtocolH2C

61226f2

zirain dismissed arkodg’s stale review via 61226f2 November 1, 2023 03:25

Xunzhuo approved these changes Nov 1, 2023

View reviewed changes

internal/ir/protocol.go

package ir

type AppProtocol string

Copy link

Member

Xunzhuo Nov 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, here is a better place to keep it.

arkodg approved these changes Nov 1, 2023

View reviewed changes

arkodg merged commit 6d532c1 into envoyproxy:main Nov 1, 2023
21 checks passed

zirain deleted the conformance/HTTPRouteBackendProtocolH2C branch November 1, 2023 03:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

conformance: Enable HTTPRouteBackendProtocolH2C conformance test #2136

conformance: Enable HTTPRouteBackendProtocolH2C conformance test #2136

zirain commented Oct 31, 2023

codecov bot commented Oct 31, 2023 •

edited

zirain commented Oct 31, 2023

arkodg Oct 31, 2023

zirain Oct 31, 2023 •

edited

arkodg Oct 31, 2023

arkodg Oct 31, 2023

zirain Oct 31, 2023

zirain Oct 31, 2023

arkodg Oct 31, 2023

zirain commented Oct 31, 2023

arkodg left a comment

Xunzhuo left a comment •

edited

Xunzhuo Nov 1, 2023

conformance: Enable HTTPRouteBackendProtocolH2C conformance test #2136

conformance: Enable HTTPRouteBackendProtocolH2C conformance test #2136

Conversation

zirain commented Oct 31, 2023

codecov bot commented Oct 31, 2023 • edited

Codecov Report

zirain commented Oct 31, 2023

arkodg Oct 31, 2023

Choose a reason for hiding this comment

zirain Oct 31, 2023 • edited

Choose a reason for hiding this comment

arkodg Oct 31, 2023

Choose a reason for hiding this comment

arkodg Oct 31, 2023

Choose a reason for hiding this comment

zirain Oct 31, 2023

Choose a reason for hiding this comment

zirain Oct 31, 2023

Choose a reason for hiding this comment

arkodg Oct 31, 2023

Choose a reason for hiding this comment

zirain commented Oct 31, 2023

arkodg left a comment

Choose a reason for hiding this comment

Xunzhuo left a comment • edited

Choose a reason for hiding this comment

Xunzhuo Nov 1, 2023

Choose a reason for hiding this comment

codecov bot commented Oct 31, 2023 •

edited

zirain Oct 31, 2023 •

edited

Xunzhuo left a comment •

edited