Change endpoint field to path

tratteria · Aug 6, 2024 · a2536d5 · a2536d5
1 parent d0de25d
commit a2536d5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ In this mode, incoming requests are not intercepted; instead, requests must be m
 
 **Sample API Endpoint:** http://localhost:<agentApiPort>/verify-trat
 
-For example, if `agentApiPort` is configured as `9030`, the full API endpoint would be: `http://localhost:9030/verify-trat`
+For example, if `agentApiPort` is configured as `9030`, the full API endpoint would be: `POST http://localhost:9030/verify-trat`
 
 This endpoint takes request data as input and responds with the result of the TraT verification.
 
@@ -66,7 +66,7 @@ Structure:
 
 ```json
 {
-    "endpoint": "request URL path",
+    "path": "request URL path",
     "method": "request HTTP method",
     "body": "request JSON payload",
     "headers": "JSON object of request HTTP headers",
@@ -78,7 +78,7 @@ Example:
 
 ```json
 {
-    "endpoint": "/order",
+    "path": "/order",
     "method": "POST",
     "body": {
         "stockID": 12345,

diff --git a/service/api/handler/handler.go b/service/api/handler/handler.go
@@ -23,7 +23,7 @@ func NewHandlers(service *service.Service, logger *zap.Logger) *Handlers {
 }
 
 type VerifyTraTRequest struct {
-	Path            string            `json:"endpoint"`
+	Path            string            `json:"path"`
 	Method          common.HttpMethod `json:"method"`
 	QueryParameters json.RawMessage   `json:"queryParameters"`
 	Headers         json.RawMessage   `json:"headers"`
@@ -76,7 +76,7 @@ func (h *Handlers) VerifyTraTHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	h.logger.Info("Received verify trat request", zap.String("endpoint", verifyTraTRequest.Path), zap.String("method", string(verifyTraTRequest.Method)))
+	h.logger.Info("Received verify trat request", zap.String("path", verifyTraTRequest.Path), zap.String("method", string(verifyTraTRequest.Method)))
 
 	trat := headers["Txn-Token"]
 
@@ -95,7 +95,7 @@ func (h *Handlers) VerifyTraTHandler(w http.ResponseWriter, r *http.Request) {
 		verifyTraTResponse.Valid = false
 		verifyTraTResponse.Reason = reason
 
-		h.logger.Error("Invalid trat", zap.String("endpoint", verifyTraTRequest.Path), zap.String("method", string(verifyTraTRequest.Method)), zap.String("reason", reason))
+		h.logger.Error("Invalid trat", zap.String("path", verifyTraTRequest.Path), zap.String("method", string(verifyTraTRequest.Method)), zap.String("reason", reason))
 	} else {
 		verifyTraTResponse.Valid = true
 	}

diff --git a/service/tratinterceptor/interceptverifier.go b/service/tratinterceptor/interceptverifier.go
@@ -124,7 +124,7 @@ func (iv *TraTInterceptor) tratVerificationMiddleware(next http.Handler) http.Ha
 		}
 
 		if !valid {
-			iv.logger.Error("Invalid trat", zap.String("endpoint", r.URL.Path), zap.String("method", r.Method), zap.String("reason", reason))
+			iv.logger.Error("Invalid trat", zap.String("path", r.URL.Path), zap.String("method", r.Method), zap.String("reason", reason))
 			http.Error(w, "Invalid trat", http.StatusUnauthorized)
 
 			return

diff --git a/service/verificationrules/v1alpha1/rules.go b/service/verificationrules/v1alpha1/rules.go
@@ -41,7 +41,7 @@ type TratteriaConfigVerificationRule struct {
 
 type TraTVerificationRule struct {
 	TraTName   string            `json:"traTName"`
-	Endpoint   string            `json:"endpoint"`
+	Path       string            `json:"path"`
 	Method     common.HttpMethod `json:"method"`
 	Purp       string            `json:"purp"`
 	AzdMapping AzdMapping        `json:"azdmapping,omitempty"`
@@ -168,12 +168,12 @@ func (vri *VerificationRulesImp) indexTraTsVerificationRules() {
 	if vri.verificationRules != nil && vri.verificationRules.TraTsVerificationRules != nil {
 		for _, serviceRules := range vri.verificationRules.TraTsVerificationRules {
 			for _, rule := range serviceRules.TraTVerificationRules {
-				if indexedRules[rule.Method][rule.Endpoint] == nil {
-					indexedRules[rule.Method][rule.Endpoint] = &EndpointRule{Skip: false}
+				if indexedRules[rule.Method][rule.Path] == nil {
+					indexedRules[rule.Method][rule.Path] = &EndpointRule{Skip: false}
 				}
 
-				indexedRules[rule.Method][rule.Endpoint].Rules = append(
-					indexedRules[rule.Method][rule.Endpoint].Rules, rule)
+				indexedRules[rule.Method][rule.Path].Rules = append(
+					indexedRules[rule.Method][rule.Path].Rules, rule)
 			}
 		}
 	}