fix: trim space markdown renderer #2947
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krrrr38
commented
Jan 7, 2023
| {{$result.Rendered}} | ||
| {{ range $i, $result := .Results -}} | ||
| ### {{ add $i 1 }}. {{ if $result.ProjectName }}project: `{{ $result.ProjectName }}` {{ end }}dir: `{{ $result.RepoRelDir }}` workspace: `{{ $result.Workspace }}` | ||
| {{ $result.Rendered }} |
There was a problem hiding this comment.
change template by following ways
- explicit break line: from
{{ range $i, $result := .Results }}### {{add $i 1}}to{{ range $i, $result := .Results -}}\n### {{ add $i 1 }} - unified format: from
{{$result.RepoRelDir}}to{{ $result.RepoRelDir }}
| @@ -258,7 +263,7 @@ func (m *MarkdownRenderer) renderProjectResults(results []command.ProjectResult, | |||
| default: | |||
| return "no template matched–this is a bug" | |||
| } | |||
| return m.renderTemplate(tmpl, resultData{resultsTmplData, common}) | |||
| return m.renderTemplateTrimSpace(tmpl, resultData{resultsTmplData, common}) | |||
There was a problem hiding this comment.
I added 2 kinds of TrimSpace.
- terraform logs TrimSpace like
resultData.Rendered = m.renderTemplateTrimSpace(templates.Lookup("importSuccessUnwrapped"), result.ImportSuccess) - full results TrimSpace (here)
| @@ -4,10 +4,7 @@ Ran Plan for 2 projects: | |||
| 1. dir: `infrastructure/production` workspace: `default` | |||
|
|
|||
| ### 1. dir: `infrastructure/staging` workspace: `default` | |||
| <details><summary>Show Output</summary> | |||
There was a problem hiding this comment.
wrapped results need maxUnwrappedLines = 12. After TrimSpace, this results become unwrapped.
atlantis/server/events/markdown_renderer.go
Line 282 in e4473ce
krrrr38
commented
Jan 7, 2023
| --- | ||
| {{ end -}} | ||
| {{- template "log" . -}} | ||
| {{ end -}} |
There was a problem hiding this comment.
same with #2880 (comment)
krrrr38
changed the title
nitrocode
reviewed
Jan 8, 2023
...s/events/testfixtures/test-repos/workspace-parallel-yaml/exp-output-apply-all-production.txt
Outdated
Show resolved
Hide resolved
nitrocode
reviewed
Jan 8, 2023
nitrocode
approved these changes
Jan 8, 2023
chenrui333
previously approved these changes
Jan 8, 2023
chenrui333
reviewed
Jan 8, 2023
Comment on lines
-7
to
-8
| <details><summary>Show Output</summary> | ||
|
|
There was a problem hiding this comment.
actually, this should not be removed?
There was a problem hiding this comment.
This should be removed. Same with #2947 (comment).
Terraform logs are trimmed spaces, so output log contains less than 12lines. So become unwrapped.
chenrui333
reviewed
Jan 8, 2023
Comment on lines
-32
to
-33
| </details> | ||
| Plan: 1 to add, 0 to change, 0 to destroy. |
|
yeah, just one question about |
nitrocode
approved these changes
Jan 8, 2023
nitrocode
changed the title
|
@krrrr38 ah, small merge conflict. |
nitrocode
approved these changes
Jan 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what
renderTemplateTrimSpace.why
some messages contain needless break lines.
tests
references