Bug/newline parser failure (#24)

* no newline failure bug reproduce

#23

* trim down no newline testfile

* clean newline issue test reproduction

* adds newline in case file doesnt have one on concat

.gitignore

@@ -1,3 +1,4 @@
 vendor
 build/clarity*
 cmd/clarity/build
+.DS_Store

pkg/matchers/terraform.go

@@ -232,6 +232,7 @@ func (m *Match) ReadTerraform(tpath string, unmarshal Unmarshaller) error {
 			}
 
 			dirContents += string(contents)
+			dirContents += "\n"
 		}
 	}
 

pkg/matchers/terraform_test.go

@@ -27,15 +27,18 @@ func TestMatchers(t *testing.T) {
 				m := &matchers.Match{}
 				controlHCL := multiTFControl()
 				t.Run("should read all the terraform files into the matcher", func(t *testing.T) {
-					err := m.ReadTerraform("testdata/multitf", unmarshal)
-					Expect(err).NotTo(HaveOccurred())
-					sort.SliceStable(controlHCL, func(i, j int) bool { return controlHCL[i].InstanceName < controlHCL[j].InstanceName })
-					sort.SliceStable(m.HCLEntries, func(i, j int) bool { return m.HCLEntries[i].InstanceName < m.HCLEntries[j].InstanceName })
-					Expect(len(m.HCLEntries)).To(Equal(len(controlHCL)))
-					attributesMatch(m.HCLEntries, controlHCL)
-					Expect(m.HCLEntries[0].HCLType).To(BeEquivalentTo(controlHCL[0].HCLType))
-					Expect(m.HCLEntries[0].ComponentName).To(BeEquivalentTo(controlHCL[0].ComponentName))
-					Expect(m.HCLEntries[0].InstanceName).To(BeEquivalentTo(controlHCL[0].InstanceName))
+					for _, dirname := range []string{"testdata/multitf", "testdata/multitf_newline"} {
+						unmarshal := tt.unmarshal
+						err := m.ReadTerraform(dirname, unmarshal)
+						Expect(err).NotTo(HaveOccurred())
+						sort.SliceStable(controlHCL, func(i, j int) bool { return controlHCL[i].InstanceName < controlHCL[j].InstanceName })
+						sort.SliceStable(m.HCLEntries, func(i, j int) bool { return m.HCLEntries[i].InstanceName < m.HCLEntries[j].InstanceName })
+						Expect(len(m.HCLEntries)).To(Equal(len(controlHCL)))
+						attributesMatch(m.HCLEntries, controlHCL)
+						Expect(m.HCLEntries[0].HCLType).To(BeEquivalentTo(controlHCL[0].HCLType))
+						Expect(m.HCLEntries[0].ComponentName).To(BeEquivalentTo(controlHCL[0].ComponentName))
+						Expect(m.HCLEntries[0].InstanceName).To(BeEquivalentTo(controlHCL[0].InstanceName))
+					}
 				})
 			})
 

pkg/matchers/testdata/multitf_newline/1.tf

@@ -0,0 +1,3 @@
+resource "aws" "blah" {
+
+}

pkg/matchers/testdata/multitf_newline/2.tf

@@ -0,0 +1,3 @@
+resource "aws" "bar" {
+
+}