Merge pull request #244 from snyk/fix/queue-workload-metadata

Fix/queue workload metadata

Author: Amir Moualem

package.json

@@ -6,12 +6,14 @@
     "pretest": "./scripts/build-image.sh",
     "test": "npm run lint && npm run build && npm run test:unit && npm run test:integration",
     "test:unit": "./tap test/unit -R spec",
-    "test:integration": "./tap test/integration/kubernetes.test.ts -R spec --timeout=1200",
+    "test:integration": "TEST_PLATFORM=kind CREATE_CLUSTER=true ./tap test/integration/kubernetes.test.ts -R spec --timeout=1200",
+    "test:integration:kind": "TEST_PLATFORM=kind CREATE_CLUSTER=true ./tap test/integration/kubernetes.test.ts -R spec --timeout=1200",
+    "test:integration:eks": "TEST_PLATFORM=eks CREATE_CLUSTER=false ./tap test/integration/kubernetes.test.ts -R spec --timeout=1200",
     "test:coverage": "npm run test:unit -- --coverage",
     "test:watch": "tsc-watch --onSuccess 'npm run test:unit'",
-    "test:apk": "./scripts/build-image.sh && PACKAGE_MANAGER=apk ./tap test/integration/package-manager.test.ts -R spec --timeout=7200",
-    "test:apt": "./scripts/build-image.sh && PACKAGE_MANAGER=apt ./tap test/integration/package-manager.test.ts -R spec --timeout=7200",
-    "test:rpm": "./scripts/build-image.sh && PACKAGE_MANAGER=rpm ./tap test/integration/package-manager.test.ts -R spec --timeout=7200",
+    "test:apk": "./scripts/build-image.sh && TEST_PLATFORM=kind CREATE_CLUSTER=true PACKAGE_MANAGER=apk ./tap test/integration/package-manager.test.ts -R spec --timeout=7200",
+    "test:apt": "./scripts/build-image.sh && TEST_PLATFORM=kind CREATE_CLUSTER=true PACKAGE_MANAGER=apt ./tap test/integration/package-manager.test.ts -R spec --timeout=7200",
+    "test:rpm": "./scripts/build-image.sh && TEST_PLATFORM=kind CREATE_CLUSTER=true PACKAGE_MANAGER=rpm ./tap test/integration/package-manager.test.ts -R spec --timeout=7200",
     "start": "bin/start",
     "prepare": "npm run build",
     "build": "tsc",

test/setup/index.ts

@@ -71,9 +71,8 @@ export async function removeMonitor(): Promise<void> {
   }
 }
 
-async function createEnvironment(imageNameAndTag: string): Promise<void> {
-  await kubectl.downloadKubectl();
-  await platforms.kind.create(imageNameAndTag);
+async function createEnvironment(): Promise<void> {
+  // TODO: we probably want to use k8s-api for that, not kubectl
   const servicesNamespace = 'services';
   await kubectl.createNamespace(servicesNamespace);
   // Small hack to prevent timing problems in CircleCI...
@@ -130,8 +129,16 @@ export async function deployMonitor(): Promise<string> {
       'snyk/kubernetes-monitor:local',
     );
 
-    // this bit is probably where we act upon the decision of which platform we'll use
-    await createEnvironment(imageNameAndTag);
+    const testPlatform = process.env['TEST_PLATFORM'] || 'kind';
+    const createCluster = process.env['CREATE_CLUSTER'] === 'true';
+    console.log(`platform chosen is ${testPlatform}, createCluster===${createCluster}`);
+
+    await kubectl.downloadKubectl();
+    if (createCluster) {
+      await platforms[testPlatform].create(imageNameAndTag);
+    }
+    await platforms[testPlatform].config();
+    await createEnvironment();
     const integrationId = await installKubernetesMonitor(imageNameAndTag);
     await waiters.waitForMonitorToBeReady();
     console.log(`Deployed the snyk-monitor with integration ID ${integrationId}`);

test/setup/platforms/eks.ts

@@ -1,13 +1,13 @@
 export async function createCluster(imageNameAndTag: string): Promise<void> {
-  exportKubeConfig('TODO');
+  exportKubeConfig();
   throw new Error('Not implemented');
   // process.env.KUBECONFIG = 'path-to-/kubeconfig-aws';
 }
 
-export async function deleteCluster(clusterName = 'kind'): Promise<void> {
+export async function deleteCluster(): Promise<void> {
   throw new Error('Not implemented');
 }
 
-async function exportKubeConfig(clusterName): Promise<void> {
+export async function exportKubeConfig(): Promise<void> {
   throw new Error('Not implemented');
 }

test/setup/platforms/index.ts

@@ -1,7 +1,28 @@
 import * as kind from './kind';
 import * as eks from './eks';
 
+interface IPlatformSetup {
+  // create a Kubernetes cluster
+  create: (imageNameAndTag: string) => Promise<void>;
+  // delete a Kubernetes cluster
+  delete: () => Promise<void>;
+  // set KUBECONFIG to point at the tested cluster
+  config: () => Promise<void>;
+}
+
+const kindSetup: IPlatformSetup = {
+  create: kind.createCluster,
+  delete: kind.deleteCluster,
+  config: kind.exportKubeConfig,
+};
+
+const eksSetup: IPlatformSetup = {
+  create: eks.createCluster,
+  delete: eks.deleteCluster,
+  config: eks.exportKubeConfig,
+}
+
 export default {
-  kind: {create: kind.createCluster, delete: kind.deleteCluster},
-  eks: {create: eks.createCluster, delete: eks.deleteCluster},
+  kind: kindSetup,
+  eks: eksSetup,
 }

test/setup/platforms/kind.ts

@@ -4,21 +4,29 @@ import { platform } from 'os';
 import { resolve } from 'path';
 import * as needle from 'needle';
 
+const clusterName = 'kind';
+
 export async function createCluster(imageNameAndTag: string): Promise<void> {
   const osDistro = platform();
   await download(osDistro);
-  const clusterName = 'kind';
   await createKindCluster(clusterName);
-  await exportKubeConfig(clusterName);
   await loadImageInCluster(imageNameAndTag);
 }
 
-export async function deleteCluster(clusterName = 'kind'): Promise<void> {
+export async function deleteCluster(): Promise<void> {
   console.log(`Deleting cluster ${clusterName}...`);
   await exec(`./kind delete cluster --name=${clusterName}`);
   console.log(`Deleted cluster ${clusterName}!`);
 }
 
+export async function exportKubeConfig(): Promise<void> {
+  console.log('Exporting K8s config...');
+  const kindResponse = await exec(`./kind get kubeconfig-path --name="${clusterName}"`);
+  const configPath = kindResponse.stdout.replace(/[\n\t\r]/g, '');
+  process.env.KUBECONFIG = configPath;
+  console.log('Exported K8s config!');
+}
+
 async function download(osDistro: string): Promise<void> {
   try {
     accessSync(resolve(process.cwd(), 'kind'), constants.R_OK);
@@ -55,14 +63,6 @@ async function createKindCluster(clusterName, kindImageTag = 'latest'): Promise<
   console.log(`Created cluster ${clusterName}!`);
 }
 
-async function exportKubeConfig(clusterName): Promise<void> {
-  console.log('Exporting K8s config...');
-  const kindResponse = await exec(`./kind get kubeconfig-path --name="${clusterName}"`);
-  const configPath = kindResponse.stdout.replace(/[\n\t\r]/g, '');
-  process.env.KUBECONFIG = configPath;
-  console.log('Exported K8s config!');
-}
-
 async function loadImageInCluster(imageNameAndTag): Promise<void> {
   console.log(`Loading image ${imageNameAndTag} in cluster...`);
   await exec(`./kind load docker-image ${imageNameAndTag}`);