change rollupTargetViewsToTargets to newRollupTargetsFromView

rules/rollup.go

@@ -44,14 +44,6 @@ var (
 	errNilRollupRuleSchema               = errors.New("nil rollup rule schema")
 )
 
-func rollupTargetViewsToTargets(views []models.RollupTargetView) []rollupTarget {
-	targets := make([]rollupTarget, len(views))
-	for i, t := range views {
-		targets[i] = newRollupTargetFromView(t)
-	}
-	return targets
-}
-
 // RollupTarget dictates how to roll up metrics. Metrics associated with a rollup
 // target will be grouped and rolled up across the provided set of tags, named
 // with the provided name, and aggregated and retained under the provided policies.
@@ -79,6 +71,14 @@ func newRollupTarget(target *schema.RollupTarget) (rollupTarget, error) {
 	}, nil
 }
 
+func newRollupTargetsFromView(views []models.RollupTargetView) []rollupTarget {
+	targets := make([]rollupTarget, len(views))
+	for i, t := range views {
+		targets[i] = newRollupTargetFromView(t)
+	}
+	return targets
+}
+
 func newRollupTargetFromView(rtv models.RollupTargetView) rollupTarget {
 	return rollupTarget{
 		Name:     []byte(rtv.Name),

rules/ruleset.go

@@ -808,7 +808,7 @@ func (rs *ruleSet) AddRollupRule(rrv models.RollupRuleView, meta UpdateMetadata)
 	if err != nil && err != errRuleNotFound {
 		return "", xerrors.Wrap(err, fmt.Sprintf(ruleActionErrorFmt, "add", rrv.Name))
 	}
-	targets := rollupTargetViewsToTargets(rrv.Targets)
+	targets := newRollupTargetsFromView(rrv.Targets)
 	if err == errRuleNotFound {
 		if r, err = newRollupRuleFromFields(
 			rrv.Name,
@@ -838,7 +838,7 @@ func (rs *ruleSet) UpdateRollupRule(rrv models.RollupRuleView, meta UpdateMetada
 	if err != nil {
 		return xerrors.Wrap(err, fmt.Sprintf(ruleActionErrorFmt, "update", rrv.ID))
 	}
-	targets := rollupTargetViewsToTargets(rrv.Targets)
+	targets := newRollupTargetsFromView(rrv.Targets)
 	if err = r.addSnapshot(
 		rrv.Name,
 		rrv.Filter,