Merge pull request #1906 from cjihrig/underscore

deps: remove underscore dependency

Author: k8s-ci-robot

package-lock.json

@@ -59,7 +59,6 @@
         "@types/node-fetch": "^2.6.9",
         "@types/stream-buffers": "^3.0.3",
         "@types/tar": "^6.1.1",
-        "@types/underscore": "^1.8.9",
         "@types/ws": "^8.5.4",
         "form-data": "^4.0.0",
         "isomorphic-ws": "^5.0.0",
@@ -72,7 +71,6 @@
         "tar": "^7.0.0",
         "tmp-promise": "^3.0.2",
         "tslib": "^2.5.0",
-        "underscore": "^1.9.1",
         "url-parse": "^1.4.3",
         "ws": "^8.18.0"
     },

package.json

@@ -1,5 +1,4 @@
 import * as fs from 'fs';
-import * as _ from 'underscore';
 
 export enum ActionOnInvalid {
     THROW = 'throw',
@@ -26,9 +25,13 @@ export interface Cluster {
 }
 
 export function newClusters(a: any, opts?: Partial<ConfigOptions>): Cluster[] {
+    if (!Array.isArray(a)) {
+        return [];
+    }
+
     const options = Object.assign(defaultNewConfigOptions(), opts || {});
 
-    return _.compact(_.map(a, clusterIterator(options.onInvalidEntry)));
+    return a.map(clusterIterator(options.onInvalidEntry)).filter(Boolean) as Cluster[];
 }
 
 export function exportCluster(cluster: Cluster): any {
@@ -44,8 +47,10 @@ export function exportCluster(cluster: Cluster): any {
     };
 }
 
-function clusterIterator(onInvalidEntry: ActionOnInvalid): _.ListIterator<any, Cluster | null> {
-    return (elt: any, i: number, list: _.List<any>): Cluster | null => {
+function clusterIterator(
+    onInvalidEntry: ActionOnInvalid,
+): (elt: any, i: number, list: any[]) => Cluster | null {
+    return (elt: any, i: number, list: any[]): Cluster | null => {
         try {
             if (!elt.name) {
                 throw new Error(`clusters[${i}].name is missing`);
@@ -90,9 +95,13 @@ export interface User {
 }
 
 export function newUsers(a: any, opts?: Partial<ConfigOptions>): User[] {
+    if (!Array.isArray(a)) {
+        return [];
+    }
+
     const options = Object.assign(defaultNewConfigOptions(), opts || {});
 
-    return _.compact(_.map(a, userIterator(options.onInvalidEntry)));
+    return a.map(userIterator(options.onInvalidEntry)).filter(Boolean) as User[];
 }
 
 export function exportUser(user: User): any {
@@ -112,8 +121,8 @@ export function exportUser(user: User): any {
     };
 }
 
-function userIterator(onInvalidEntry: ActionOnInvalid): _.ListIterator<any, User | null> {
-    return (elt: any, i: number, list: _.List<any>): User | null => {
+function userIterator(onInvalidEntry: ActionOnInvalid): (elt: any, i: number, list: any[]) => User | null {
+    return (elt: any, i: number, list: any[]): User | null => {
         try {
             if (!elt.name) {
                 throw new Error(`users[${i}].name is missing`);
@@ -161,9 +170,13 @@ export interface Context {
 }
 
 export function newContexts(a: any, opts?: Partial<ConfigOptions>): Context[] {
+    if (!Array.isArray(a)) {
+        return [];
+    }
+
     const options = Object.assign(defaultNewConfigOptions(), opts || {});
 
-    return _.compact(_.map(a, contextIterator(options.onInvalidEntry)));
+    return a.map(contextIterator(options.onInvalidEntry)).filter(Boolean) as Context[];
 }
 
 export function exportContext(ctx: Context): any {
@@ -173,8 +186,10 @@ export function exportContext(ctx: Context): any {
     };
 }
 
-function contextIterator(onInvalidEntry: ActionOnInvalid): _.ListIterator<any, Context | null> {
-    return (elt: any, i: number, list: _.List<any>): Context | null => {
+function contextIterator(
+    onInvalidEntry: ActionOnInvalid,
+): (elt: any, i: number, list: any[]) => Context | null {
+    return (elt: any, i: number, list: any[]): Context | null => {
         try {
             if (!elt.name) {
                 throw new Error(`contexts[${i}].name is missing`);

src/config_types.ts

@@ -1,5 +1,4 @@
 import { Response } from 'node-fetch';
-import { isNumber } from 'underscore';
 import { CoreV1Api, V1Container, V1Pod } from './gen';
 
 export async function podsForNode(api: CoreV1Api, nodeName: string): Promise<V1Pod[]> {
@@ -108,15 +107,15 @@ export function totalMemory(pod: V1Pod): ResourceStatus {
 }
 
 export function add(n1: number | bigint, n2: number | bigint): number | bigint {
-    if (isNumber(n1) && isNumber(n2)) {
+    if (typeof n1 === 'number' && typeof n2 === 'number') {
         return n1 + n2;
     }
-    if (isNumber(n1)) {
-        return BigInt(Math.round(n1)) + (n2 as bigint);
-    } else if (isNumber(n2)) {
-        return (n1 as bigint) + BigInt(Math.round(n2));
+    if (typeof n1 === 'number') {
+        return BigInt(Math.round(n1)) + BigInt(n2);
+    } else if (typeof n2 === 'number') {
+        return BigInt(n1) + BigInt(Math.round(n2));
     }
-    return ((n1 as bigint) + n2) as bigint;
+    return BigInt(n1) + BigInt(n2);
 }
 
 export function containerTotalForResource(container: V1Container, resource: string): ResourceStatus {