Prevent exceeding 72 character limit (#1138)

* Prevent manifest from exceeding 72 character limit

* Add test

Author: ErZimmermann

internal/artifacts/manifest.go

@@ -69,6 +69,16 @@ func setManifestDesc(source dir.IModule, ep dir.ITargetArtifacts, targetPathGett
 	return genManifest(ep.GetManifestPath(), entries)
 }
 
+func wouldEntryExceedCharLimitAfterMerge(existing entry, newEntryName string) bool {
+	lines := strings.Split(existing.EntryName, "\n")
+	lastLine := lines[len(lines)-1]
+	if len(lines) == 1 {
+		lastLine = existing.EntryType + ": " + lastLine
+	}
+	newChars := ", " + newEntryName
+	return len(lastLine)+len(newChars) > 72
+}
+
 func mergeDuplicateEntries(entries []entry) []entry {
 	// Several MTA-Module entries can point to the same path. In that case, their names should in the same entry, comma-separated.
 	mergedEntries := make([]entry, 0)
@@ -83,15 +93,23 @@ func mergeDuplicateEntries(entries []entry) []entry {
 	for index, entry := range entries {
 		if entry.EntryType == moduleEntry {
 			if existing, ok := modules[entry.EntryPath]; ok {
-				existing.EntryName += ", " + entry.EntryName
+				if wouldEntryExceedCharLimitAfterMerge(existing, entry.EntryName) {
+					existing.EntryName += "\n , " + entry.EntryName
+				} else {
+					existing.EntryName += ", " + entry.EntryName
+				}
 				modules[entry.EntryPath] = existing
 			} else {
 				modules[entry.EntryPath] = entries[index]
 				pathsOrder = append(pathsOrder, entry.EntryPath)
 			}
 		} else if entry.EntryType == requiredEntry {
 			if existing, ok := required[entry.EntryPath]; ok {
-				existing.EntryName += ", " + entry.EntryName
+				if wouldEntryExceedCharLimitAfterMerge(existing, entry.EntryName) {
+					existing.EntryName += "\n , " + entry.EntryName
+				} else {
+					existing.EntryName += ", " + entry.EntryName
+				}
 				required[entry.EntryPath] = existing
 			} else {
 				required[entry.EntryPath] = entries[index]

internal/artifacts/manifest_test.go

@@ -410,6 +410,27 @@ bad config
 			{EntryName: "e1", EntryPath: "a", EntryType: resourceEntry, ContentType: "t1"},
 		},
 		),
+		Entry("merges module entries with the same path and does not exceed 72 character limit", []entry{
+			{EntryName: "entry1", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry2", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry3", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry4", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry5", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry6", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry7", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry8", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry9", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry10", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry11", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry12", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry13", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry14", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry15", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+			{EntryName: "entry16", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+		}, []entry{
+			{EntryName: "entry1, entry2, entry3, entry4, entry5, entry6, entry7\n , entry8, entry9, entry10, entry11, entry12, entry13, entry14, entry15\n , entry16", EntryPath: "a", EntryType: moduleEntry, ContentType: "t"},
+		},
+		),
 	)
 
 	var _ = Describe("getContentType", func() {