fix conflict - Removes carriage return characters from CF stacks duri…

…ng normalize
hashicorp · Nov 14, 2021 · 9b5c68c · 9b5c68c
1 parent 1338345
commit 9b5c68c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/internal/verify/verify.go b/internal/verify/verify.go
@@ -18,11 +18,14 @@ func SliceContainsString(slice []interface{}, s string) (int, bool) {
 }
 
 func NormalizeJSONOrYAMLString(templateString interface{}) (string, error) {
+ var cleanedTemplateString interface{} = strings.ReplaceAll(templateString.(string), "\r", "")
  if looksLikeJsonString(templateString) {
  return structure.NormalizeJsonString(templateString.(string))
  }
-
- return checkYAMLString(templateString)
+ if looksLikeJsonString(cleanedTemplateString) {
+ return structure.NormalizeJsonString(cleanedTemplateString)
+ }
+ return checkYAMLString(cleanedTemplateString)
 }
 
 func PointersMapToStringList(pointers map[string]*string) map[string]interface{} {

diff --git a/internal/verify/verify_test.go b/internal/verify/verify_test.go
@@ -26,6 +26,18 @@ func TestNormalizeJSONOrYAMLString(t *testing.T) {
  if actual != validNormalizedYaml {
  t.Fatalf("Got:\n\n%s\n\nExpected:\n\n%s\n", actual, validNormalizedYaml)
  }
+
+
+ validNormalizedYamlWithCarriageReturn := "abc: 1\r\n"
+ expectedNormalizedYaml := `abc: 1
+`
+ actual, err = normalizeJsonOrYamlString(validNormalizedYamlWithCarriageReturn)
+ if err != nil {
+ t.Fatalf("Expected not to throw an error while parsing template, but got: %s", err)
+ }
+ if actual != expectedNormalizedYaml {
+ t.Fatalf("Got:\n\n%s\n\nExpected:\n\n%s\n", actual, expectedNormalizedYaml)
+ }
 }
 
 func TestCheckYAMLString(t *testing.T) {