Skip to content

Commit 7628abe

Browse files
nghialvnghialv
authoredJan 18, 2022
Migrage all gPRC requests to new path schema (#3046)
**What this PR does / why we need it**: **Which issue(s) this PR fixes**: A part of #3024 **Does this PR introduce a user-facing change?**: <!-- If no, just write "NONE" in the release-note block below. --> ```release-note NONE ``` This PR was merged by Kapetanios.
·
v0.51.0-rc0v0.24.1
1 parent f087020 commit 7628abe

File tree

8 files changed

+81
-49
lines changed

8 files changed

+81
-49
lines changed
 

‎local/envoy-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ static_resources:
4343
expose_headers: custom-header-1,grpc-status,grpc-message
4444
routes:
4545
- match:
46-
prefix: /pipe.api.service.pipedservice.PipedService/
46+
prefix: /grpc.service.pipedservice.PipedService/
4747
grpc:
4848
route:
4949
cluster: server-piped-api
5050
- match:
51-
prefix: /pipe.api.service.webservice.WebService/
51+
prefix: /grpc.service.webservice.WebService/
5252
grpc:
5353
route:
5454
cluster: server-web-api

‎manifests/pipecd/templates/envoy-configmap.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,39 @@ data:
6161
expose_headers: custom-header-1,grpc-status,grpc-message
6262
{{- end }}
6363
routes:
64+
- match:
65+
prefix: /grpc.service.pipedservice.PipedService/
66+
grpc:
67+
route:
68+
cluster: grpc-piped-service
6469
- match:
6570
prefix: /pipe.api.service.pipedservice.PipedService/
6671
grpc:
6772
route:
6873
cluster: grpc-piped-service
74+
prefix_rewrite: /grpc.service.pipedservice.PipedService/
75+
- match:
76+
prefix: /grpc.service.webservice.WebService/
77+
grpc:
78+
route:
79+
cluster: grpc-web-service
6980
- match:
7081
prefix: /pipe.api.service.webservice.WebService/
7182
grpc:
7283
route:
7384
cluster: grpc-web-service
85+
prefix_rewrite: /grpc.service.webservice.WebService/
86+
- match:
87+
prefix: /grpc.service.apiservice.APIService/
88+
grpc:
89+
route:
90+
cluster: grpc-api-service
7491
- match:
7592
prefix: /pipe.api.service.apiservice.APIService/
7693
grpc:
7794
route:
7895
cluster: grpc-api-service
96+
prefix_rewrite: /grpc.service.apiservice.APIService/
7997
- match:
8098
prefix: /
8199
route:

‎manifests/pipecd/templates/ingress.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,27 @@ spec:
2222
rules:
2323
- http:
2424
paths:
25+
- path: /grpc.service.pipedservice.PipedService/
26+
pathType: Prefix
27+
backend:
28+
service:
29+
name: {{ include "pipecd.fullname" . }}
30+
port:
31+
number: {{ .Values.service.port }}
2532
- path: /pipe.api.service.pipedservice.PipedService/
2633
pathType: Prefix
2734
backend:
2835
service:
2936
name: {{ include "pipecd.fullname" . }}
3037
port:
3138
number: {{ .Values.service.port }}
39+
- path: /grpc.service.apiservice.APIService/
40+
pathType: Prefix
41+
backend:
42+
service:
43+
name: {{ include "pipecd.fullname" . }}
44+
port:
45+
number: {{ .Values.service.port }}
3246
- path: /pipe.api.service.apiservice.APIService/
3347
pathType: Prefix
3448
backend:

‎pkg/app/server/service/apiservice/service.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
syntax = "proto3";
1616

17-
package pipe.api.service.apiservice;
17+
package grpc.service.apiservice;
1818
option go_package = "github.com/pipe-cd/pipecd/pkg/app/server/service/apiservice";
1919

2020
import "validate/validate.proto";

‎pkg/app/server/service/pipedservice/service.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
syntax = "proto3";
1616

17-
package pipe.api.service.pipedservice;
17+
package grpc.service.pipedservice;
1818
option go_package = "github.com/pipe-cd/pipecd/pkg/app/server/service/pipedservice";
1919

2020
import "validate/validate.proto";

‎pkg/app/server/service/webservice/service.pb.auth.go

+43-43
Original file line numberDiff line numberDiff line change
@@ -42,93 +42,93 @@ func isViewer(r model.Role) bool {
4242
// Todo: Auto generate this file from protobuf.
4343
func (a *authorizer) Authorize(method string, r model.Role) bool {
4444
switch method {
45-
case "/pipe.api.service.webservice.WebService/AddEnvironment":
45+
case "/grpc.service.webservice.WebService/AddEnvironment":
4646
return isAdmin(r)
47-
case "/pipe.api.service.webservice.WebService/UpdateEnvironmentDesc":
47+
case "/grpc.service.webservice.WebService/UpdateEnvironmentDesc":
4848
return isAdmin(r)
49-
case "/pipe.api.service.webservice.WebService/DeleteEnvironment":
49+
case "/grpc.service.webservice.WebService/DeleteEnvironment":
5050
return isAdmin(r)
51-
case "/pipe.api.service.webservice.WebService/RegisterPiped":
51+
case "/grpc.service.webservice.WebService/RegisterPiped":
5252
return isAdmin(r)
53-
case "/pipe.api.service.webservice.WebService/UpdatePiped":
53+
case "/grpc.service.webservice.WebService/UpdatePiped":
5454
return isAdmin(r)
55-
case "/pipe.api.service.webservice.WebService/RecreatePipedKey":
55+
case "/grpc.service.webservice.WebService/RecreatePipedKey":
5656
return isAdmin(r)
57-
case "/pipe.api.service.webservice.WebService/DeleteOldPipedKeys":
57+
case "/grpc.service.webservice.WebService/DeleteOldPipedKeys":
5858
return isAdmin(r)
59-
case "/pipe.api.service.webservice.WebService/EnablePiped":
59+
case "/grpc.service.webservice.WebService/EnablePiped":
6060
return isAdmin(r)
61-
case "/pipe.api.service.webservice.WebService/DisablePiped":
61+
case "/grpc.service.webservice.WebService/DisablePiped":
6262
return isAdmin(r)
63-
case "/pipe.api.service.webservice.WebService/UpdatePipedDesiredVersion":
63+
case "/grpc.service.webservice.WebService/UpdatePipedDesiredVersion":
6464
return isAdmin(r)
65-
case "/pipe.api.service.webservice.WebService/UpdateProjectStaticAdmin":
65+
case "/grpc.service.webservice.WebService/UpdateProjectStaticAdmin":
6666
return isAdmin(r)
67-
case "/pipe.api.service.webservice.WebService/EnableStaticAdmin":
67+
case "/grpc.service.webservice.WebService/EnableStaticAdmin":
6868
return isAdmin(r)
69-
case "/pipe.api.service.webservice.WebService/DisableStaticAdmin":
69+
case "/grpc.service.webservice.WebService/DisableStaticAdmin":
7070
return isAdmin(r)
71-
case "/pipe.api.service.webservice.WebService/UpdateProjectSSOConfig":
71+
case "/grpc.service.webservice.WebService/UpdateProjectSSOConfig":
7272
return isAdmin(r)
73-
case "/pipe.api.service.webservice.WebService/UpdateProjectRBACConfig":
73+
case "/grpc.service.webservice.WebService/UpdateProjectRBACConfig":
7474
return isAdmin(r)
75-
case "/pipe.api.service.webservice.WebService/GenerateAPIKey":
75+
case "/grpc.service.webservice.WebService/GenerateAPIKey":
7676
return isAdmin(r)
77-
case "/pipe.api.service.webservice.WebService/DisableAPIKey":
77+
case "/grpc.service.webservice.WebService/DisableAPIKey":
7878
return isAdmin(r)
79-
case "/pipe.api.service.webservice.WebService/ListAPIKeys":
79+
case "/grpc.service.webservice.WebService/ListAPIKeys":
8080
return isAdmin(r)
8181

82-
case "/pipe.api.service.webservice.WebService/AddApplication":
82+
case "/grpc.service.webservice.WebService/AddApplication":
8383
return isAdmin(r) || isEditor(r)
84-
case "/pipe.api.service.webservice.WebService/UpdateApplication":
84+
case "/grpc.service.webservice.WebService/UpdateApplication":
8585
return isAdmin(r) || isEditor(r)
86-
case "/pipe.api.service.webservice.WebService/UpdateApplicationDescription":
86+
case "/grpc.service.webservice.WebService/UpdateApplicationDescription":
8787
return isAdmin(r) || isEditor(r)
88-
case "/pipe.api.service.webservice.WebService/EnableApplication":
88+
case "/grpc.service.webservice.WebService/EnableApplication":
8989
return isAdmin(r) || isEditor(r)
90-
case "/pipe.api.service.webservice.WebService/DisableApplication":
90+
case "/grpc.service.webservice.WebService/DisableApplication":
9191
return isAdmin(r) || isEditor(r)
92-
case "/pipe.api.service.webservice.WebService/DeleteApplication":
92+
case "/grpc.service.webservice.WebService/DeleteApplication":
9393
return isAdmin(r) || isEditor(r)
94-
case "/pipe.api.service.webservice.WebService/SyncApplication":
94+
case "/grpc.service.webservice.WebService/SyncApplication":
9595
return isAdmin(r) || isEditor(r)
96-
case "/pipe.api.service.webservice.WebService/CancelDeployment":
96+
case "/grpc.service.webservice.WebService/CancelDeployment":
9797
return isAdmin(r) || isEditor(r)
98-
case "/pipe.api.service.webservice.WebService/ApproveStage":
98+
case "/grpc.service.webservice.WebService/ApproveStage":
9999
return isAdmin(r) || isEditor(r)
100-
case "/pipe.api.service.webservice.WebService/GenerateApplicationSealedSecret":
100+
case "/grpc.service.webservice.WebService/GenerateApplicationSealedSecret":
101101
return isAdmin(r) || isEditor(r)
102102

103-
case "/pipe.api.service.webservice.WebService/GetApplicationLiveState":
103+
case "/grpc.service.webservice.WebService/GetApplicationLiveState":
104104
return isAdmin(r) || isEditor(r) || isViewer(r)
105-
case "/pipe.api.service.webservice.WebService/GetProject":
105+
case "/grpc.service.webservice.WebService/GetProject":
106106
return isAdmin(r) || isEditor(r) || isViewer(r)
107-
case "/pipe.api.service.webservice.WebService/GetCommand":
107+
case "/grpc.service.webservice.WebService/GetCommand":
108108
return isAdmin(r) || isEditor(r) || isViewer(r)
109-
case "/pipe.api.service.webservice.WebService/ListEnvironments":
109+
case "/grpc.service.webservice.WebService/ListEnvironments":
110110
return isAdmin(r) || isEditor(r) || isViewer(r)
111-
case "/pipe.api.service.webservice.WebService/ListPipeds":
111+
case "/grpc.service.webservice.WebService/ListPipeds":
112112
return isAdmin(r) || isEditor(r) || isViewer(r)
113-
case "/pipe.api.service.webservice.WebService/GetPiped":
113+
case "/grpc.service.webservice.WebService/GetPiped":
114114
return isAdmin(r) || isEditor(r) || isViewer(r)
115-
case "/pipe.api.service.webservice.WebService/ListApplications":
115+
case "/grpc.service.webservice.WebService/ListApplications":
116116
return isAdmin(r) || isEditor(r) || isViewer(r)
117-
case "/pipe.api.service.webservice.WebService/GetApplication":
117+
case "/grpc.service.webservice.WebService/GetApplication":
118118
return isAdmin(r) || isEditor(r) || isViewer(r)
119-
case "/pipe.api.service.webservice.WebService/ListDeployments":
119+
case "/grpc.service.webservice.WebService/ListDeployments":
120120
return isAdmin(r) || isEditor(r) || isViewer(r)
121-
case "/pipe.api.service.webservice.WebService/GetDeployment":
121+
case "/grpc.service.webservice.WebService/GetDeployment":
122122
return isAdmin(r) || isEditor(r) || isViewer(r)
123-
case "/pipe.api.service.webservice.WebService/GetStageLog":
123+
case "/grpc.service.webservice.WebService/GetStageLog":
124124
return isAdmin(r) || isEditor(r) || isViewer(r)
125-
case "/pipe.api.service.webservice.WebService/GetMe":
125+
case "/grpc.service.webservice.WebService/GetMe":
126126
return isAdmin(r) || isEditor(r) || isViewer(r)
127-
case "/pipe.api.service.webservice.WebService/GetInsightData":
127+
case "/grpc.service.webservice.WebService/GetInsightData":
128128
return isAdmin(r) || isEditor(r) || isViewer(r)
129-
case "/pipe.api.service.webservice.WebService/GetInsightApplicationCount":
129+
case "/grpc.service.webservice.WebService/GetInsightApplicationCount":
130130
return isAdmin(r) || isEditor(r) || isViewer(r)
131-
case "/pipe.api.service.webservice.WebService/ListUnregisteredApplications":
131+
case "/grpc.service.webservice.WebService/ListUnregisteredApplications":
132132
return isAdmin(r) || isEditor(r) || isViewer(r)
133133
}
134134

‎pkg/app/server/service/webservice/service.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
syntax = "proto3";
1616

17-
package pipe.api.service.webservice;
17+
package grpc.service.webservice;
1818
option go_package = "github.com/pipe-cd/pipecd/pkg/app/server/service/webservice";
1919

2020
import "validate/validate.proto";

‎pkg/app/web/src/mocks/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import { apiEndpoint } from "~/constants/api-endpoint";
22

33
export const createMask = (path: string): string =>
4-
`${apiEndpoint}/pipe.api.service.webservice.WebService${path}`;
4+
`${apiEndpoint}/grpc.service.webservice.WebService${path}`;

0 commit comments

Comments
 (0)
Please sign in to comment.