*parse correctly parameters from url.

Signed-off-by: Software Developer <[email protected]>

magefiles/generate/discovery/discovery.go

@@ -35,13 +35,18 @@ var routeParameterRegex = regexp.MustCompile(`<[^>]+:([^>]+)>`)
 // Get the safe path to use in Fiber registration.
 func (e Endpoint) GetFiberPath() string {
 	// e.Path cannot be trusted, it could be something like /mlflow-artifacts/artifacts/<path:artifact_path>
-	// Which would need to converted to /mlflow-artifacts/artifacts/:path
+	// which would need to be converted to /mlflow-artifacts/artifacts/:path
 	path := routeParameterRegex.ReplaceAllStringFunc(e.Path, func(s string) string {
 		parts := strings.Split(s, ":")
 
 		return ":" + strings.Trim(parts[0], "< ")
 	})
 
+	// or it could be something like /mlflow/traces/{request_id}/tags
+	// which would need to be converted to /mlflow/traces/:request_id/tags
+	path = strings.ReplaceAll(path, "{", ":")
+	path = strings.ReplaceAll(path, "}", "")
+
 	return path
 }
 

magefiles/generate/query_annotations.go

@@ -47,19 +47,20 @@ func addQueryAnnotation(generatedGoFile string) error {
 			tagValue := field.Tag.Value
 
 			hasQuery := strings.Contains(tagValue, "query:")
+			hasParams := strings.Contains(tagValue, "params:")
 			hasValidate := strings.Contains(tagValue, "validate:")
 			validationKey := fmt.Sprintf("%s_%s", typeSpec.Name, field.Names[0])
 			validationRule, needsValidation := validations[validationKey]
 
-			if hasQuery && (!needsValidation || needsValidation && hasValidate) {
+			if hasParams && hasQuery && (!needsValidation || needsValidation && hasValidate) {
 				continue
 			}
 
 			// With opening ` tick
 			newTag := tagValue[0 : len(tagValue)-1]
 
 			matches := jsonFieldTagRegexp.FindStringSubmatch(tagValue)
-			if len(matches) > 0 && !hasQuery {
+			if len(matches) > 0 && !hasQuery && !hasParams {
 				// Modify the tag here
 				// The json annotation could be something like `json:"key,omitempty"`
 				// We only want the key part, the `omitempty` is not relevant for the query annotation
@@ -68,7 +69,7 @@ func addQueryAnnotation(generatedGoFile string) error {
 					key = strings.Split(key, ",")[0]
 				}
 				// Add query annotation
-				newTag += fmt.Sprintf(" query:\"%s\"", key)
+				newTag += fmt.Sprintf(" query:\"%s\" params:\"%s\"", key, key)
 			}
 
 			if needsValidation {