Skip to content

Commit 520e770

Browse files
authored
Merge pull request #940 from brendandburns/versions
Update TS-lint and prettier and fix some formatting updates
2 parents 1633b8b + 93891c7 commit 520e770

14 files changed

+150
-209
lines changed

package-lock.json

Lines changed: 24 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
"mock-fs": "^5.2.0",
9191
"nock": "^13.2.9",
9292
"nyc": "^15.1.0",
93-
"prettier": "~1.16.4",
93+
"prettier": "~2.8.1",
9494
"source-map-support": "^0.5.9",
9595
"ts-mockito": "^2.3.1",
9696
"ts-node": "^10.9.1",
97-
"tslint": "^5.17.0",
97+
"tslint": "^6.1.3",
9898
"typedoc": "^0.23.22",
9999
"typescript": "~4.9.4"
100100
},

src/attach.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,17 @@ export class Attach {
3333
};
3434
const queryStr = querystring.stringify(query);
3535
const path = `/api/v1/namespaces/${namespace}/pods/${podName}/attach?${queryStr}`;
36-
const conn = await this.handler.connect(
37-
path,
38-
null,
39-
(streamNum: number, buff: Buffer): boolean => {
40-
WebSocketHandler.handleStandardStreams(streamNum, buff, stdout, stderr);
41-
return true;
42-
},
43-
);
36+
const conn = await this.handler.connect(path, null, (streamNum: number, buff: Buffer): boolean => {
37+
WebSocketHandler.handleStandardStreams(streamNum, buff, stdout, stderr);
38+
return true;
39+
});
4440
if (stdin != null) {
4541
WebSocketHandler.handleStandardInput(conn, stdin, WebSocketHandler.StdinStream);
4642
}
4743
if (isResizable(stdout)) {
4844
this.terminalSizeQueue = new TerminalSizeQueue();
4945
WebSocketHandler.handleStandardInput(conn, this.terminalSizeQueue, WebSocketHandler.ResizeStream);
50-
this.terminalSizeQueue.handleResizes((stdout as any) as ResizableStream);
46+
this.terminalSizeQueue.handleResizes(stdout as any as ResizableStream);
5147
}
5248
return conn;
5349
}

src/cache.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
2727
private objects: CacheMap<T> = new Map();
2828
private resourceVersion: string;
2929
private readonly callbackCache: {
30-
[key: string]: Array<ObjectCallback<T> | ErrorCallback>;
30+
[key: string]: (ObjectCallback<T> | ErrorCallback)[];
3131
} = {};
3232
private request: RequestResult | undefined;
3333
private stopped: boolean = false;
@@ -242,7 +242,7 @@ export function cacheMapFromList<T extends KubernetesObject>(newObjects: T[]): C
242242
export function deleteItems<T extends KubernetesObject>(
243243
oldObjects: CacheMap<T>,
244244
newObjects: T[],
245-
deleteCallback?: Array<ObjectCallback<T>>,
245+
deleteCallback?: ObjectCallback<T>[],
246246
): CacheMap<T> {
247247
const newObjectsMap = cacheMapFromList(newObjects);
248248

@@ -274,8 +274,8 @@ export function deleteItems<T extends KubernetesObject>(
274274
export function addOrUpdateObject<T extends KubernetesObject>(
275275
objects: CacheMap<T>,
276276
obj: T,
277-
addCallbacks?: Array<ObjectCallback<T>>,
278-
updateCallbacks?: Array<ObjectCallback<T>>,
277+
addCallbacks?: ObjectCallback<T>[],
278+
updateCallbacks?: ObjectCallback<T>[],
279279
): void {
280280
let namespaceObjects = objects.get(obj.metadata!.namespace || '');
281281
if (!namespaceObjects) {
@@ -312,7 +312,7 @@ function isSameVersion<T extends KubernetesObject>(o1: T, o2: T): boolean {
312312
export function deleteObject<T extends KubernetesObject>(
313313
objects: CacheMap<T>,
314314
obj: T,
315-
deleteCallbacks?: Array<ObjectCallback<T>>,
315+
deleteCallbacks?: ObjectCallback<T>[],
316316
): void {
317317
const namespace = obj.metadata!.namespace || '';
318318
const name = obj.metadata!.name || '';

0 commit comments

Comments
 (0)