Add trailing new lines in generated files (elastic#1006)

graphaelli · simitt · commit f0820652bdfd · 2018-07-04T11:09:22.000+02:00
* add trailing newline to approvals

* add trailing newline to elasticsearch docs
diff --git a/docs/data/elasticsearch/error.json b/docs/data/elasticsearch/error.json
@@ -250,4 +250,4 @@
     "transaction": {
         "id": "945254c5-67a5-417e-8a4e-aa29efcbfb79"
     }
-}
+}
diff --git a/docs/data/elasticsearch/sourcemap.json b/docs/data/elasticsearch/sourcemap.json
@@ -11,4 +11,4 @@
         },
         "sourcemap": "{\"file\":\"bundle.js\",\"mappings\":\"CAAS,SAAUA,GCInB,QAAAC,GAAAC,GAGA,GAAAC,EAAAD,GACA,MAAAC,GAAAD,GAAAE,OAGA,IAAAC,GAAAF,EAAAD,IACAE,WACAE,GAAAJ,EACAK,QAAA,EAUA,OANAP,GAAAE,GAAAM,KAAAH,EAAAD,QAAAC,IAAAD,QAAAH,GAGAI,EAAAE,QAAA,EAGAF,EAAAD,QAvBA,GAAAD,KAqCA,OATAF,GAAAQ,EAAAT,EAGAC,EAAAS,EAAAP,EAGAF,EAAAU,EAAA,GAGAV,EAAA,KDMM,SAASI,EAAQD,EAASH,GE3ChCA,EAAA,GAEAA,EAAA,GAEAW,OFmDM,SAASP,EAAQD,EAASH,GGxDhCI,EAAAD,QAAAH,EAAAU,EAAA,cH8DM,SAASN,EAAQD,GI9DvB,QAAAQ,KACAC,QAAAC,IAAAC,QAGAH\",\"names\":[\"modules\",\"__webpack_require__\",\"moduleId\",\"installedModules\",\"exports\",\"module\",\"id\",\"loaded\",\"call\",\"m\",\"c\",\"p\",\"foo\",\"console\",\"log\",\"foobar\"],\"sourceRoot\":\"\",\"sources\":[\"webpack:///bundle.js\",\"webpack:///webpack/bootstrap 6002740481c9666b0d38\",\"webpack:///./scripts/index.js\",\"webpack:///./index.html\",\"webpack:///./scripts/app.js\"],\"sourcesContent\":[\"/******/ (function(modules) { // webpackBootstrap\\n/******/ \\t// The module cache\\n/******/ \\tvar installedModules = {};\\n/******/\\n/******/ \\t// The require function\\n/******/ \\tfunction __webpack_require__(moduleId) {\\n/******/\\n/******/ \\t\\t// Check if module is in cache\\n/******/ \\t\\tif(installedModules[moduleId])\\n/******/ \\t\\t\\treturn installedModules[moduleId].exports;\\n/******/\\n/******/ \\t\\t// Create a new module (and put it into the cache)\\n/******/ \\t\\tvar module = installedModules[moduleId] = {\\n/******/ \\t\\t\\texports: {},\\n/******/ \\t\\t\\tid: moduleId,\\n/******/ \\t\\t\\tloaded: false\\n/******/ \\t\\t};\\n/******/\\n/******/ \\t\\t// Execute the module function\\n/******/ \\t\\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\\n/******/\\n/******/ \\t\\t// Flag the module as loaded\\n/******/ \\t\\tmodule.loaded = true;\\n/******/\\n/******/ \\t\\t// Return the exports of the module\\n/******/ \\t\\treturn module.exports;\\n/******/ \\t}\\n/******/\\n/******/\\n/******/ \\t// expose the modules object (__webpack_modules__)\\n/******/ \\t__webpack_require__.m = modules;\\n/******/\\n/******/ \\t// expose the module cache\\n/******/ \\t__webpack_require__.c = installedModules;\\n/******/\\n/******/ \\t// __webpack_public_path__\\n/******/ \\t__webpack_require__.p = \\\"\\\";\\n/******/\\n/******/ \\t// Load entry module and return exports\\n/******/ \\treturn __webpack_require__(0);\\n/******/ })\\n/************************************************************************/\\n/******/ ([\\n/* 0 */\\n/***/ function(module, exports, __webpack_require__) {\\n\\n\\t// Webpack\\n\\t__webpack_require__(1)\\n\\t\\n\\t__webpack_require__(2)\\n\\t\\n\\tfoo()\\n\\n\\n/***/ },\\n/* 1 */\\n/***/ function(module, exports, __webpack_require__) {\\n\\n\\tmodule.exports = __webpack_require__.p + \\\"index.html\\\"\\n\\n/***/ },\\n/* 2 */\\n/***/ function(module, exports) {\\n\\n\\tfunction foo() {\\n\\t    console.log(foobar)\\n\\t}\\n\\t\\n\\tfoo()\\n\\n\\n/***/ }\\n/******/ ]);\\n\\n\\n/** WEBPACK FOOTER **\\n ** bundle.js\\n **/\",\" \\t// The module cache\\n \\tvar installedModules = {};\\n\\n \\t// The require function\\n \\tfunction __webpack_require__(moduleId) {\\n\\n \\t\\t// Check if module is in cache\\n \\t\\tif(installedModules[moduleId])\\n \\t\\t\\treturn installedModules[moduleId].exports;\\n\\n \\t\\t// Create a new module (and put it into the cache)\\n \\t\\tvar module = installedModules[moduleId] = {\\n \\t\\t\\texports: {},\\n \\t\\t\\tid: moduleId,\\n \\t\\t\\tloaded: false\\n \\t\\t};\\n\\n \\t\\t// Execute the module function\\n \\t\\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\\n\\n \\t\\t// Flag the module as loaded\\n \\t\\tmodule.loaded = true;\\n\\n \\t\\t// Return the exports of the module\\n \\t\\treturn module.exports;\\n \\t}\\n\\n\\n \\t// expose the modules object (__webpack_modules__)\\n \\t__webpack_require__.m = modules;\\n\\n \\t// expose the module cache\\n \\t__webpack_require__.c = installedModules;\\n\\n \\t// __webpack_public_path__\\n \\t__webpack_require__.p = \\\"\\\";\\n\\n \\t// Load entry module and return exports\\n \\treturn __webpack_require__(0);\\n\\n\\n\\n/** WEBPACK FOOTER **\\n ** webpack/bootstrap 6002740481c9666b0d38\\n **/\",\"// Webpack\\nrequire('../index.html')\\n\\nrequire('./app')\\n\\nfoo()\\n\\n\\n\\n/*****************\\n ** WEBPACK FOOTER\\n ** ./scripts/index.js\\n ** module id = 0\\n ** module chunks = 0\\n **/\",\"module.exports = __webpack_public_path__ + \\\"index.html\\\"\\n\\n\\n/*****************\\n ** WEBPACK FOOTER\\n ** ./index.html\\n ** module id = 1\\n ** module chunks = 0\\n **/\",\"function foo() {\\n    console.log(foobar)\\n}\\n\\nfoo()\\n\\n\\n\\n/*****************\\n ** WEBPACK FOOTER\\n ** ./scripts/app.js\\n ** module id = 2\\n ** module chunks = 0\\n **/\"],\"version\":3}"
     }
-}
+}
diff --git a/docs/data/elasticsearch/span.json b/docs/data/elasticsearch/span.json
@@ -68,4 +68,4 @@
     "transaction": {
         "id": "945254c5-67a5-417e-8a4e-aa29efcbfb79"
     }
-}
+}
diff --git a/docs/data/elasticsearch/transaction.json b/docs/data/elasticsearch/transaction.json
@@ -131,4 +131,4 @@
         },
         "type": "request"
     }
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorAugmentedIP.approved.json b/processor/error/package_tests/TestProcessErrorAugmentedIP.approved.json
@@ -35,4 +35,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorAugmentedUserAgentAndIP.approved.json b/processor/error/package_tests/TestProcessErrorAugmentedUserAgentAndIP.approved.json
@@ -28,4 +28,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorFrontend.approved.json b/processor/error/package_tests/TestProcessErrorFrontend.approved.json
@@ -275,4 +275,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorFrontendMinifiedSmap.approved.json b/processor/error/package_tests/TestProcessErrorFrontendMinifiedSmap.approved.json
@@ -316,4 +316,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorFrontendNoSmap.approved.json b/processor/error/package_tests/TestProcessErrorFrontendNoSmap.approved.json
@@ -103,4 +103,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorFull.approved.json b/processor/error/package_tests/TestProcessErrorFull.approved.json
@@ -410,4 +410,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorMinimalPayloadException.approved.json b/processor/error/package_tests/TestProcessErrorMinimalPayloadException.approved.json
@@ -23,4 +23,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorMinimalPayloadLog.approved.json b/processor/error/package_tests/TestProcessErrorMinimalPayloadLog.approved.json
@@ -23,4 +23,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorMinimalProcess.approved.json b/processor/error/package_tests/TestProcessErrorMinimalProcess.approved.json
@@ -29,4 +29,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorMinimalService.approved.json b/processor/error/package_tests/TestProcessErrorMinimalService.approved.json
@@ -26,4 +26,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorNullValues.approved.json b/processor/error/package_tests/TestProcessErrorNullValues.approved.json
@@ -123,4 +123,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/error/package_tests/TestProcessErrorUserAgentAndIP.approved.json b/processor/error/package_tests/TestProcessErrorUserAgentAndIP.approved.json
@@ -28,4 +28,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/sourcemap/package_tests/TestProcessSourcemapFull.approved.json b/processor/sourcemap/package_tests/TestProcessSourcemapFull.approved.json
@@ -16,4 +16,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/sourcemap/package_tests/TestProcessSourcemapMinimalPayload.approved.json b/processor/sourcemap/package_tests/TestProcessSourcemapMinimalPayload.approved.json
@@ -16,4 +16,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessProcessNull.approved.json b/processor/transaction/package_tests/TestProcessProcessNull.approved.json
@@ -25,4 +25,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessSystemNull.approved.json b/processor/transaction/package_tests/TestProcessSystemNull.approved.json
@@ -25,4 +25,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionAugmented.approved.json b/processor/transaction/package_tests/TestProcessTransactionAugmented.approved.json
@@ -29,4 +29,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionAugmentedIP.approved.json b/processor/transaction/package_tests/TestProcessTransactionAugmentedIP.approved.json
@@ -28,4 +28,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionAugmentedMerge.approved.json b/processor/transaction/package_tests/TestProcessTransactionAugmentedMerge.approved.json
@@ -33,4 +33,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionEmpty.approved.json b/processor/transaction/package_tests/TestProcessTransactionEmpty.approved.json
@@ -26,4 +26,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionFrontend.approved.json b/processor/transaction/package_tests/TestProcessTransactionFrontend.approved.json
@@ -103,4 +103,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionFull.approved.json b/processor/transaction/package_tests/TestProcessTransactionFull.approved.json
@@ -504,4 +504,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionIP.approved.json b/processor/transaction/package_tests/TestProcessTransactionIP.approved.json
@@ -28,4 +28,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionMinimalPayload.approved.json b/processor/transaction/package_tests/TestProcessTransactionMinimalPayload.approved.json
@@ -25,4 +25,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionMinimalProcess.approved.json b/processor/transaction/package_tests/TestProcessTransactionMinimalProcess.approved.json
@@ -31,4 +31,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionMinimalService.approved.json b/processor/transaction/package_tests/TestProcessTransactionMinimalService.approved.json
@@ -28,4 +28,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionMinimalSpan.approved.json b/processor/transaction/package_tests/TestProcessTransactionMinimalSpan.approved.json
@@ -55,4 +55,4 @@
             }
         }
     ]
-}
+}
diff --git a/processor/transaction/package_tests/TestProcessTransactionNullValues.approved.json b/processor/transaction/package_tests/TestProcessTransactionNullValues.approved.json
@@ -225,4 +225,4 @@
             }
         }
     ]
-}
+}
diff --git a/script/output_data/output_data.go b/script/output_data/output_data.go
@@ -90,6 +90,9 @@ func generate() error {
 				if err != nil {
 					return err
 				}
+				if len(output) > 0 && output[len(output)-1] != '\n' {
+					output = append(output, '\n')
+				}
 				err = ioutil.WriteFile(file, output, 0644)
 				if err != nil {
 					return err
diff --git a/tests/approvals.go b/tests/approvals.go
@@ -52,6 +52,9 @@ func ApproveJson(received map[string]interface{}, name string, ignored map[strin
 	}
 	if len(diff.Deltas()) > 0 {
 		r, _ := json.MarshalIndent(received, "", "    ")
+		if len(r) > 0 && r[len(r)-1] != '\n' {
+			r = append(r, '\n')
+		}
 		ioutil.WriteFile(receivedPath, r, 0644)
 		return errors.New(fmt.Sprintf("Received data differ from approved data. Run 'make update' and then 'approvals' to verify the Diff."))
 	}

Original file line number	Diff line number	Diff line change
`@@ -250,4 +250,4 @@`
`250`	`250`	`"transaction": {`
`251`	`251`	`"id": "945254c5-67a5-417e-8a4e-aa29efcbfb79"`
`252`	`252`	`}`
`253`		`-}`
	`253`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@`
`11`	`11`	`},`
`12`	`12`	"sourcemap": "{\"file\":\"bundle.js\",\"mappings\":\"CAAS,SAAUA,GCInB,QAAAC,GAAAC,GAGA,GAAAC,EAAAD,GACA,MAAAC,GAAAD,GAAAE,OAGA,IAAAC,GAAAF,EAAAD,IACAE,WACAE,GAAAJ,EACAK,QAAA,EAUA,OANAP,GAAAE,GAAAM,KAAAH,EAAAD,QAAAC,IAAAD,QAAAH,GAGAI,EAAAE,QAAA,EAGAF,EAAAD,QAvBA,GAAAD,KAqCA,OATAF,GAAAQ,EAAAT,EAGAC,EAAAS,EAAAP,EAGAF,EAAAU,EAAA,GAGAV,EAAA,KDMM,SAASI,EAAQD,EAASH,GE3ChCA,EAAA,GAEAA,EAAA,GAEAW,OFmDM,SAASP,EAAQD,EAASH,GGxDhCI,EAAAD,QAAAH,EAAAU,EAAA,cH8DM,SAASN,EAAQD,GI9DvB,QAAAQ,KACAC,QAAAC,IAAAC,QAGAH\",\"names\":[\"modules\",\"__webpack_require__\",\"moduleId\",\"installedModules\",\"exports\",\"module\",\"id\",\"loaded\",\"call\",\"m\",\"c\",\"p\",\"foo\",\"console\",\"log\",\"foobar\"],\"sourceRoot\":\"\",\"sources\":[\"webpack:///bundle.js\",\"webpack:///webpack/bootstrap 6002740481c9666b0d38\",\"webpack:///./scripts/index.js\",\"webpack:///./index.html\",\"webpack:///./scripts/app.js\"],\"sourcesContent\":[\"/****/ (function(modules) { // webpackBootstrap\\n/**/ \\t// The module cache\\n/**/ \\tvar installedModules = {};\\n/**/\\n/**/ \\t// The require function\\n/**/ \\tfunction __webpack_require__(moduleId) {\\n/**/\\n/**/ \\t\\t// Check if module is in cache\\n/**/ \\t\\tif(installedModules[moduleId])\\n/**/ \\t\\t\\treturn installedModules[moduleId].exports;\\n/**/\\n/**/ \\t\\t// Create a new module (and put it into the cache)\\n/**/ \\t\\tvar module = installedModules[moduleId] = {\\n/**/ \\t\\t\\texports: {},\\n/**/ \\t\\t\\tid: moduleId,\\n/**/ \\t\\t\\tloaded: false\\n/**/ \\t\\t};\\n/**/\\n/**/ \\t\\t// Execute the module function\\n/**/ \\t\\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\\n/**/\\n/**/ \\t\\t// Flag the module as loaded\\n/**/ \\t\\tmodule.loaded = true;\\n/**/\\n/**/ \\t\\t// Return the exports of the module\\n/**/ \\t\\treturn module.exports;\\n/**/ \\t}\\n/**/\\n/**/\\n/**/ \\t// expose the modules object (__webpack_modules__)\\n/**/ \\t__webpack_require__.m = modules;\\n/**/\\n/**/ \\t// expose the module cache\\n/**/ \\t__webpack_require__.c = installedModules;\\n/**/\\n/**/ \\t// __webpack_public_path__\\n/**/ \\t__webpack_require__.p = \\\"\\\";\\n/**/\\n/**/ \\t// Load entry module and return exports\\n/**/ \\treturn __webpack_require__(0);\\n/**/ })\\n/********************************************************************/\\n/***/ ([\\n/ 0 /\\n// function(module, exports, __webpack_require__) {\\n\\n\\t// Webpack\\n\\t__webpack_require__(1)\\n\\t\\n\\t__webpack_require__(2)\\n\\t\\n\\tfoo()\\n\\n\\n// },\\n/ 1 /\\n// function(module, exports, __webpack_require__) {\\n\\n\\tmodule.exports = __webpack_require__.p + \\\"index.html\\\"\\n\\n// },\\n/ 2 /\\n// function(module, exports) {\\n\\n\\tfunction foo() {\\n\\t console.log(foobar)\\n\\t}\\n\\t\\n\\tfoo()\\n\\n\\n// }\\n/***/ ]);\\n\\n\\n/ WEBPACK FOOTER \\n bundle.js\\n /\",\" \\t// The module cache\\n \\tvar installedModules = {};\\n\\n \\t// The require function\\n \\tfunction __webpack_require__(moduleId) {\\n\\n \\t\\t// Check if module is in cache\\n \\t\\tif(installedModules[moduleId])\\n \\t\\t\\treturn installedModules[moduleId].exports;\\n\\n \\t\\t// Create a new module (and put it into the cache)\\n \\t\\tvar module = installedModules[moduleId] = {\\n \\t\\t\\texports: {},\\n \\t\\t\\tid: moduleId,\\n \\t\\t\\tloaded: false\\n \\t\\t};\\n\\n \\t\\t// Execute the module function\\n \\t\\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\\n\\n \\t\\t// Flag the module as loaded\\n \\t\\tmodule.loaded = true;\\n\\n \\t\\t// Return the exports of the module\\n \\t\\treturn module.exports;\\n \\t}\\n\\n\\n \\t// expose the modules object (__webpack_modules__)\\n \\t__webpack_require__.m = modules;\\n\\n \\t// expose the module cache\\n \\t__webpack_require__.c = installedModules;\\n\\n \\t// __webpack_public_path__\\n \\t__webpack_require__.p = \\\"\\\";\\n\\n \\t// Load entry module and return exports\\n \\treturn __webpack_require__(0);\\n\\n\\n\\n/ WEBPACK FOOTER \\n webpack/bootstrap 6002740481c9666b0d38\\n /\",\"// Webpack\\nrequire('../index.html')\\n\\nrequire('./app')\\n\\nfoo()\\n\\n\\n\\n/*************\\n WEBPACK FOOTER\\n ./scripts/index.js\\n module id = 0\\n module chunks = 0\\n /\",\"module.exports = __webpack_public_path__ + \\\"index.html\\\"\\n\\n\\n/***************\\n WEBPACK FOOTER\\n ./index.html\\n module id = 1\\n module chunks = 0\\n /\",\"function foo() {\\n console.log(foobar)\\n}\\n\\nfoo()\\n\\n\\n\\n/***************\\n WEBPACK FOOTER\\n ./scripts/app.js\\n module id = 2\\n module chunks = 0\\n /\"],\"version\":3}"
`13`	`13`	`}`
`14`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@`
`68`	`68`	`"transaction": {`
`69`	`69`	`"id": "945254c5-67a5-417e-8a4e-aa29efcbfb79"`
`70`	`70`	`}`
`71`		`-}`
	`71`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -131,4 +131,4 @@`
`131`	`131`	`},`
`132`	`132`	`"type": "request"`
`133`	`133`	`}`
`134`		`-}`
	`134`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`]`
`38`		`-}`
	`38`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`]`
`31`		`-}`
	`31`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -275,4 +275,4 @@`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`	`]`
`278`		`-}`
	`278`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -316,4 +316,4 @@`
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`	`]`
`319`		`-}`
	`319`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -103,4 +103,4 @@`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`]`
`106`		`-}`
	`106`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -410,4 +410,4 @@`
`410`	`410`	`}`
`411`	`411`	`}`
`412`	`412`	`]`
`413`		`-}`
	`413`	`+}`