chore: add http statusCode 422 to the UI locale (#225)

* chore: add http statusCode 422 to the UI locale
LinuxSuRen · Oct 9, 2023 · 8b1cd29 · 8b1cd29
1 parent ca81982
commit 8b1cd29
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 89 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Unit Test
         run: |
           make test-all-backend test-operator
@@ -42,7 +42,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: API Test
         run: |
           TOOLEXEC= make build copy
@@ -71,7 +71,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         env:
@@ -89,9 +89,9 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Core Image
-        run: make build-image
+        run: GOPROXY=direct IMG_TOOL=docker make build-image
       - name: Operator Image
         run: cd operator && make docker-build
 
@@ -102,7 +102,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
@@ -45,7 +45,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Unit Test
         run: |
           make test-all-backend test-operator

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ RUN npm run build-only
 
 FROM apache/skywalking-go:0.2.0-go1.18 AS sk
 
-FROM golang:1.18 AS builder
+FROM golang:1.19 AS builder
 
 ARG VERSION
 ARG GOPROXY

diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 IMG_TOOL?=podman
 BINARY?=atest
 TOOLEXEC?=-toolexec="skywalking-go-agent"
+GOPROXY?=https://goproxy.cn,direct
 
 build:
 	mkdir -p bin
@@ -27,7 +28,7 @@ goreleaser:
 	make clean-embed-ui
 build-image:
 	${IMG_TOOL} build -t ghcr.io/linuxsuren/api-testing:master . \
-		--build-arg GOPROXY=https://goproxy.cn,direct \
+		--build-arg GOPROXY=${GOPROXY} \
 		--build-arg VERSION=$(shell git describe --abbrev=0 --tags)-$(shell git rev-parse --short HEAD)
 run-image:
 	docker run -p 7070:7070 -p 8080:8080 ghcr.io/linuxsuren/api-testing:master

diff --git a/console/atest-ui/src/locales/en.json b/console/atest-ui/src/locales/en.json
@@ -45,8 +45,10 @@
         "401": "401 Unauthorized",
         "403": "403 Forbidden",
         "405": "405 Method Not Allowed",
+        "409": "409 Conflict",
+        "422": "422 Unprocessable Content",
         "500": "500 Internal Server Error",
         "502": "502 Bad Gateway",
         "503": "503 Service Unavailable"
     }
-}
+}
diff --git a/extensions/store-git/go.mod b/extensions/store-git/go.mod
@@ -76,3 +76,4 @@ require (
 )
 
 replace github.com/linuxsuren/api-testing => ../../.
+replace github.com/antonmedv/expr => github.com/linuxsuren/expr v1.20.0-unknown
diff --git a/extensions/store-orm/Dockerfie b/extensions/store-orm/Dockerfie
@@ -1,4 +1,4 @@
-FROM golang:1.18 AS builder
+FROM golang:1.19 AS builder
 
 WORKDIR /workspace
 COPY pkg/ pkg/

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/linuxsuren/api-testing
 
-go 1.18
+go 1.19
 
 require (
 	github.com/Masterminds/sprig/v3 v3.2.3
@@ -76,3 +76,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	skywalking.apache.org/repo/goapi v0.0.0-20230314034821-0c5a44bb767a // indirect
 )
+
+replace github.com/antonmedv/expr v1.15.0 => github.com/linuxsuren/expr v1.20.0-unknown
diff --git a/go.work.sum b/go.work.sum
diff --git a/operator/Dockerfile b/operator/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.18 as builder
+FROM golang:1.19 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 

diff --git a/operator/go.mod b/operator/go.mod
@@ -1,6 +1,6 @@
 module github.com/linuxsuren/api-testing/operator
 
-go 1.18
+go 1.19
 
 require (
 	github.com/onsi/ginkgo/v2 v2.6.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,3 +76,4 @@ require (
		)

		replace github.com/linuxsuren/api-testing => ../../.
		replace github.com/antonmedv/expr => github.com/linuxsuren/expr v1.20.0-unknown