renamed

Author: andreaangiolillo

tools/cli/internal/changelog/outputfilter/squash.go

@@ -147,13 +147,13 @@ func squashEntries(entries []*OasDiffEntry) ([]*OasDiffEntry, error) {
 	entriesByIDandOperationID, hiddenEntriesByIDandOperationID := newEntriesMapPerIDAndOperationID(entries)
 
 	squashHandlers := newSquashHandlers()
-	squashedEntries := []*OasDiffEntry{}
+	squashedEntriesOut := []*OasDiffEntry{}
 
 	for _, entry := range entries {
 		// if no squash handlers implemented for entry's code,
 		// just append the entry to the result
 		if _, ok := findHandler(entry.ID); !ok {
-			squashedEntries = append(squashedEntries, entry)
+			squashedEntriesOut = append(squashedEntriesOut, entry)
 			continue
 		}
 	}
@@ -168,14 +168,14 @@ func squashEntries(entries []*OasDiffEntry) ([]*OasDiffEntry, error) {
 		return nil, err
 	}
 
-	squashedEntries = append(squashedEntries, squashedEntriesNotHidden...)
-	squashedEntries = append(squashedEntries, squashedEntriesHidden...)
+	squashedEntriesOut = append(squashedEntriesOut, squashedEntriesNotHidden...)
+	squashedEntriesOut = append(squashedEntriesOut, squashedEntriesHidden...)
 
-	return squashedEntries, nil
+	return squashedEntriesOut, nil
 }
 
 func applySquashHandlerToMap(squashHandlers []handler, entriesMap map[string]map[string][]*OasDiffEntry) ([]*OasDiffEntry, error) {
-	squashedEntries := []*OasDiffEntry{}
+	squashedEntriesOut := []*OasDiffEntry{}
 	for _, handler := range squashHandlers {
 		entryMapPerOperationID, ok := entriesMap[handler.id]
 		if !ok {
@@ -187,9 +187,9 @@ func applySquashHandlerToMap(squashHandlers []handler, entriesMap map[string]map
 			return nil, err
 		}
 
-		squashedEntries = append(squashedEntries, sortEntriesByDescription(entries)...)
+		squashedEntriesOut = append(squashedEntriesOut, sortEntriesByDescription(entries)...)
 	}
-	return squashedEntries, nil
+	return squashedEntriesOut, nil
 }
 
 func sortEntriesByDescription(entries []*OasDiffEntry) []*OasDiffEntry {
@@ -209,7 +209,7 @@ func findHandler(id string) (*handler, bool) {
 	return nil, false
 }
 
-type valuesToSquashStruct struct {
+type squashedEntries struct {
 	valuesNotSquashed []string
 	valuesToSquash    map[string]struct{}
 }
@@ -304,13 +304,13 @@ func replaceOnlyFirstOccurrence(template, valuesToAddToTemplate string) string {
 	})
 }
 
-func newSquashMap(operation string, entries []*OasDiffEntry, expectedNumberOfValues, squashIdx int) (map[string]valuesToSquashStruct, error) {
+func newSquashMap(operation string, entries []*OasDiffEntry, expectedNumberOfValues, squashIdx int) (map[string]squashedEntries, error) {
 	// 	squash_map is a dictionary where:
 	//      The key is a string generated by concatenating values extracted from each entry, excluding the one at squash_idx (the index to be squashed).
 	//      The value is a tuple:
 	//		- The first element is a list of the values that are not squashed. Example: [regionName, 200]
 	// 		- The second element is a set of values that should be squashed. Example: ("GLOBAL_EVENT_ADMIN", "ORG_MEMBER")
-	squashMap := map[string]valuesToSquashStruct{}
+	squashMap := map[string]squashedEntries{}
 
 	for _, entry := range entries {
 		values, err := extractExactValuesOrFail(operation, entry, expectedNumberOfValues)
@@ -322,7 +322,7 @@ func newSquashMap(operation string, entries []*OasDiffEntry, expectedNumberOfVal
 
 		mergedKey := strings.Join(values, "|")
 		if _, exists := squashMap[mergedKey]; !exists {
-			squashMap[mergedKey] = valuesToSquashStruct{
+			squashMap[mergedKey] = squashedEntries{
 				valuesNotSquashed: values,
 				valuesToSquash:    make(map[string]struct{}),
 			}

tools/cli/internal/changelog/outputfilter/squash_test.go

@@ -235,7 +235,7 @@ func TestNewSquashMap(t *testing.T) {
 		entries                []*OasDiffEntry
 		expectedNumberOfValues int
 		squashIdx              int
-		want                   map[string]valuesToSquashStruct
+		want                   map[string]squashedEntries
 		wantErr                require.ErrorAssertionFunc
 	}{
 		{
@@ -244,7 +244,7 @@ func TestNewSquashMap(t *testing.T) {
 			entries:                []*OasDiffEntry{},
 			expectedNumberOfValues: 0,
 			squashIdx:              0,
-			want:                   map[string]valuesToSquashStruct{},
+			want:                   map[string]squashedEntries{},
 			wantErr:                require.NoError,
 		},
 		{
@@ -255,7 +255,7 @@ func TestNewSquashMap(t *testing.T) {
 			},
 			expectedNumberOfValues: 1,
 			squashIdx:              0,
-			want: map[string]valuesToSquashStruct{
+			want: map[string]squashedEntries{
 				"": {
 					valuesNotSquashed: []string{""},
 					valuesToSquash:    map[string]struct{}{"test": {}},
@@ -273,7 +273,7 @@ func TestNewSquashMap(t *testing.T) {
 			},
 			expectedNumberOfValues: 1,
 			squashIdx:              0,
-			want: map[string]valuesToSquashStruct{
+			want: map[string]squashedEntries{
 				"": {
 					valuesNotSquashed: []string{""},
 					valuesToSquash:    map[string]struct{}{"test1": {}, "test2": {}, "test3": {}},