rename

Signed-off-by: spacewander <[email protected]>
mosn · Sep 22, 2024 · 24b5751 · 24b5751
1 parent c224cfe
commit 24b5751
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,7 +36,11 @@ jobs:
         cache-dependency-path: "**/*.sum"
 
     - name: Unit test
-      run: make unit-test
+      run: |
+        pushd ..
+        ./patch/switch-envoy-go-version.sh 1.29
+        popd
+        make unit-test
 
     - name: Build
       run: make build-test-so

diff --git a/api/Makefile b/api/Makefile
@@ -16,15 +16,15 @@ include ../common.mk
 
 .PHONY: unit-test
 unit-test:
-	go test -tags ${ENVOY_API_VERSION} ${TEST_OPTION} $(shell go list ./... | \
+	go test -tags envoy${ENVOY_API_VERSION} ${TEST_OPTION} $(shell go list ./... | \
 		grep -v tests/integration)
 
 # We can't specify -race to `go build` because it seems that
 # race detector assumes that the executable is loaded around the 0 address. When loaded by the Envoy,
 # the race detector will allocate memory out of 48bits address which is not allowed in x64.
 .PHONY: build-test-so-local
 build-test-so-local:
-	CGO_ENABLED=1 go build -tags so,${ENVOY_API_VERSION} \
+	CGO_ENABLED=1 go build -tags so,envoy${ENVOY_API_VERSION} \
 		-ldflags "-B 0x$(shell head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') " \
 		--buildmode=c-shared \
 		-cover -covermode=atomic -coverpkg=${PROJECT_NAME}/... \
@@ -47,10 +47,10 @@ build-test-so:
 integration-test:
 	test -d /tmp/htnn_coverage && rm -rf /tmp/htnn_coverage || true
 	$(foreach PKG, $(shell go list ./tests/integration/...), \
-		go test -tags ${ENVOY_API_VERSION} -v ${PKG} || exit 1; \
+		go test -tags envoy${ENVOY_API_VERSION} -v ${PKG} || exit 1; \
 	)
 
 # The benchmark running time can be controlled via env var HTNN_DATA_PLANE_BENCHMARK_DURATION
 .PHONY: benchmark
 benchmark:
-	go test -tags benchmark,${ENVOY_API_VERSION} -v ./tests/integration/ -run TestBenchmark
+	go test -tags benchmark,envoy${ENVOY_API_VERSION} -v ./tests/integration/ -run TestBenchmark
diff --git a/api/pkg/filtermanager/api/api_129.go b/api/pkg/filtermanager/api/api_129.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build 1.29
+//go:build envoy1.29
 
 package api
 

diff --git a/api/pkg/filtermanager/api/api_129_no_so.go b/api/pkg/filtermanager/api/api_129_no_so.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build 1.29 && !so
+//go:build envoy1.29 && !so
 
 package api
 

diff --git a/api/pkg/filtermanager/api/api_129_so.go b/api/pkg/filtermanager/api/api_129_so.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build 1.29 && so
+//go:build envoy1.29 && so
 
 package api
 

diff --git a/api/pkg/filtermanager/api/api_latest.go b/api/pkg/filtermanager/api/api_latest.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !1.29
+//go:build !envoy1.29
 
 package api
 

diff --git a/api/pkg/filtermanager/api_impl_129.go b/api/pkg/filtermanager/api_impl_129.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build 1.29
+//go:build envoy1.29
 
 package filtermanager
 

diff --git a/api/pkg/filtermanager/api_impl_latest.go b/api/pkg/filtermanager/api_impl_latest.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !1.29
+//go:build !envoy1.29
 
 package filtermanager
 

diff --git a/api/plugins/tests/pkg/envoy/capi_129.go b/api/plugins/tests/pkg/envoy/capi_129.go
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build 1.29 && !so
+//go:build envoy1.29 && !so
 
 package envoy
diff --git a/api/plugins/tests/pkg/envoy/capi_latest.go b/api/plugins/tests/pkg/envoy/capi_latest.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !1.29 && !so
+//go:build !envoy1.29 && !so
 
 package envoy
 

diff --git a/api/tests/integration/libgolang/main.go b/api/tests/integration/libgolang/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build so && !1.29
+//go:build so && !envoy1.29
 
 package main
 

diff --git a/api/tests/integration/libgolang/main_129.go b/api/tests/integration/libgolang/main_129.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build so && 1.29
+//go:build so && envoy1.29
 
 package main
 

diff --git a/plugins/Makefile b/plugins/Makefile
@@ -18,15 +18,15 @@ PROJECT_ROOT := $(PWD)/..
 
 .PHONY: unit-test
 unit-test:
-	go test -tags ${ENVOY_API_VERSION} ${TEST_OPTION} $(shell go list ./... | \
+	go test -tags envoy${ENVOY_API_VERSION} ${TEST_OPTION} $(shell go list ./... | \
 		grep -v tests/integration)
 
 # We can't specify -race to `go build` because it seems that
 # race detector assumes that the executable is loaded around the 0 address. When loaded by the Envoy,
 # the race detector will allocate memory out of 48bits address which is not allowed in x64.
 .PHONY: build-test-so-local
 build-test-so-local:
-	CGO_ENABLED=1 go build -tags so,${ENVOY_API_VERSION} \
+	CGO_ENABLED=1 go build -tags so,envoy${ENVOY_API_VERSION} \
 		-ldflags "-B 0x$(shell head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" \
 		--buildmode=c-shared \
 		-cover -covermode=atomic -coverpkg=${PROJECT_NAME}/... \
@@ -55,12 +55,12 @@ stop-service:
 integration-test:
 	test -d /tmp/htnn_coverage && rm -rf /tmp/htnn_coverage || true
 	$(foreach PKG, $(shell go list ./tests/integration/...), \
-		go test -tags ${ENVOY_API_VERSION} -v ${PKG} || exit 1; \
+		go test -tags envoy${ENVOY_API_VERSION} -v ${PKG} || exit 1; \
 	)
 
 .PHONY: build-so-local
 build-so-local:
-	CGO_ENABLED=1 go build -tags so,${ENVOY_API_VERSION} \
+	CGO_ENABLED=1 go build -tags so,envoy${ENVOY_API_VERSION} \
 		-ldflags "-B 0x$(shell head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" \
 		--buildmode=c-shared \
 		-v -o ${TARGET_SO} \

diff --git a/plugins/cmd/libgolang/main.go b/plugins/cmd/libgolang/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build so && !1.29
+//go:build so && !envoy1.29
 
 package main
 

diff --git a/plugins/cmd/libgolang/main_129.go b/plugins/cmd/libgolang/main_129.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build so && 1.29
+//go:build so && envoy1.29
 
 package main
 

diff --git a/plugins/tests/integration/libgolang/main.go b/plugins/tests/integration/libgolang/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build so && !1.29
+//go:build so && !envoy1.29
 
 package main
 

diff --git a/plugins/tests/integration/libgolang/main_129.go b/plugins/tests/integration/libgolang/main_129.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build so && 1.29
+//go:build so && envoy1.29
 
 package main