Merge pull request #964 from snyk/feat/package-upgrades

ivanstanev · web-flow · commit 46d7555ac3d2 · 2021-12-15T16:05:10.000Z
Feat/package upgrades
diff --git a/Dockerfile b/Dockerfile
@@ -33,6 +33,8 @@ COPY LICENSE /licenses/LICENSE
 
 ENV NODE_ENV production
 
+RUN yum upgrade -y
+
 RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
 RUN yum install -y nodejs
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "format:check": "prettier --check '{src,test}/**/*.{js,ts,json,yml}'"
   },
   "dependencies": {
-    "@kubernetes/client-node": "^0.15.1",
+    "@kubernetes/client-node": "^0.16.1",
     "@snyk/dep-graph": "^1.29.0",
     "async": "^3.2.2",
     "aws-sdk": "^2.1035.0",
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import { emptyDirSync } from 'fs-extra';
+import fsExtra = require('fs-extra');
 
 import * as SourceMapSupport from 'source-map-support';
 
@@ -42,7 +42,7 @@ process.on('unhandledRejection', (reason, promise) => {
 function cleanUpTempStorage() {
   const { IMAGE_STORAGE_ROOT } = config;
   try {
-    emptyDirSync(IMAGE_STORAGE_ROOT);
+    fsExtra.emptyDirSync(IMAGE_STORAGE_ROOT);
     logger.info({}, 'Cleaned temp storage');
   } catch (err) {
     logger.error({ err }, 'Error deleting files');
diff --git a/src/scanner/images/skopeo.ts b/src/scanner/images/skopeo.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 
 import { logger } from '../../common/logger';
 import { config } from '../../common/config';
diff --git a/src/state.ts b/src/state.ts
@@ -1,5 +1,5 @@
 import { KubernetesObject, V1Namespace } from '@kubernetes/client-node';
-import * as LruCache from 'lru-cache';
+import LruCache from 'lru-cache';
 
 import { config } from './common/config';
 
diff --git a/src/supervisor/kuberenetes-api-wrappers.ts b/src/supervisor/kuberenetes-api-wrappers.ts
@@ -1,5 +1,5 @@
 import * as http from 'http';
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 
 import { logger } from '../common/logger';
 import { IRequestError } from './types';
diff --git a/src/supervisor/watchers/handlers/deployment-config.ts b/src/supervisor/watchers/handlers/deployment-config.ts
@@ -43,6 +43,7 @@ export async function paginatedDeploymentConfigList(
         namespace,
         'deploymentconfigs',
         pretty,
+        _allowWatchBookmarks,
         _continue,
         fieldSelector,
         labelSelector,
diff --git a/src/supervisor/watchers/handlers/index.ts b/src/supervisor/watchers/handlers/index.ts
@@ -134,8 +134,10 @@ async function isSupportedWorkload(
     const continueToken = undefined;
     const fieldSelector = undefined;
     const labelSelector = undefined;
+    const allowWatchBookmarks = undefined;
     const limit = 1; // Try to grab only a single object
     const resourceVersion = undefined; // List anything in the cluster
+    const resourceVersionMatch = undefined;
     const timeoutSeconds = 10; // Don't block the snyk-monitor indefinitely
     const attemptedApiCall =
       await kubernetesApiWrappers.retryKubernetesApiRequest(() =>
@@ -145,11 +147,13 @@ async function isSupportedWorkload(
           namespace,
           'deploymentconfigs',
           pretty,
+          allowWatchBookmarks,
           continueToken,
           fieldSelector,
           labelSelector,
           limit,
           resourceVersion,
+          resourceVersionMatch,
           timeoutSeconds,
         ),
       );
diff --git a/src/supervisor/watchers/handlers/pagination.ts b/src/supervisor/watchers/handlers/pagination.ts
@@ -1,5 +1,5 @@
 import { IncomingMessage } from 'http';
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 import type {
   KubernetesListObject,
   KubernetesObject,
diff --git a/src/transmitter/index.ts b/src/transmitter/index.ts
@@ -1,7 +1,7 @@
 import { parse } from 'url';
 import { queue } from 'async';
-import * as needle from 'needle';
-import * as sleep from 'sleep-promise';
+import needle from 'needle';
+import sleep from 'sleep-promise';
 import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent } from 'https';
 import { NeedleResponse, NeedleHttpVerbs, NeedleOptions } from 'needle';
diff --git a/test/helpers/kubectl.ts b/test/helpers/kubectl.ts
@@ -1,8 +1,8 @@
 import { chmodSync, writeFileSync, existsSync, unlinkSync } from 'fs';
 import { platform } from 'os';
 import { resolve } from 'path';
-import * as needle from 'needle';
-import * as sleep from 'sleep-promise';
+import needle from 'needle';
+import sleep from 'sleep-promise';
 import type { V1ServiceAccount } from '@kubernetes/client-node';
 
 import { execWrapper as exec } from './exec';
diff --git a/test/helpers/kubernetes-upstream.ts b/test/helpers/kubernetes-upstream.ts
@@ -1,5 +1,5 @@
-import * as needle from 'needle';
-import * as sleep from 'sleep-promise';
+import needle from 'needle';
+import sleep from 'sleep-promise';
 import {
   IWorkloadLocator,
   IWorkloadMetadata,
diff --git a/test/setup/deployers/operator-olm.ts b/test/setup/deployers/operator-olm.ts
@@ -1,4 +1,4 @@
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 import { parse, stringify } from 'yaml';
 import { readFileSync, writeFileSync } from 'fs';
 
diff --git a/test/setup/index.ts b/test/setup/index.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import { randomUUID } from 'crypto';
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 
 import platforms, { getKubernetesVersionForPlatform } from './platforms';
 import deployers from './deployers';
diff --git a/test/setup/platforms/kind-olm.ts b/test/setup/platforms/kind-olm.ts
@@ -1,4 +1,4 @@
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 
 import { createCluster as kindCreateCluster } from './kind';
 import * as kubectl from '../../helpers/kubectl';
diff --git a/test/setup/platforms/openshift4.ts b/test/setup/platforms/openshift4.ts
@@ -1,8 +1,7 @@
-import { Writable } from 'stream';
 import { chmodSync, writeFileSync, existsSync } from 'fs';
 import { platform, tmpdir } from 'os';
 import { resolve } from 'path';
-import * as needle from 'needle';
+import needle from 'needle';
 
 import { throwIfEnvironmentVariableUnset } from './helpers';
 import * as kubectl from '../../helpers/kubectl';
@@ -147,10 +146,10 @@ export async function clean(): Promise<void> {
   ]);
 }
 
-async function extractOpenShiftCli(fileStream: Writable): Promise<void> {
+async function extractOpenShiftCli(responseBody: any): Promise<void> {
   const tmp = tmpdir();
   const temporaryTarLocation = `${tmp}/openshift-cli`;
-  writeFileSync(temporaryTarLocation, fileStream);
+  writeFileSync(temporaryTarLocation, responseBody);
 
   const currentLocation = process.cwd();
   await exec(`tar -C ${currentLocation} -xzvf ${temporaryTarLocation} oc`);
diff --git a/test/system/kind.spec.ts b/test/system/kind.spec.ts
@@ -1,8 +1,8 @@
-import * as nock from 'nock';
+import nock from 'nock';
 import { promisify } from 'util';
 import { randomUUID } from 'crypto';
-import * as fsExtra from 'fs-extra';
-import * as sleep from 'sleep-promise';
+import fsExtra = require('fs-extra');
+import sleep from 'sleep-promise';
 import { resolve as resolvePath } from 'path';
 import { copyFile, readFile, mkdir, exists } from 'fs';
 
diff --git a/test/unit/supervisor/pod-watch-handler-caches.spec.ts b/test/unit/supervisor/pod-watch-handler-caches.spec.ts
@@ -1,6 +1,6 @@
 import * as async from 'async';
 import * as fs from 'fs';
-import * as sleep from 'sleep-promise';
+import sleep from 'sleep-promise';
 import * as YAML from 'yaml';
 
 import { V1PodSpec, V1Pod } from '@kubernetes/client-node';
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,7 +11,8 @@
     "noImplicitAny": false,
     "noUnusedLocals": true,
     "resolveJsonModule": true,
-    "noImplicitReturns": true
+    "noImplicitReturns": true,
+    "esModuleInterop": true
   },
   "include": [
     "./src/**/*"
