Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Serverless Tags - adjust indentation calculation. #452

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Serverless Tags - adjust indentation calculation. #452

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52bf825
adjust indentation
ChanochShayner Dec 13, 2023
1dc6bbe
adjust indentation just for sls (noy cfn)
ChanochShayner Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/common/yaml/yaml_writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,16 @@ func WriteYAMLFile(readFilePath string, blocks []structure.IBlock, writeFilePath
if isCfn {
tagIndent += SingleIndent
}
resourcesLines = append(resourcesLines, IndentLines(newResourceLines[newResourceTagLineRange.Start+1:newResourceTagLineRange.End+1], tagIndent)...)
resourcesLines = append(resourcesLines, IndentLines(newResourceLines[newResourceTagLineRange.Start+1:newResourceTagLineRange.End+1], tagIndent, 0)...)
resourcesLines = append(resourcesLines, oldResourceLines[lastIndex+1:]...)
continue
}

oldTagsIndent := ExtractIndentationOfLine(oldResourceLines[oldResourceTagLines.Start-oldResourceLinesRange.Start])
oldTagsValueIndent := len(ExtractIndentationOfLine(oldResourceLines[oldResourceTagLines.Start-oldResourceLinesRange.Start+1])) - len(oldTagsIndent)
if isCfn {
oldTagsValueIndent = 0
}
if isCfn {
oldTagsIndent += SingleIndent
}
Expand All @@ -87,7 +91,7 @@ func WriteYAMLFile(readFilePath string, blocks []structure.IBlock, writeFilePath
} else {
UpdateExistingSLSTags(tagLines, diff.Updated)
}
allNewResourceTagLines := IndentLines(newResourceLines[newResourceTagLineRange.Start+1:newResourceTagLineRange.End+1], oldTagsIndent)
allNewResourceTagLines := IndentLines(newResourceLines[newResourceTagLineRange.Start+1:newResourceTagLineRange.End+1], oldTagsIndent, oldTagsValueIndent)
var netNewResourceLines []string
for i := 0; i < len(allNewResourceTagLines); i += linesPerTag {
l := allNewResourceTagLines[i]
Expand Down Expand Up @@ -337,13 +341,19 @@ func findLastNonEmptyLine(fileLines []string, maxIndex int) int {
return 0
}

func IndentLines(textLines []string, indent string) []string {
func IndentLines(textLines []string, indent string, valueIndent int) []string {
for i, originLine := range textLines {
var blankSpaces string
if valueIndent == 0 {
blankSpaces = SingleIndent
} else {
blankSpaces = strings.Repeat(" ", valueIndent)
}
noLeadingWhitespace := strings.TrimLeft(originLine, "\t \n")
if strings.Contains(originLine, "- Key") {
textLines[i] = indent + noLeadingWhitespace
} else {
textLines[i] = indent + SingleIndent + noLeadingWhitespace
textLines[i] = indent + blankSpaces + noLeadingWhitespace
}
}

Expand Down
Loading