github/kubescape
1
0
Fork 0
mirror of https://github.com/kubescape/kubescape.git synced 2026-04-15 06:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust Content Line

Browse Source
This commit is contained in:
suhasgumma
2022-12-09 22:45:55 +05:30
parent fa03a9dae3
commit f72cb215d7
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/pkg/fixhandler/fixhandler_test.go
View File

@@ -65,7 +65,7 @@ func testDirectoryApplyFixHelper(t *testing.T, yamlExpressions *[]string, direct
// make changes to temp file
h, _ := NewFixHandlerMock()
err = h.applyFixToFile(tempFile.Name(), (*yamlExpressions)[scenario])
err = h.applyFixToFile(tempFile.Name(), (*yamlExpressions)[scenario-1])
assert.NoError(t, err)
// Check temp file contents
@@ -79,7 +79,7 @@ func testDirectoryApplyFixHelper(t *testing.T, yamlExpressions *[]string, direct
errorMessage := fmt.Sprintf("Content of fixed %s doesn't match content of %s in %s", originalFile, fixedFile, directoryPath)
assert.Equal(t, tempFileContent, fixedFileContent, errorMessage)
assert.Equal(t, string(tempFileContent), string(fixedFileContent), errorMessage)
}
}

38
core/pkg/fixhandler/yamlhandler.go
View File

@@ -184,7 +184,21 @@ func updateLinesToReplace(fixInfoMetadata *FixInfoMetadata) (int, int) {
return updatedOriginalTracker, updatedFixedTracker
}
func applyFixesToFile(filePath string, lineAndContentsToAdd *[]ContentToAdd, linesToRemove *[]ContentToRemove, contentAtHead string) error {
// Line numbers are readjusted such that there are no empty lines or comment lines before them
func adjustContentLines(contentToAdd *[]ContentToAdd, linesSlice *[]string) {
for contentIdx, content := range *contentToAdd {
line := content.Line
for idx := line - 1; idx >= 0; idx-- {
if isEmptyLineOrComment((*linesSlice)[idx]) {
(*contentToAdd)[contentIdx].Line -= 1
} else {
break
}
}
}
}
func applyFixesToFile(filePath string, contentToAdd *[]ContentToAdd, linesToRemove *[]ContentToRemove, contentAtHead string) error {
linesSlice, err := getLinesSlice(filePath)
if err != nil {
@@ -210,32 +224,36 @@ func applyFixesToFile(filePath string, lineAndContentsToAdd *[]ContentToAdd, lin
removeLines(linesToRemove, &linesSlice)
writer := bufio.NewWriter(file)
lineIdx, lineToAddIdx := 0, 0
lineIdx, lineToAddIdx := 1, 0
// Insert the comments and lines at the head removed initially.
writer.WriteString(contentAtHead)
for lineToAddIdx < len(*lineAndContentsToAdd) {
for lineIdx <= (*lineAndContentsToAdd)[lineToAddIdx].Line {
if linesSlice[lineIdx] == "*" {
// Ideally, new node is inserted at line before the next node in DFS order. But, when the previous line contains a
// comment or empty line, we need to insert new nodes before them.
adjustContentLines(contentToAdd, &linesSlice)
for lineToAddIdx < len(*contentToAdd) {
for lineIdx <= (*contentToAdd)[lineToAddIdx].Line {
if linesSlice[lineIdx-1] == "*" {
continue
}
_, err := writer.WriteString(linesSlice[lineIdx] + "\n")
_, err := writer.WriteString(linesSlice[lineIdx-1] + "\n")
if err != nil {
return err
}
lineIdx += 1
}
writeContentToAdd(writer, (*lineAndContentsToAdd)[lineToAddIdx].Content)
writeContentToAdd(writer, (*contentToAdd)[lineToAddIdx].Content)
lineToAddIdx += 1
}
for lineIdx < len(linesSlice) {
if linesSlice[lineIdx] == "*" {
for lineIdx <= len(linesSlice) {
if linesSlice[lineIdx-1] == "*" {
continue
}
_, err := writer.WriteString(linesSlice[lineIdx] + "\n")
_, err := writer.WriteString(linesSlice[lineIdx-1] + "\n")
if err != nil {
return err
}

1
core/pkg/fixhandler/yamlhelper.go
View File

@@ -231,6 +231,7 @@ func removeLines(linesToRemove *[]ContentToRemove, linesSlice *[]string) {
// Checks if the line is empty or a comment
func isEmptyLineOrComment(lineContent string) bool {
lineContent = strings.TrimSpace(lineContent)
if lineContent == "" {
return true
} else if lineContent[0:1] == "#" {