Updated the distributor bundle path template

internal/config/notify_templates.go

@@ -12,6 +12,12 @@ type DistributorTemplateValues struct {
 	RunID           string
 	ArtifactGroup   string
 	BatchOutputName string
+	ValidStartDate  string
+	ValidEndDate    string
+	ValidStartTime  string
+	ValidEndTime    string
+	ValidStartStamp string
+	ValidEndStamp   string
 	BundleID        string
 }
 
@@ -21,6 +27,12 @@ var distributorTemplateVariables = map[string]struct{}{
 	"run_id":            {},
 	"artifact_group":    {},
 	"batch_output_name": {},
+	"valid_start_date":  {},
+	"valid_end_date":    {},
+	"valid_start_time":  {},
+	"valid_end_time":    {},
+	"valid_start_stamp": {},
+	"valid_end_stamp":   {},
 }
 
 var distributorIdempotencyTemplateVariables = map[string]struct{}{
@@ -29,6 +41,12 @@ var distributorIdempotencyTemplateVariables = map[string]struct{}{
 	"run_id":            {},
 	"artifact_group":    {},
 	"batch_output_name": {},
+	"valid_start_date":  {},
+	"valid_end_date":    {},
+	"valid_start_time":  {},
+	"valid_end_time":    {},
+	"valid_start_stamp": {},
+	"valid_end_stamp":   {},
 	"bundle_id":         {},
 }
 
@@ -53,15 +71,28 @@ func RenderDistributorIdempotencyKey(template string, values DistributorTemplate
 	return renderDistributorTemplate("notify.distributor.idempotency_key_template", template, values, distributorIdempotencyTemplateVariables)
 }
 
-func RenderDistributorReportPath(template string, values DistributorTemplateValues) (string, error) {
-	rendered, err := renderDistributorTemplate("notify.distributor.report_path_template", template, values, distributorTemplateVariables)
-	if err != nil {
-		return "", err
+func RenderDistributorReportPaths(templates []string, values DistributorTemplateValues) ([]string, error) {
+	if len(templates) == 0 {
+		return nil, fmt.Errorf("notify.distributor.report_path_templates must contain at least one entry")
 	}
-	if err := ValidateDistributorReportPath(rendered); err != nil {
-		return "", err
+	paths := make([]string, 0, len(templates))
+	seen := make(map[string]struct{}, len(templates))
+	for i, template := range templates {
+		name := fmt.Sprintf("notify.distributor.report_path_templates[%d]", i)
+		rendered, err := renderDistributorTemplate(name, template, values, distributorTemplateVariables)
+		if err != nil {
+			return nil, err
+		}
+		if err := ValidateDistributorReportPath(name, rendered); err != nil {
+			return nil, err
+		}
+		if _, ok := seen[rendered]; ok {
+			return nil, fmt.Errorf("notify.distributor.report_path_templates renders duplicate path %q", rendered)
+		}
+		seen[rendered] = struct{}{}
+		paths = append(paths, rendered)
 	}
-	return rendered, nil
+	return paths, nil
 }
 
 func validateDistributorTemplate(name, template string, allowed map[string]struct{}) error {
@@ -109,6 +140,18 @@ func distributorTemplateValue(variable string, values DistributorTemplateValues)
 		return values.ArtifactGroup
 	case "batch_output_name":
 		return values.BatchOutputName
+	case "valid_start_date":
+		return values.ValidStartDate
+	case "valid_end_date":
+		return values.ValidEndDate
+	case "valid_start_time":
+		return values.ValidStartTime
+	case "valid_end_time":
+		return values.ValidEndTime
+	case "valid_start_stamp":
+		return values.ValidStartStamp
+	case "valid_end_stamp":
+		return values.ValidEndStamp
 	case "bundle_id":
 		return values.BundleID
 	default:
@@ -116,27 +159,27 @@ func distributorTemplateValue(variable string, values DistributorTemplateValues)
 	}
 }
 
-func ValidateDistributorReportPath(path string) error {
+func ValidateDistributorReportPath(name, path string) error {
 	if path == "" {
-		return fmt.Errorf("notify.distributor.report_path_template renders an empty path")
+		return fmt.Errorf("%s renders an empty path", name)
 	}
 	if isDistributorAbsolutePath(path) {
-		return fmt.Errorf("notify.distributor.report_path_template must render a relative path")
+		return fmt.Errorf("%s must render a relative path", name)
 	}
 	if strings.Contains(path, "\\") {
-		return fmt.Errorf("notify.distributor.report_path_template must not render backslashes")
+		return fmt.Errorf("%s must not render backslashes", name)
 	}
 
 	segments := strings.Split(path, "/")
 	for _, segment := range segments {
 		if segment == "" {
-			return fmt.Errorf("notify.distributor.report_path_template must not render empty path segments")
+			return fmt.Errorf("%s must not render empty path segments", name)
 		}
 		if segment == "." || segment == ".." {
-			return fmt.Errorf("notify.distributor.report_path_template must not render . or .. path segments")
+			return fmt.Errorf("%s must not render . or .. path segments", name)
 		}
 		if segment == "manifest.json" || segment == ".distributor.json" {
-			return fmt.Errorf("notify.distributor.report_path_template must not render reserved path segment %q", segment)
+			return fmt.Errorf("%s must not render reserved path segment %q", name, segment)
 		}
 	}