Skip to content

Commit 5ca7cf6

Browse files
seefloodseeflood
authored
ci: rename CI jobs to keep naming style consistent (#735)
1 parent f3a1a34 commit 5ca7cf6

File tree

4 files changed

+115
-101
lines changed

4 files changed

+115
-101
lines changed

‎.github/workflows/markdown-linter.yml ‎.github/workflows/markdown-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
check:
10-
name: "🍀 Markdown Lint"
10+
name: "🍀 Markdown Validation"
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code

‎.github/workflows/proto-linter.yml ‎.github/workflows/proto-checker.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ jobs:
1212
steps:
1313
- name: Check out code
1414
uses: actions/checkout@v2
15+
1516
- name: buf-setup
1617
uses: bufbuild/buf-setup-action@v1
1718
with:
1819
version: '1.6.0'
19-
- name: buf-lint
20+
21+
- name: Install buf-lint
2022
uses: bufbuild/buf-lint-action@v1
21-
- name: check it
23+
24+
- name: Check comments in proto files
2225
run: buf lint

‎components/rpc/invoker/mosn/channel/channel.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type ChannelConfig struct {
5252
Ext map[string]interface{} `json:"ext"`
5353
}
5454

55-
// GetChannel is get rpc.Channel by config.Protocol
55+
// GetChannel creates a rpc.Channel according to config.Protocol
5656
func GetChannel(config ChannelConfig) (rpc.Channel, error) {
5757
c, ok := registry[config.Protocol]
5858
if !ok {
@@ -66,7 +66,7 @@ func RegistChannel(proto string, f func(config ChannelConfig) (rpc.Channel, erro
6666
registry[proto] = f
6767
}
6868

69-
// simulate tcp connect
69+
// fakeTcpConn simulates tcp connection. It implements net.Conn
7070
type fakeTcpConn struct {
7171
c net.Conn
7272
}

‎demo/rpc/http/example.json

+107-96
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,109 @@
11
{
2-
"servers":[
3-
{
4-
"default_log_path": "stdout",
5-
"default_log_level": "DEBUG",
6-
"routers": [
7-
{
8-
"router_config_name":"http_router",
9-
"virtual_hosts":[{
10-
"name":"http_host",
11-
"domains": ["*"],
12-
"routers": [
13-
{
14-
"match":{
15-
"headers": [
16-
{
17-
"name":"id",
18-
"value":"HelloService:1.0"
19-
}
20-
]
21-
},
22-
"route":{"cluster_name":"http_server"}
23-
}
24-
]
25-
}]
26-
}],
27-
"listeners":[
28-
{
29-
"name":"grpc",
30-
"address": "127.0.0.1:34904",
31-
"bind_port": true,
32-
"filter_chains": [{
33-
"filters": [
34-
{
35-
"type": "grpc",
36-
"config": {
37-
"server_name":"runtime",
38-
"grpc_config": {
39-
"rpcs": {
40-
"mosn": {
41-
"config": {
42-
"channel": [{
43-
"size": 16,
44-
"protocol": "http",
45-
"listener": "egress_runtime_http"
46-
}]
47-
}
48-
}
49-
}
50-
}
51-
}
52-
}
53-
]
54-
}]
55-
},
56-
{
57-
"name": "egress_runtime_http",
58-
"type": "egress",
59-
"address": "0.0.0.0:12221",
60-
"bind_port": true,
61-
"network": "tcp",
62-
"filter_chains": [
63-
{
64-
"filters": [
65-
{
66-
"type": "proxy",
67-
"config": {
68-
"downstream_protocol": "Http1",
69-
"name": "proxy_config",
70-
"router_config_name": "http_router",
71-
"upstream_protocol": "Http1"
72-
}
73-
}
74-
]
75-
}
76-
]
77-
}
78-
]
79-
}
80-
],
81-
"cluster_manager": {
82-
"tls_context": {},
83-
"clusters": [
84-
{
85-
"name": "http_server",
86-
"type": "SIMPLE",
87-
"lb_type": "LB_RANDOM",
88-
"hosts": [
89-
{
90-
"address": "127.0.0.1:8889",
91-
"hostname": "downstream_machine1",
92-
"weight": 1
93-
}
94-
]
95-
}
96-
]
97-
}
2+
"servers": [
3+
{
4+
"default_log_path": "stdout",
5+
"default_log_level": "DEBUG",
6+
"routers": [
7+
{
8+
"router_config_name": "http_router",
9+
"virtual_hosts": [
10+
{
11+
"name": "http_host",
12+
"domains": [
13+
"*"
14+
],
15+
"routers": [
16+
{
17+
"match": {
18+
"headers": [
19+
{
20+
"name": "id",
21+
"value": "HelloService:1.0"
22+
}
23+
]
24+
},
25+
"route": {
26+
"cluster_name": "http_server"
27+
}
28+
}
29+
]
30+
}
31+
]
32+
}
33+
],
34+
"listeners": [
35+
{
36+
"name": "grpc",
37+
"address": "127.0.0.1:34904",
38+
"bind_port": true,
39+
"filter_chains": [
40+
{
41+
"filters": [
42+
{
43+
"type": "grpc",
44+
"config": {
45+
"server_name": "runtime",
46+
"grpc_config": {
47+
"rpcs": {
48+
"mosn": {
49+
"config": {
50+
"channel": [
51+
{
52+
"size": 16,
53+
"protocol": "http",
54+
"listener": "egress_runtime_http"
55+
}
56+
]
57+
}
58+
}
59+
}
60+
}
61+
}
62+
}
63+
]
64+
}
65+
]
66+
},
67+
{
68+
"name": "egress_runtime_http",
69+
"type": "egress",
70+
"address": "0.0.0.0:12221",
71+
"bind_port": true,
72+
"network": "tcp",
73+
"filter_chains": [
74+
{
75+
"filters": [
76+
{
77+
"type": "proxy",
78+
"config": {
79+
"downstream_protocol": "Http1",
80+
"name": "proxy_config",
81+
"router_config_name": "http_router",
82+
"upstream_protocol": "Http1"
83+
}
84+
}
85+
]
86+
}
87+
]
88+
}
89+
]
90+
}
91+
],
92+
"cluster_manager": {
93+
"tls_context": {},
94+
"clusters": [
95+
{
96+
"name": "http_server",
97+
"type": "SIMPLE",
98+
"lb_type": "LB_RANDOM",
99+
"hosts": [
100+
{
101+
"address": "127.0.0.1:8889",
102+
"hostname": "downstream_machine1",
103+
"weight": 1
104+
}
105+
]
106+
}
107+
]
108+
}
98109
}

0 commit comments

Comments
 (0)