Merge pull request #520 from snyk/chore/fix-flakiness-workload-2-images

Chore/fix flakiness workload 2 images

Author: ivanstanev

test/helpers/kubernetes-upstream.ts

@@ -4,7 +4,11 @@ import {
   IWorkloadLocator,
   IWorkloadMetadata,
 } from '../../src/transmitter/types';
-import { WorkloadLocatorValidator, WorkloadMetadataValidator } from './types';
+import {
+  WorkloadLocatorValidator,
+  WorkloadMetadataValidator,
+  DepGraphsValidator,
+} from './types';
 import config = require('../../src/common/config');
 
 const UPSTREAM_POLLING_CONFIGURATION = {
@@ -21,6 +25,25 @@ export async function getUpstreamResponseBody(
   return responseBody;
 }
 
+export async function validateUpstreamStoredDepGraphs(
+  validatorFn: DepGraphsValidator,
+  relativeUrl: string,
+  remainingChecks: number = UPSTREAM_POLLING_CONFIGURATION.MAXIMUM_REQUESTS,
+): Promise<boolean> {
+  while (remainingChecks > 0) {
+    console.log(`Pinging upstream for existing data (${remainingChecks} checks remaining)...`);
+    const responseBody = await getUpstreamResponseBody(relativeUrl);
+    const depGraphs = responseBody?.dependencyGraphResults;
+    const result = validatorFn(depGraphs);
+    if (result) {
+      return true;
+    }
+    await sleep(UPSTREAM_POLLING_CONFIGURATION.WAIT_BETWEEN_REQUESTS_MS);
+    remainingChecks--;
+  }
+  return false;
+}
+
 export async function validateUpstreamStoredData(
   validatorFn: WorkloadLocatorValidator,
   relativeUrl: string,

test/helpers/types.ts

@@ -3,6 +3,10 @@ import {
   IWorkloadMetadata,
 } from '../../src/transmitter/types';
 
+export type DepGraphsValidator = (depGraphs?: {
+  [name: string]: object;
+}) => boolean;
+
 export type WorkloadLocatorValidator = (
   workloads: IWorkloadLocator[] | undefined,
 ) => boolean;

test/integration/kubernetes.test.ts

@@ -8,6 +8,7 @@ import {
   validateUpstreamStoredData,
   validateUpstreamStoredMetadata,
   getUpstreamResponseBody,
+  validateUpstreamStoredDepGraphs,
 } from '../helpers/kubernetes-upstream';
 import {
   validateSecureConfiguration,
@@ -22,6 +23,10 @@ tap.tearDown(async() => {
   console.log('Begin removing the snyk-monitor...');
   await setup.removeMonitor();
   console.log('Removed the snyk-monitor!');
+
+  console.log('Begin removing "kind" network...');
+  await setup.removeUnusedKindNetwork();
+  console.log('Removed "kind" network');
 });
 
 // Make sure this runs first -- deploying the monitor for the next tests
@@ -129,7 +134,7 @@ tap.test('snyk-monitor sends data to kubernetes-upstream', async (t) => {
 });
 
 tap.test('snyk-monitor sends binary hashes to kubernetes-upstream after adding another deployment', async (t) => {
-  t.plan(9);
+  t.plan(10);
 
   const deploymentName = 'binaries-deployment';
   const namespace = 'services';
@@ -139,16 +144,32 @@ tap.test('snyk-monitor sends binary hashes to kubernetes-upstream after adding a
   await kubectl.applyK8sYaml('./test/fixtures/binaries-deployment.yaml');
   console.log(`Begin polling kubernetes-upstream for the expected workloads with integration ID ${integrationId}...`);
 
-  const validatorFn: WorkloadLocatorValidator = (workloads) => {
+  const workloadLocatorValidatorFn: WorkloadLocatorValidator = (workloads) => {
     return workloads !== undefined &&
       workloads.find((workload) => workload.name === deploymentName &&
         workload.type === WorkloadKind.Deployment) !== undefined;
   };
 
+  const depGraphsValidatorFn = (depGraphs?: {
+    node?: object;
+    openjdk?: object;
+  }) => {
+    return (
+      depGraphs !== undefined &&
+      depGraphs.node !== undefined &&
+      depGraphs.openjdk !== undefined
+    );
+  };
+
   const testResult = await validateUpstreamStoredData(
-    validatorFn, `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`);
+    workloadLocatorValidatorFn, `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`);
   t.ok(testResult, 'snyk-monitor sent expected data to kubernetes-upstream in the expected timeframe');
 
+  const depGraphsResult = await validateUpstreamStoredDepGraphs(
+    depGraphsValidatorFn, `api/v1/dependency-graphs/${integrationId}/${clusterName}/${namespace}/${deploymentType}/${deploymentName}`
+  );
+  t.ok(depGraphsResult, 'snyk-monitor sent expected dependency graphs to kubernetes-upstream in the expected timeframe');
+
   const depGraphResult = await getUpstreamResponseBody(
     `api/v1/dependency-graphs/${integrationId}/${clusterName}/${namespace}/${deploymentType}/${deploymentName}`);
   t.ok('dependencyGraphResults' in depGraphResult,
@@ -249,9 +270,6 @@ tap.test('snyk-monitor pulls images from a local registry and sends data to kube
     console.log('Begin removing local container registry...');
     await setup.removeLocalContainerRegistry();
     console.log('Removed local container registry');
-    console.log('Begin removing "kind" network...');
-    await setup.removeUnusedKindNetwork();
-    console.log('Removed "kind" network');
   });
 
   if (process.env['TEST_PLATFORM'] !== 'kind') {