Merge remote-tracking branch 'origin/main' into pipeline

.github/workflows/code.analysis.yml

@@ -21,15 +21,15 @@ jobs:
  steps:
 
  - name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 
  - name: Check out code into the Go module directory
  uses: actions/checkout@v3
 
  - name: Revive Action
- uses: morphy2k/[email protected].0
+ uses: morphy2k/[email protected].1
 
  - name: Check formatting
  run: test -z $(gofmt -l .) || (gofmt -l . && exit 1)

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
  os: [ubuntu-latest, macos-latest]
  steps:
  - name: Set up Go 1.x.y
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 
@@ -37,7 +37,7 @@ jobs:
  fail-fast: false
  steps:
  - name: Set up Go 1.x.y
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 
@@ -56,7 +56,7 @@ jobs:
  fail-fast: false
  steps:
  - name: Set up Go 1.x.y
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 
@@ -73,7 +73,7 @@ jobs:
  - uses: actions/checkout@v3
  with:
  fetch-depth: 0
- - uses: actions/setup-go@v2
+ - uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
  - uses: docker/login-action@v2

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
  os: [ubuntu-latest, macos-latest]
  steps:
  - name: Set up Go 1.x.y
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 
@@ -46,7 +46,7 @@ jobs:
  make test TEST_FLAGS="-race -coverprofile=coverage.txt -covermode=atomic"
 
  - name: Upload coverage to Codecov 
- uses: codecov/codecov-action@v2.1.0
+ uses: codecov/codecov-action@v3.1.0
  with:
  file: ./coverage.txt
  test-win:
@@ -55,7 +55,7 @@ jobs:
  fail-fast: false
  steps:
  - name: Set up Go 1.x.y
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 
@@ -66,15 +66,15 @@ jobs:
  run: |
  go mod verify
  go mod download
- go test -v ./...
+ go test -v ./pkg/...
  integration-test-ubuntu:
  needs: [test, test-win]
  runs-on: ubuntu-latest
  strategy:
  fail-fast: false
  steps:
  - name: Set up Go 1.x.y
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
  go-version: ${{ env.GO_VERSION }}
 

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [v1.5.3](https://github.com/megaease/easegress/tree/v1.5.3) (2022-06-28)
+
+[Full Changelog](https://github.com/megaease/easegress/compare/v1.5.2...v1.5.3)
+
+**Implemented enhancements:**
+- Remove HTTP hop headers [\#650](https://github.com/megaease/easegress/pull/650)
+- Optimize Kubernetes IngressController rule route policy [\#651](https://github.com/megaease/easegress/pull/651)
+
+**Fixed bugs:**
+- Wrong HTTP request scheme if the `X-Forwarded-Proto` header contains two or more items[\#634](https://github.com/megaease/easegress/pull/634)
+- Fix request "Content-Length" header missing bug [\#649](https://github.com/megaease/easegress/pull/649)
+
+## [v1.5.2](https://github.com/megaease/easegress/tree/v1.5.2) (2022-05-10)
+
+[Full Changelog](https://github.com/megaease/easegress/compare/v1.5.1...v1.5.2)
+
+**Significant changes:**
+
+- Support external standalone etcd [\#595](https://github.com/megaease/easegress/pull/595)
+
+**Implemented enhancements:**
+
+- Support Easegress ingress rewrite target [\#617](https://github.com/megaease/easegress/pull/617)
+- Support the AND-OR header strategy in HTTPServer [\#613](https://github.com/megaease/easegress/pull/613)
+- Support proxy to send zipkin b3 headers [\#579](https://github.com/megaease/easegress/pull/579)
+
+**Fixed bugs:**
+- Fix proxy pool bug [\#614](https://github.com/megaease/easegress/pull/614)
+- Fix FaasController request host field [\#586](https://github.com/megaease/easegress/pull/586)
+- Fix Easemonitor metrics status convert error [\#583](https://github.com/megaease/easegress/pull/583)
+- Fix Status sync controller pointer error [\#582](https://github.com/megaease/easegress/pull/582) 
+- Fix HTTPPipeline creation fail [\#577](https://github.com/megaease/easegress/pull/577)
+
+
+
 ## [v1.5.1](https://github.com/megaease/easegress/tree/v1.5.1) (2022-04-06)
 
 [Full Changelog](https://github.com/megaease/easegress/compare/v1.5.0...v1.5.1)

Makefile

@@ -16,7 +16,7 @@ INTEGRATION_TEST_PATH := build/test
 IMAGE_NAME?=megaease/easegress
 
 # Version
-RELEASE?=v1.5.1
+RELEASE?=v1.5.3
 
 # Git Related
 GIT_REPO_INFO=$(shell cd ${MKFILE_DIR} && git config --get remote.origin.url)

go.mod

@@ -30,7 +30,7 @@ require (
  github.com/libdns/libdns v0.2.1
  github.com/libdns/route53 v1.1.2
  github.com/libdns/vultr v0.0.0-20211122184636-cd4cb5c12e51
- github.com/lucas-clemente/quic-go v0.25.0
+ github.com/lucas-clemente/quic-go v0.27.1
  github.com/megaease/easemesh-api v1.3.5
  github.com/megaease/grace v1.0.0
  github.com/mitchellh/mapstructure v1.5.0
@@ -162,9 +162,9 @@ require (
  github.com/magiconair/properties v1.8.6 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
  github.com/marten-seemann/qpack v0.2.1 // indirect
- github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
- github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
- github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
+ github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+ github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
+ github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
  github.com/mattn/go-colorable v0.1.12 // indirect
  github.com/mattn/go-isatty v0.0.14 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect

go.sum

@@ -701,8 +701,8 @@ github.com/libdns/vultr v0.0.0-20211122184636-cd4cb5c12e51/go.mod h1:HXpNE79BzPq
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lightstep/tracecontext.go v0.0.0-20181129014701-1757c391b1ac/go.mod h1:Frd2bnT3w5FB5q49ENTfVlztJES+1k/7lyWX2+9gq/M=
-github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc=
-github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
+github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk=
+github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
@@ -721,13 +721,12 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
 github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
-github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
-github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
-github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
-github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
-github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM=
-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
+github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc=
+github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
+github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y=
+github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=