AsAMRoute -> AsRoute

pkg/services/ngalert/api/compat/compat.go

@@ -401,8 +401,8 @@ func RouteExportFromRoute(route *definitions.Route) *definitions.RouteExport {
 
 // RouteExportFromManagedRoute creates a definitions.RouteExport DTO from legacy_storage.ManagedRoute.
 func RouteExportFromManagedRoute(route *legacy_storage.ManagedRoute) *definitions.RouteExport {
-	amRoute := route.AsAMRoute()
-	export := RouteExportFromRoute(&amRoute)
+	apiRoute := route.AsRoute()
+	export := RouteExportFromRoute(&apiRoute)
 	if route.Name == legacy_storage.UserDefinedRoutingTreeName {
 		export.Name = nil // Functionally this shouldn't matter, aesthetically this prefers an empty name over "user-defined".
 	} else {

pkg/services/ngalert/notifier/legacy_storage/routes.go

@@ -36,7 +36,7 @@ type ManagedRoute struct {
 	Provenance models.Provenance
 }
 
-func (r *ManagedRoute) AsAMRoute() definition.Route {
+func (r *ManagedRoute) AsRoute() definition.Route {
 	// Only need to copy the fields that are valid for a root route.
 	return definition.Route{
 		Receiver:       r.Receiver,
@@ -50,7 +50,7 @@ func (r *ManagedRoute) AsAMRoute() definition.Route {
 }
 
 func (r *ManagedRoute) GeneratedSubRoute() *definition.Route {
-	amRoute := r.AsAMRoute()
+	amRoute := r.AsRoute()
 
 	// It's important that the generated sub-route is fully defined so that they will never rely on the values of the root.
 	defaultOpts := dispatch.DefaultRouteOpts
@@ -190,7 +190,7 @@ func (rev *ConfigRevision) CreateManagedRoute(name string, subtree definitions.R
 	}
 
 	managedRoute := NewManagedRoute(name, &subtree)
-	amRoute := managedRoute.AsAMRoute()
+	amRoute := managedRoute.AsRoute()
 
 	err := rev.ValidateRoute(amRoute)
 	if err != nil {
@@ -215,7 +215,7 @@ func (rev *ConfigRevision) UpdateNamedRoute(name string, subtree definitions.Rou
 	}
 
 	managedRoute := NewManagedRoute(name, &subtree)
-	amRoute := managedRoute.AsAMRoute()
+	amRoute := managedRoute.AsRoute()
 
 	err := rev.ValidateRoute(amRoute)
 	if err != nil {

pkg/services/ngalert/provisioning/notification_policies.go

@@ -277,7 +277,7 @@ func (nps *NotificationPolicyService) GetPolicyTree(ctx context.Context, orgID i
 	if err != nil {
 		return definitions.Route{}, "", err
 	}
-	return r.AsAMRoute(), r.Version, nil
+	return r.AsRoute(), r.Version, nil
 }
 
 // TODO: Remove this method once the all callers support named routes.
@@ -286,7 +286,7 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 	if err != nil {
 		return definitions.Route{}, "", err
 	}
-	return r.AsAMRoute(), r.Version, nil
+	return r.AsRoute(), r.Version, nil
 }
 
 // TODO: Remove this method once the all callers support named routes.