Skip to content

Commit 1a5db87

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #119 from brendandburns/port-forward
Fix a bug where attach didn't handle stdin. Add testing.
2 parents c1c0039 + 135a94d commit 1a5db87

18 files changed

+689
-155
lines changed

‎node-client/coverage/attach.ts.html

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>Code coverage report for attach.ts</title>
5+
<meta charset="utf-8" />
6+
<link rel="stylesheet" href="prettify.css" />
7+
<link rel="stylesheet" href="base.css" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<style type='text/css'>
10+
.coverage-summary .sorter {
11+
background-image: url(sort-arrow-sprite.png);
12+
}
13+
</style>
14+
</head>
15+
<body>
16+
<div class='wrapper'>
17+
<div class='pad1'>
18+
<h1>
19+
<a href="index.html">All files</a> attach.ts
20+
</h1>
21+
<div class='clearfix'>
22+
<div class='fl pad1y space-right2'>
23+
<span class="strong">92.86% </span>
24+
<span class="quiet">Statements</span>
25+
<span class='fraction'>13/14</span>
26+
</div>
27+
<div class='fl pad1y space-right2'>
28+
<span class="strong">75% </span>
29+
<span class="quiet">Branches</span>
30+
<span class='fraction'>3/4</span>
31+
</div>
32+
<div class='fl pad1y space-right2'>
33+
<span class="strong">100% </span>
34+
<span class="quiet">Functions</span>
35+
<span class='fraction'>3/3</span>
36+
</div>
37+
<div class='fl pad1y space-right2'>
38+
<span class="strong">92.86% </span>
39+
<span class="quiet">Lines</span>
40+
<span class='fraction'>13/14</span>
41+
</div>
42+
</div>
43+
<p class="quiet">
44+
Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
45+
</p>
46+
</div>
47+
<div class='status-line high'></div>
48+
<pre><table class="coverage">
49+
<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
50+
<a name='L2'></a><a href='#L2'>2</a>
51+
<a name='L3'></a><a href='#L3'>3</a>
52+
<a name='L4'></a><a href='#L4'>4</a>
53+
<a name='L5'></a><a href='#L5'>5</a>
54+
<a name='L6'></a><a href='#L6'>6</a>
55+
<a name='L7'></a><a href='#L7'>7</a>
56+
<a name='L8'></a><a href='#L8'>8</a>
57+
<a name='L9'></a><a href='#L9'>9</a>
58+
<a name='L10'></a><a href='#L10'>10</a>
59+
<a name='L11'></a><a href='#L11'>11</a>
60+
<a name='L12'></a><a href='#L12'>12</a>
61+
<a name='L13'></a><a href='#L13'>13</a>
62+
<a name='L14'></a><a href='#L14'>14</a>
63+
<a name='L15'></a><a href='#L15'>15</a>
64+
<a name='L16'></a><a href='#L16'>16</a>
65+
<a name='L17'></a><a href='#L17'>17</a>
66+
<a name='L18'></a><a href='#L18'>18</a>
67+
<a name='L19'></a><a href='#L19'>19</a>
68+
<a name='L20'></a><a href='#L20'>20</a>
69+
<a name='L21'></a><a href='#L21'>21</a>
70+
<a name='L22'></a><a href='#L22'>22</a>
71+
<a name='L23'></a><a href='#L23'>23</a>
72+
<a name='L24'></a><a href='#L24'>24</a>
73+
<a name='L25'></a><a href='#L25'>25</a>
74+
<a name='L26'></a><a href='#L26'>26</a>
75+
<a name='L27'></a><a href='#L27'>27</a>
76+
<a name='L28'></a><a href='#L28'>28</a>
77+
<a name='L29'></a><a href='#L29'>29</a>
78+
<a name='L30'></a><a href='#L30'>30</a>
79+
<a name='L31'></a><a href='#L31'>31</a>
80+
<a name='L32'></a><a href='#L32'>32</a>
81+
<a name='L33'></a><a href='#L33'>33</a>
82+
<a name='L34'></a><a href='#L34'>34</a>
83+
<a name='L35'></a><a href='#L35'>35</a>
84+
<a name='L36'></a><a href='#L36'>36</a>
85+
<a name='L37'></a><a href='#L37'>37</a>
86+
<a name='L38'></a><a href='#L38'>38</a>
87+
<a name='L39'></a><a href='#L39'>39</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
88+
<span class="cline-any cline-neutral">&nbsp;</span>
89+
<span class="cline-any cline-neutral">&nbsp;</span>
90+
<span class="cline-any cline-neutral">&nbsp;</span>
91+
<span class="cline-any cline-yes">1x</span>
92+
<span class="cline-any cline-neutral">&nbsp;</span>
93+
<span class="cline-any cline-yes">1x</span>
94+
<span class="cline-any cline-neutral">&nbsp;</span>
95+
<span class="cline-any cline-neutral">&nbsp;</span>
96+
<span class="cline-any cline-neutral">&nbsp;</span>
97+
<span class="cline-any cline-yes">2x</span>
98+
<span class="cline-any cline-yes">2x</span>
99+
<span class="cline-any cline-neutral">&nbsp;</span>
100+
<span class="cline-any cline-no">&nbsp;</span>
101+
<span class="cline-any cline-neutral">&nbsp;</span>
102+
<span class="cline-any cline-neutral">&nbsp;</span>
103+
<span class="cline-any cline-neutral">&nbsp;</span>
104+
<span class="cline-any cline-neutral">&nbsp;</span>
105+
<span class="cline-any cline-neutral">&nbsp;</span>
106+
<span class="cline-any cline-neutral">&nbsp;</span>
107+
<span class="cline-any cline-yes">6x</span>
108+
<span class="cline-any cline-neutral">&nbsp;</span>
109+
<span class="cline-any cline-neutral">&nbsp;</span>
110+
<span class="cline-any cline-neutral">&nbsp;</span>
111+
<span class="cline-any cline-neutral">&nbsp;</span>
112+
<span class="cline-any cline-neutral">&nbsp;</span>
113+
<span class="cline-any cline-neutral">&nbsp;</span>
114+
<span class="cline-any cline-yes">6x</span>
115+
<span class="cline-any cline-yes">6x</span>
116+
<span class="cline-any cline-yes">6x</span>
117+
<span class="cline-any cline-yes">2x</span>
118+
<span class="cline-any cline-yes">2x</span>
119+
<span class="cline-any cline-neutral">&nbsp;</span>
120+
<span class="cline-any cline-yes">6x</span>
121+
<span class="cline-any cline-yes">2x</span>
122+
<span class="cline-any cline-neutral">&nbsp;</span>
123+
<span class="cline-any cline-neutral">&nbsp;</span>
124+
<span class="cline-any cline-neutral">&nbsp;</span>
125+
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import querystring = require('querystring');
126+
import stream = require('stream');
127+
&nbsp;
128+
import { KubeConfig } from './config';
129+
import { WebSocketHandler, WebSocketInterface } from './web-socket-handler';
130+
&nbsp;
131+
export class Attach {
132+
public 'handler': WebSocketInterface;
133+
&nbsp;
134+
public constructor(config: KubeConfig, websocketInterface?: WebSocketInterface) {
135+
<span class="missing-if-branch" title="else path not taken" >E</span>if (websocketInterface) {
136+
this.handler = websocketInterface;
137+
} else {
138+
<span class="cstat-no" title="statement not covered" > this.handler = new WebSocketHandler(config);</span>
139+
}
140+
}
141+
&nbsp;
142+
public async attach(namespace: string, podName: string, containerName: string,
143+
stdout: stream.Writable | any, stderr: stream.Writable | any, stdin: stream.Readable | any,
144+
tty: boolean): Promise&lt;void&gt; {
145+
const query = {
146+
container: containerName,
147+
stderr: stderr != null,
148+
stdin: stdin != null,
149+
stdout: stdout != null,
150+
tty,
151+
};
152+
const queryStr = querystring.stringify(query);
153+
const path = `/api/v1/namespaces/${namespace}/pods/${podName}/attach?${queryStr}`;
154+
const conn = await this.handler.connect(path, null, (streamNum: number, buff: Buffer): boolean =&gt; {
155+
WebSocketHandler.handleStandardStreams(streamNum, buff, stdout, stderr);
156+
return true;
157+
});
158+
if (stdin != null) {
159+
WebSocketHandler.handleStandardInput(conn, stdin);
160+
}
161+
}
162+
}
163+
&nbsp;</pre></td></tr>
164+
</table></pre>
165+
<div class='push'></div><!-- for sticky footer -->
166+
</div><!-- /wrapper -->
167+
<div class='footer quiet pad2 space-top1 center small'>
168+
Code coverage
169+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Tue Oct 09 2018 21:27:50 GMT-0700 (PDT)
170+
</div>
171+
</div>
172+
<script src="prettify.js"></script>
173+
<script>
174+
window.onload = function () {
175+
if (typeof prettyPrint === 'function') {
176+
prettyPrint();
177+
}
178+
};
179+
</script>
180+
<script src="sorter.js"></script>
181+
<script src="block-navigation.js"></script>
182+
</body>
183+
</html>

‎node-client/coverage/config.ts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ <h1>
11291129
</div><!-- /wrapper -->
11301130
<div class='footer quiet pad2 space-top1 center small'>
11311131
Code coverage
1132-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Oct 08 2018 16:14:23 GMT-0700 (PDT)
1132+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Tue Oct 09 2018 21:27:50 GMT-0700 (PDT)
11331133
</div>
11341134
</div>
11351135
<script src="prettify.js"></script>

‎node-client/coverage/config_types.ts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ <h1>
391391
</div><!-- /wrapper -->
392392
<div class='footer quiet pad2 space-top1 center small'>
393393
Code coverage
394-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Oct 08 2018 16:14:23 GMT-0700 (PDT)
394+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Tue Oct 09 2018 21:27:50 GMT-0700 (PDT)
395395
</div>
396396
</div>
397397
<script src="prettify.js"></script>

‎node-client/coverage/index.html

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ <h1>
2020
</h1>
2121
<div class='clearfix'>
2222
<div class='fl pad1y space-right2'>
23-
<span class="strong">76.95% </span>
23+
<span class="strong">79.79% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>207/269</span>
25+
<span class='fraction'>225/282</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
28-
<span class="strong">73.79% </span>
28+
<span class="strong">75.17% </span>
2929
<span class="quiet">Branches</span>
30-
<span class='fraction'>107/145</span>
30+
<span class='fraction'>112/149</span>
3131
</div>
3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">67.27% </span>
33+
<span class="strong">72.41% </span>
3434
<span class="quiet">Functions</span>
35-
<span class='fraction'>37/55</span>
35+
<span class='fraction'>42/58</span>
3636
</div>
3737
<div class='fl pad1y space-right2'>
38-
<span class="strong">76.95% </span>
38+
<span class="strong">79.79% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>207/269</span>
40+
<span class='fraction'>225/282</span>
4141
</div>
4242
</div>
4343
<p class="quiet">
@@ -62,6 +62,19 @@ <h1>
6262
</tr>
6363
</thead>
6464
<tbody><tr>
65+
<td class="file high" data-value="attach.ts"><a href="attach.ts.html">attach.ts</a></td>
66+
<td data-value="92.86" class="pic high"><div class="chart"><div class="cover-fill" style="width: 92%;"></div><div class="cover-empty" style="width:8%;"></div></div></td>
67+
<td data-value="92.86" class="pct high">92.86%</td>
68+
<td data-value="14" class="abs high">13/14</td>
69+
<td data-value="75" class="pct medium">75%</td>
70+
<td data-value="4" class="abs medium">3/4</td>
71+
<td data-value="100" class="pct high">100%</td>
72+
<td data-value="3" class="abs high">3/3</td>
73+
<td data-value="92.86" class="pct high">92.86%</td>
74+
<td data-value="14" class="abs high">13/14</td>
75+
</tr>
76+
77+
<tr>
6578
<td class="file high" data-value="config.ts"><a href="config.ts.html">config.ts</a></td>
6679
<td data-value="86.9" class="pic high"><div class="chart"><div class="cover-fill" style="width: 86%;"></div><div class="cover-empty" style="width:14%;"></div></div></td>
6780
<td data-value="86.9" class="pct high">86.9%</td>
@@ -115,15 +128,15 @@ <h1>
115128

116129
<tr>
117130
<td class="file low" data-value="web-socket-handler.ts"><a href="web-socket-handler.ts.html">web-socket-handler.ts</a></td>
118-
<td data-value="29.82" class="pic low"><div class="chart"><div class="cover-fill" style="width: 29%;"></div><div class="cover-empty" style="width:71%;"></div></div></td>
119-
<td data-value="29.82" class="pct low">29.82%</td>
120-
<td data-value="57" class="abs low">17/57</td>
121-
<td data-value="11.43" class="pct low">11.43%</td>
122-
<td data-value="35" class="abs low">4/35</td>
123-
<td data-value="20" class="pct low">20%</td>
124-
<td data-value="10" class="abs low">2/10</td>
125-
<td data-value="29.82" class="pct low">29.82%</td>
126-
<td data-value="57" class="abs low">17/57</td>
131+
<td data-value="39.29" class="pic low"><div class="chart"><div class="cover-fill" style="width: 39%;"></div><div class="cover-empty" style="width:61%;"></div></div></td>
132+
<td data-value="39.29" class="pct low">39.29%</td>
133+
<td data-value="56" class="abs low">22/56</td>
134+
<td data-value="17.14" class="pct low">17.14%</td>
135+
<td data-value="35" class="abs low">6/35</td>
136+
<td data-value="40" class="pct low">40%</td>
137+
<td data-value="10" class="abs low">4/10</td>
138+
<td data-value="39.29" class="pct low">39.29%</td>
139+
<td data-value="56" class="abs low">22/56</td>
127140
</tr>
128141

129142
</tbody>
@@ -132,7 +145,7 @@ <h1>
132145
</div><!-- /wrapper -->
133146
<div class='footer quiet pad2 space-top1 center small'>
134147
Code coverage
135-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Oct 08 2018 16:14:23 GMT-0700 (PDT)
148+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Tue Oct 09 2018 21:27:50 GMT-0700 (PDT)
136149
</div>
137150
</div>
138151
<script src="prettify.js"></script>

‎node-client/coverage/index.ts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h1>
7070
</div><!-- /wrapper -->
7171
<div class='footer quiet pad2 space-top1 center small'>
7272
Code coverage
73-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Oct 08 2018 16:14:23 GMT-0700 (PDT)
73+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Tue Oct 09 2018 21:27:50 GMT-0700 (PDT)
7474
</div>
7575
</div>
7676
<script src="prettify.js"></script>

0 commit comments

Comments
 (0)