chore: rename metadata to endpoints

TBXark · Nov 6, 2024 · 53024ef · 53024ef
1 parent 327b4f4
commit 53024ef
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/api/api/v1/auth_sphere.pb.go b/api/api/v1/auth_sphere.pb.go
diff --git a/api/api/v1/system_sphere.pb.go b/api/api/v1/system_sphere.pb.go
diff --git a/api/api/v1/user_sphere.pb.go b/api/api/v1/user_sphere.pb.go
diff --git a/api/dash/v1/admin_sphere.pb.go b/api/dash/v1/admin_sphere.pb.go
diff --git a/api/dash/v1/auth_sphere.pb.go b/api/dash/v1/auth_sphere.pb.go
diff --git a/api/dash/v1/system_sphere.pb.go b/api/dash/v1/system_sphere.pb.go
diff --git a/api/dash/v1/task_sphere.pb.go b/api/dash/v1/task_sphere.pb.go
diff --git a/api/shared/v1/storage_sphere.pb.go b/api/shared/v1/storage_sphere.pb.go
diff --git a/api/shared/v1/test_sphere.pb.go b/api/shared/v1/test_sphere.pb.go
diff --git a/contrib/protoc-gen-sphere/template.go.tpl b/contrib/protoc-gen-sphere/template.go.tpl
@@ -5,7 +5,7 @@
 const Operation{{$svrType}}{{.OriginalName}} = "/{{$svrName}}/{{.OriginalName}}"
 {{- end}}
 
-var Metadata{{.ServiceType}} = [...][3]string{
+var Endpoints{{.ServiceType}} = [...][3]string{
 	{{- range .Methods}}
 	{Operation{{$svrType}}{{.OriginalName}}, "{{.Method}}", "{{.GinPath}}" },
 	{{- end}}

diff --git a/internal/server/dash/web.go b/internal/server/dash/web.go
@@ -87,7 +87,7 @@ func (w *Web) Run() error {
 			selector.MatchFunc(
 				ginx.MatchOperation(
 					authRoute.BasePath(),
-					dashv1.MetadataAuthService[:],
+					dashv1.EndpointsAuthService[:],
 					dashv1.OperationAuthServiceAuthLogin,
 				),
 			),

diff --git a/pkg/server/ginx/metadata.go b/pkg/server/ginx/metadata.go
@@ -2,9 +2,9 @@ package ginx
 
 import "github.com/gin-gonic/gin"
 
-func metadataToMatches(base string, metadata ...[][3]string) map[string]map[string]string {
+func EndpointsToMatches(base string, endpoints ...[][3]string) map[string]map[string]string {
 	matches := make(map[string]map[string]string)
-	for _, list := range metadata {
+	for _, list := range endpoints {
 		for _, route := range list {
 			if _, ok := matches[route[1]]; !ok {
 				matches[route[1]] = make(map[string]string)
@@ -15,8 +15,8 @@ func metadataToMatches(base string, metadata ...[][3]string) map[string]map[stri
 	return matches
 }
 
-func MatchOperation(base string, metadata [][3]string, operations ...string) func(ctx *gin.Context) bool {
-	matches := metadataToMatches(base, metadata)
+func MatchOperation(base string, endpoints [][3]string, operations ...string) func(ctx *gin.Context) bool {
+	matches := EndpointsToMatches(base, endpoints)
 	opts := make(map[string]struct{}, len(operations))
 	for _, opt := range operations {
 		opts[opt] = struct{}{}