add options to html format output

bojand · Aug 10, 2018 · b5d9c80 · b5d9c80
1 parent 702c3b9
commit b5d9c80
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 71 deletions.
diff --git a/printer/printer.go b/printer/printer.go
@@ -85,9 +85,19 @@ var tmplFuncMap = template.FuncMap{
 	"formatPercent": formatPercent,
 }
 
-func jsonify(v interface{}) string {
+func jsonify(v interface{}, pretty bool) string {
 	d, _ := json.Marshal(v)
-	return string(d)
+	if !pretty {
+		return string(d)
+	}
+
+	var out bytes.Buffer
+	err := json.Indent(&out, d, "", "  ")
+	if err != nil {
+		return string(d)
+	}
+
+	return string(out.Bytes())
 }
 
 func formatMilli(duration float64) string {
@@ -172,7 +182,7 @@ duration (ms),status,error{{ range $i, $v := .Details }}
 		<section class="section">
 		
 		<div class="container">
-        <nav class="breadcrumb has-bullet-separator" aria-label="breadcrumbs">
+      <nav class="breadcrumb has-bullet-separator" aria-label="breadcrumbs">
         <ul>
           <li>
             <a href="#summary">
@@ -239,34 +249,46 @@ duration (ms),status,error{{ range $i, $v := .Details }}
 						<table class="table">
 							<tbody>
 								<tr>
-							<th>Count</th>
-							<td>{{ .Count }}</td>
-							</tr>
-							<tr>
-								<th>Total</th>
-								<td>{{ formatMilli .Total.Seconds }} ms</td>
-							</tr>
-							<tr>
-								<th>Slowest</th>
-							<td>{{ formatMilli .Slowest.Seconds }} ms</td>
-							</tr>
-							<tr>
-								<th>Fastest</th>
-								<td>{{ formatMilli .Fastest.Seconds }} ms</td>
-							</tr>
-							<tr>
-								<th>Average</th>
-								<td>{{ formatMilli .Average.Seconds }} ms</td>
-							</tr>
-							<tr>
-								<th>Requests / sec</th>
-								<td>{{ formatSeconds .Rps }}</td>
-							</tr>
-						</tbody>
-					</table>
+								<th>Count</th>
+								<td>{{ .Count }}</td>
+								</tr>
+								<tr>
+									<th>Total</th>
+									<td>{{ formatMilli .Total.Seconds }} ms</td>
+								</tr>
+								<tr>
+									<th>Slowest</th>
+								<td>{{ formatMilli .Slowest.Seconds }} ms</td>
+								</tr>
+								<tr>
+									<th>Fastest</th>
+									<td>{{ formatMilli .Fastest.Seconds }} ms</td>
+								</tr>
+								<tr>
+									<th>Average</th>
+									<td>{{ formatMilli .Average.Seconds }} ms</td>
+								</tr>
+								<tr>
+									<th>Requests / sec</th>
+									<td>{{ formatSeconds .Rps }}</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
 				</div>
-		  </div>
-		</div>
+				<div class="column">
+					<div class="content">
+						<span class="title is-5">
+							<strong>Options</strong>
+						</span>
+						<article class="message">
+  						<div class="message-body">
+								<pre style="background-color: transparent;">{{ jsonify .Options true }}</pre>
+							</div>
+						</article>
+					</div>
+				</div>
+			</div>
 	  </div>
 
 	  <br />
@@ -406,7 +428,7 @@ duration (ms),status,error{{ range $i, $v := .Details }}
 
 	const count = {{ .Count }};
 
-	const rawData = {{ jsonify .Details }};
+	const rawData = {{ jsonify .Details false }};
 
 	const data = [
 		{{ range .Histogram }}

diff --git a/testdata/localhost.crt b/testdata/localhost.crt
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC5TCCAc2gAwIBAgIJAPMeFjozN41RMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
-BAMMCWxvY2FsaG9zdDAeFw0xODA3MTAyMzMyNTNaFw0xODA4MDkyMzMyNTNaMBQx
+MIIC5TCCAc2gAwIBAgIJALm/8UVJ0qNPMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAeFw0xODA4MTAwMDIzMTJaFw0xODA5MDkwMDIzMTJaMBQx
 EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALVtHZE+p5r4QlS9jib5AHHlt3Yyr+ASKhkNUX+tNHZSjy1kkrQmuyFMA71m
-Hn0D0ASBG7kEqfPnmLY+VSurte43LZOgEWH0tUm4cCSfwKaaHG3yr5RPwc/rhI3U
-TIgSZWpitafzYbaqU1dEsBbHiYPOnrZmRYmXefsPE3Bob4/c9lf+V1UjGE/v1AWa
-HCaJPId1xn22rRSQeoZS6zNx1ICi2b2Q2S1Geb/a24E06OgaoJExMSfNJP04oECt
-uVu1pnNdpfBA8exRB2JCyxVnRZnK+wmaADmsrvpP7b7731dmdNy7ztb3wXbXewpa
-TY13ZEfSuLFrd8lsB0kXfJYip3cCAwEAAaM6MDgwFAYDVR0RBA0wC4IJbG9jYWxo
+ggEBAMFAuK206WpE2+iaIzeqaYBHegkNGDzqO3GZmoSN+++QiKpJcRXWW0VdIEmP
+GNTJSNQoFLtZxqBWptT+/JsWemUIuxqhdPBIowVdJPtiwyDcpZH1sq86RmY+ZdeT
+eDyrTwaBp/0gJvCWSO/j1P2s9ryvCVZYml1hbgYSBQPg6XsYmx2n9JJqpwOwypBA
+IcrnDiTazF2D5+22fsUGljQPNKbbVFSXd0PeVEe9UM2f9tH4x6w0Ir0JWWQuExu7
+Pz66T1vAURhBf+AUMQiONmk6xkXTiakSiiq09IX2/rnrjFqibcJLrDuRCQaFCRL0
+XQWX4ygfv0tgj4UcyzQPQjzhVWECAwEAAaM6MDgwFAYDVR0RBA0wC4IJbG9jYWxo
 b3N0MAsGA1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
-AQsFAAOCAQEASY0u4HrIvk56+fz0zfl4921ZrASDmW4a9vyJYfBYSYJetk6HO9bV
-B47JzzV32VipO5u5KXesU5BJ+RsJMakIE7viimhKD17HJGHFAtws520z/gDixHNP
-bJiNc71On9GvMOJANKqvYvTRvquJT6XA4TAHpbHyB1kZjQRk+NwSWuzd1/Cbanl/
-+D5z0dBboVQ893gAjQZmZdsjenSjlfV6iXdkrbFpp0SxKnRzSr8z09HOJ4n95QbG
-WYk/pHffr28KBAznaO/rTKH/9EmZ62RXXrtSrLcOEQxG3rXpufIvR0sJudQH97gU
-GRgmIuMq+utwhFHP1+rZj7Kwh+u+anN4Lg==
+AQsFAAOCAQEAjZGsozXEfdb1eITASm04p7/jDTIn06gCvYZXxVIkdNdb1qZ63LeI
+6cQeRM6l848VvtJg9X0rD4a9XbknjMfmu8rbohyjvodYVJNf3IX4EmdnYudN47lO
+YRpnx+cUrYTh4POph/6t1FR3QlwA+oN1o0LqjNQnM20qoEJ98BWkO1spu7qUvBjz
+Gp/vn0qAzsY2k8AYzds1dgGOeRvpDCpRrCcRbL2nqrr4SUv7rP+wIh+FZMDhr9nW
+3Mu4ZjdkizG+LxHtqhczRb01ZhWCkkNJ01QOWM5dsVj5ZIHwRk5PV6Unh9FtIRvr
+E2Dllysnw674/peAs93AqBJ4MAEAtmXQXQ==
 -----END CERTIFICATE-----
diff --git a/testdata/localhost.key b/testdata/localhost.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC1bR2RPqea+EJU
-vY4m+QBx5bd2Mq/gEioZDVF/rTR2Uo8tZJK0JrshTAO9Zh59A9AEgRu5BKnz55i2
-PlUrq7XuNy2ToBFh9LVJuHAkn8Cmmhxt8q+UT8HP64SN1EyIEmVqYrWn82G2qlNX
-RLAWx4mDzp62ZkWJl3n7DxNwaG+P3PZX/ldVIxhP79QFmhwmiTyHdcZ9tq0UkHqG
-UuszcdSAotm9kNktRnm/2tuBNOjoGqCRMTEnzST9OKBArblbtaZzXaXwQPHsUQdi
-QssVZ0WZyvsJmgA5rK76T+2++99XZnTcu87W98F213sKWk2Nd2RH0rixa3fJbAdJ
-F3yWIqd3AgMBAAECggEBAIS+LIcMD7fcczPraWnsgD3VtRE/bt2EjNa9nubLBPqZ
-13aAArLbL8niA059vEr+EiJpkK4j0nHJ/ztAijKktT1xk+BSmsVQNaCV2T+Cv4Nm
-eOydR4g9fvIxQVBAiCp7Q0a+qGkVM2ZiYw4UDL7uChitggS0+aX9dduSoUd6sj3Q
-Uk6CT4BUIjB1+yAhLY53NgGqX/iAkbt84+JWug3ELZ3lrcSOe4NdBEsN1PNrbKiV
-BzQ4dQBJF9O8pz10HYV/gKoLHxmbII067ERyfDmliTJONy/xUx1zxF37gMg32yTz
-BsILDmwGB3unTAjB8W6nNkEnLMmlkZs84R/Ztrr9S2ECgYEA7q3qvSSwY+fCef2q
-geM2LCP2aCuOHnBLCbiXu1tdQH6tg3fDDVvhpON3aIaAHTCKJzB96xdC1tWaqG9f
-zxvEHx+n7VZQvmdOoS2t3aDPbIgxszdnPd7K5KqHx5JdM5R8X6/ge0TwN+QRoHxO
-an9jH/7CLcd49SBNSDADKdJWp3ECgYEAwpeTC1oehR+d6VWDHsSlparDTnBPGhng
-QLB18jSGiE38g50bkNt0Y/ou/X+ASdXIlfyonGegQJ8xTBb33rhWl0a/mNpgTd6x
-bFqMEoAkaIMT5ismfYiwe3QtUKKXxBX+4PufnBN14yjpS1Ng8CXZbbJHcRB9zaD8
-jhLHzgR/WWcCgYBP+tWDRi0ZfUsM5/TgC4xWpEJoy9eW2Zg7jLDDpq0L9KceO96P
-tm9ZeqPD0fZSUbapxTUctzG9ndxyfsfDNhG1QD1caaUq+KE/n3f4oW+Ade75mCIv
-eF3S3FYdiS1UIHjA88WsaQB6KiHB/oWkaEWGLi9RedtNgOKEwxn8RLCm8QKBgQC/
-q59aGi1fwRHA6MrbfqUO9pGj7Hnt4rkB3w5+QQCWuAJW/WROnesaIy8v4OvTTnFi
-U1kdnfC6VlOveBw00+vu2/ATNl6PtR+b8+BuxKuYCiyKlcw28HGtWHTeLRlCOsww
-fYjsqjp/QyfwWzNruExfgbBfDPhtl/nMU3FdWw65VwKBgQCkG6RiRVOOlxXgIIhb
-emDTh6K8Y6OJ7RNNA0rdPM4iUmkJrPSIsIhYEYUfNthiw8Wj17ISQ1mtKvNzTOZZ
-MO6WJ1zczNjVBwSiBnHiYzkMa/BeTpu97kKc5WJw4L4Z5QMm+t4y2gj3Zyqwgm4i
-wzX6PLku248uTLUqwkXQvRAxxg==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDBQLittOlqRNvo
+miM3qmmAR3oJDRg86jtxmZqEjfvvkIiqSXEV1ltFXSBJjxjUyUjUKBS7WcagVqbU
+/vybFnplCLsaoXTwSKMFXST7YsMg3KWR9bKvOkZmPmXXk3g8q08Ggaf9ICbwlkjv
+49T9rPa8rwlWWJpdYW4GEgUD4Ol7GJsdp/SSaqcDsMqQQCHK5w4k2sxdg+fttn7F
+BpY0DzSm21RUl3dD3lRHvVDNn/bR+MesNCK9CVlkLhMbuz8+uk9bwFEYQX/gFDEI
+jjZpOsZF04mpEooqtPSF9v6564xaom3CS6w7kQkGhQkS9F0Fl+MoH79LYI+FHMs0
+D0I84VVhAgMBAAECggEBALcaaqDza8Frsu0Ftl6U0Vdg4ejXhmKZEG+HOVdk7BNF
+X6fw4/vr2Ri0rtXjhoR+nsmdnF8TJdZfo7zmSFNtjdRS3GzUE+di+0smwNaK8hUd
+2qacJIxQa8mOT5JdQKxDKCIjERcNsrd7vWnF9dXRXwrR0cgFNWVK3iNUSXouTSp6
+M1E19DSRzGh2mjFQ9kmnBfkFFpItH1kP9mrQ4uWk3KCYJq3KinI++A9yACKIC6fI
+X27W8xdgEDVsXNM1XNsP3jzOK9x3d89G0hvypCkw0xENcRD8Hf3JT72dpNalnwR3
+CI8zh98w6fX9G9fA1a7g2VSEiDztrrYu3k1Mg4iOU30CgYEA9bXBg+lQAXjHaiAO
+RGuFOSl12m8mQvwyNq39oKzlLMGWtxKbQXqCcZEERo1N8zWFoeBTUrpnHaU0YLxF
+87Oh/CbelTa8vHTzDJur2Jkq26awZOpQfz8APqDiZOICRatWNMm63wgEOLLnZwsU
+C3V5utitCjIu2mTd3WbjsuxN098CgYEAyViTLQ7pEBbIbvq60JGrdPrz84vPNvcR
+mRos3XDembwYauttiddjBl6SFyHuW+ufTyza8B3dFjxLmgrZ3lOlSJZ6JNFhhXBJ
+20ws928d2Jj+CeJHTi7nqCiDnqMNUGwY5yNiP2CCV2lzCajvgUBoM1hoRQuUz5Lg
+IiFgm4SH/r8CgYEArFPJYUblQeL/mULaPspaKXkWmxiRcTGH1im5VFNueDFeDxAR
+q57MlfHrWcAJB6ZmDt5SEheB8pzHW4EwXneCCGMKgQRe4p3zSMh1gfgKwvrphB2C
+T3xUI5iar76DcXF1iJhjY8EvlMSE3xQ5/r9pnM4Srq/7hFhx8rISyI5LF2kCgYEA
+wmGWxLtOWdAE9M9up4jahHb6KTfidugTv0E76xTacoTa9e4PtDGSUkXeuCJz4Z4a
+EO/29jV+icbwHek36KHMQcW0afMSOSbsxqBGESLfJ4qcRqKDwIEb+IYUe4RiiC+z
+4wGQCit76jPNcZf8kUXC0z8Yev/xTGw5ofmjMMDEIjUCgYB8H0VH5RF+2hQIkowv
+mCr0wDhWvLntjFKe/4Xx1hjxSd4uzPsj6qVbjmjHuAnA+VN3YBqO/iXOxLGlJEfb
+zycUdntnTkhILj1l8GmHZV3sop4hUbnW8ziGLxmMXAPVqnPGigscBkfHS80oYn8s
+E6Jfc1lF95dPXTUHv395sKmMsw==
 -----END PRIVATE KEY-----