Merge pull request #306 from Bedrock-OSS/develop

Update 1.5.1

Author: Nusiq

regolith/export.go

@@ -275,8 +275,7 @@ func ExportProject(ctx RunContext) error {
 	MeasureEnd()
 	// List the names of the filters that opt-in to the data export process
 	var exportedFilterNames []string
-	for filter := range profile.Filters {
-		filter := profile.Filters[filter]
+	err = profile.ForeachFilter(ctx, func(filter FilterRunner) error {
 		usingDataPath, err := filter.IsUsingDataExport(dotRegolithPath, ctx)
 		if err != nil {
 			return burrito.WrapErrorf(
@@ -299,6 +298,10 @@ func ExportProject(ctx RunContext) error {
 			// Add the filter name to the list of paths to export
 			exportedFilterNames = append(exportedFilterNames, filter.GetId())
 		}
+		return nil
+	}, true)
+	if err != nil {
+		return burrito.WrapError(err, "Failed to walk the list of the filters.")
 	}
 	// The root of the data path cannot be deleted because the
 	// "regolith watch" function would stop watching the file changes

regolith/profile.go

@@ -322,3 +322,51 @@ func ProfileFromObject(
 	result.ExportTarget = exportTarget
 	return result, nil
 }
+
+// ForeachFilter iterates over the filters of the profile and applies the
+// given function to each filter. If unpackNestedProfiles is true, it will
+// unpack the nested profiles and apply the function to their filters as well.
+func (p *Profile) ForeachFilter(
+	context RunContext,
+	fn func(FilterRunner) error,
+	unpackNestedProfiles bool,
+) error {
+	for i := range p.Filters {
+		filter := p.Filters[i]
+		profileFilter, ok := filter.(*ProfileFilter)
+		if unpackNestedProfiles && ok {
+			subProfile, ok := context.Config.Profiles[profileFilter.Profile]
+			if !ok {
+				return burrito.WrappedErrorf(
+					"Failed to find profile of the profile-filter.\n"+
+						"Parent profile: %s\n"+
+						"Profile filter index: %d\n"+
+						"Referenced profile: %s\n",
+					context.Profile, i, profileFilter.Profile,
+				)
+			}
+			err := subProfile.ForeachFilter(context, fn, unpackNestedProfiles)
+			if err != nil {
+				return burrito.WrappedErrorf(
+					"Failed to iterate over filters of the profile-filter.\n"+
+						"Parent profile: %s\n"+
+						"Profile filter index: %d\n"+
+						"Referenced profile: %s\n",
+					context.Profile, i, profileFilter.Profile,
+				)
+			}
+		} else {
+			err := fn(filter)
+			if err != nil {
+				return burrito.WrapErrorf(
+					err,
+					"Failed to iterate apply function to the filter.\n"+
+						"Profile: %s\n"+
+						"Filter index: %d\n",
+					context.Profile, i,
+				)
+			}
+		}
+	}
+	return nil
+}