Merge pull request #291 from snyk/chore/homebase_removal

shaimendel · web-flow · commit cc16ee24fbef · 2020-01-29T19:12:05.000+02:00
chore: remove homebase references in tests code
diff --git a/test/helpers/kubernetes-upstream.ts b/test/helpers/kubernetes-upstream.ts
@@ -10,22 +10,22 @@ import config = require('../../src/common/config');
 const toneDownFactor = 5;
 const maxPodChecks = 600 / toneDownFactor;
 
-export async function getHomebaseResponseBody(
+export async function getUpstreamResponseBody(
   relativeUrl: string,
 ): Promise<any> {
-  const url = `https://${config.INTERNAL_PROXY_CREDENTIALS}@homebase-int.dev.snyk.io/${relativeUrl}`;
-  const homebaseResponse = await needle('get', url, null);
-  const responseBody = homebaseResponse.body;
+  const url = `https://${config.INTERNAL_PROXY_CREDENTIALS}@kubernetes-upstream-int.dev.snyk.io/${relativeUrl}`;
+  const upstreamResponse = await needle('get', url, null);
+  const responseBody = upstreamResponse.body;
   return responseBody;
 }
 
-export async function validateHomebaseStoredData(
+export async function validateUpstreamStoredData(
   validatorFn: WorkloadLocatorValidator,
   relativeUrl: string,
   remainingChecks: number = maxPodChecks,
 ): Promise<boolean> {
   while (remainingChecks > 0) {
-    const responseBody = await getHomebaseResponseBody(relativeUrl);
+    const responseBody = await getUpstreamResponseBody(relativeUrl);
     const workloads: IWorkloadLocator[] | undefined = responseBody.workloads;
     const result = validatorFn(workloads);
     if (result) {
@@ -37,13 +37,13 @@ export async function validateHomebaseStoredData(
   return false;
 }
 
-export async function validateHomebaseStoredMetadata(
+export async function validateUpstreamStoredMetadata(
   validatorFn: WorkloadMetadataValidator,
   relativeUrl: string,
   remainingChecks: number = maxPodChecks,
 ): Promise<boolean> {
   while (remainingChecks > 0) {
-    const responseBody = await getHomebaseResponseBody(relativeUrl);
+    const responseBody = await getUpstreamResponseBody(relativeUrl);
     const workloadInfo: IWorkloadMetadata | undefined =
       responseBody.workloadInfo;
     const result = validatorFn(workloadInfo);
diff --git a/test/integration/kubernetes.test.ts b/test/integration/kubernetes.test.ts
@@ -4,10 +4,10 @@ import * as tap from 'tap';
 import { WorkloadKind } from '../../src/supervisor/types';
 import { WorkloadMetadataValidator, WorkloadLocatorValidator } from '../helpers/types';
 import {
-  validateHomebaseStoredData,
-  validateHomebaseStoredMetadata,
-  getHomebaseResponseBody,
-} from '../helpers/homebase';
+  validateUpstreamStoredData,
+  validateUpstreamStoredMetadata,
+  getUpstreamResponseBody,
+} from '../helpers/kubernetes-upstream';
 import { validateSecureConfiguration, validateVolumeMounts } from '../helpers/deployment';
 import * as kubectl from '../helpers/kubectl';
 
@@ -70,10 +70,10 @@ tap.test('snyk-monitor container started', async (t) => {
   console.log('Done -- snyk-monitor exists!');
 });
 
-tap.test('snyk-monitor sends data to homebase', async (t) => {
+tap.test('snyk-monitor sends data to kubernetes-upstream', async (t) => {
   t.plan(2);
 
-  console.log(`Begin polling Homebase for the expected workloads with integration ID ${integrationId}...`);
+  console.log(`Begin polling kubernetes-upstream for the expected workloads with integration ID ${integrationId}...`);
 
   const validatorFn: WorkloadLocatorValidator = (workloads) => {
     return workloads !== undefined && workloads.length === 5 &&
@@ -95,16 +95,16 @@ tap.test('snyk-monitor sends data to homebase', async (t) => {
       'podSpec' in workloadInfo;
   };
 
-  // We don't want to spam Homebase with requests; do it infrequently
-  const homebaseDepGraphTestResult = await validateHomebaseStoredData(
+  // We don't want to spam kubernetes-upstream with requests; do it infrequently
+  const depGraphTestResult = await validateUpstreamStoredData(
     validatorFn, `api/v2/workloads/${integrationId}/Default cluster/services`);
-  t.ok(homebaseDepGraphTestResult, 'snyk-monitor sent expected data to homebase in the expected timeframe');
-  const homebaseWorkloadMetadataResult = await validateHomebaseStoredMetadata(metaValidator,
+  t.ok(depGraphTestResult, 'snyk-monitor sent expected data to kubernetes-upstream in the expected timeframe');
+  const workloadMetadataResult = await validateUpstreamStoredMetadata(metaValidator,
     `api/v1/workload/${integrationId}/Default cluster/services/Deployment/redis`);
-  t.ok(homebaseWorkloadMetadataResult, 'snyk-monitor sent expected metadata in the expected timeframe');
+  t.ok(workloadMetadataResult, 'snyk-monitor sent expected metadata in the expected timeframe');
 });
 
-tap.test('snyk-monitor sends correct data to homebase after adding another deployment', async (t) => {
+tap.test('snyk-monitor sends correct data to kubernetes-upstream after adding another deployment', async (t) => {
   t.plan(3);
 
   const deploymentName = 'nginx-deployment';
@@ -114,27 +114,27 @@ tap.test('snyk-monitor sends correct data to homebase after adding another deplo
   const imageName = 'nginx';
 
   await kubectl.applyK8sYaml('./test/fixtures/nginx-deployment.yaml');
-  console.log(`Begin polling Homebase for the expected workloads with integration ID ${integrationId}...`);
+  console.log(`Begin polling kubernetes-upstream for the expected workloads with integration ID ${integrationId}...`);
 
   const validatorFn: WorkloadLocatorValidator = (workloads) => {
     return workloads !== undefined &&
       workloads.find((workload) => workload.name === deploymentName &&
         workload.type === WorkloadKind.Deployment) !== undefined;
   };
 
-  const homebaseTestResult = await validateHomebaseStoredData(
+  const testResult = await validateUpstreamStoredData(
     validatorFn, `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`);
-  t.ok(homebaseTestResult, 'snyk-monitor sent expected data to homebase in the expected timeframe');
+  t.ok(testResult, 'snyk-monitor sent expected data to kubernetes-upstream in the expected timeframe');
 
-  const depGraphResult = await getHomebaseResponseBody(
+  const depGraphResult = await getUpstreamResponseBody(
     `api/v1/dependency-graphs/${integrationId}/${clusterName}/${namespace}/${deploymentType}/${deploymentName}`);
   t.ok('dependencyGraphResults' in depGraphResult,
     'expected dependencyGraphResults field to exist in /dependency-graphs response');
   t.ok('imageMetadata' in JSON.parse(depGraphResult.dependencyGraphResults[imageName]),
-    'snyk-monitor sent expected data to homebase in the expected timeframe');
+    'snyk-monitor sent expected data to kubernetes-upstream in the expected timeframe');
 });
 
-tap.test('snyk-monitor pulls images from a private gcr.io registry and sends data to homebase', async (t) => {
+tap.test('snyk-monitor pulls images from a private gcr.io registry and sends data to kubernetes-upstream', async (t) => {
   t.plan(3);
 
   const deploymentName = 'debian-gcr-io';
@@ -152,19 +152,19 @@ tap.test('snyk-monitor pulls images from a private gcr.io registry and sends dat
         workload.type === WorkloadKind.Deployment) !== undefined;
   };
 
-  const homebaseTestResult = await validateHomebaseStoredData(
+  const testResult = await validateUpstreamStoredData(
     validatorFn, `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`);
-  t.ok(homebaseTestResult, 'snyk-monitor sent expected data to upstream in the expected timeframe');
+  t.ok(testResult, 'snyk-monitor sent expected data to upstream in the expected timeframe');
 
-  const depGraphResult = await getHomebaseResponseBody(
+  const depGraphResult = await getUpstreamResponseBody(
     `api/v1/dependency-graphs/${integrationId}/${clusterName}/${namespace}/${deploymentType}/${deploymentName}`);
   t.ok('dependencyGraphResults' in depGraphResult,
     'expected dependencyGraphResults field to exist in /dependency-graphs response');
   t.ok('imageMetadata' in JSON.parse(depGraphResult.dependencyGraphResults[imageName]),
     'snyk-monitor sent expected data to upstream in the expected timeframe');
 });
 
-tap.test('snyk-monitor pulls images from a private ECR and sends data to homebase', async (t) => {
+tap.test('snyk-monitor pulls images from a private ECR and sends data to kubernetes-upstream', async (t) => {
   if (process.env['TEST_PLATFORM'] !== 'eks') {
     t.pass('Not testing private ECR images because we\'re not running in EKS');
     return;
@@ -187,43 +187,43 @@ tap.test('snyk-monitor pulls images from a private ECR and sends data to homebas
         workload.type === WorkloadKind.Deployment) !== undefined;
   };
 
-  const homebaseTestResult = await validateHomebaseStoredData(
+  const testResult = await validateUpstreamStoredData(
     validatorFn, `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`);
-  t.ok(homebaseTestResult, 'snyk-monitor sent expected data to upstream in the expected timeframe');
+  t.ok(testResult, 'snyk-monitor sent expected data to upstream in the expected timeframe');
 
-  const depGraphResult = await getHomebaseResponseBody(
+  const depGraphResult = await getUpstreamResponseBody(
     `api/v1/dependency-graphs/${integrationId}/${clusterName}/${namespace}/${deploymentType}/${deploymentName}`);
   t.ok('dependencyGraphResults' in depGraphResult,
     'expected dependencyGraphResults field to exist in /dependency-graphs response');
   t.ok('imageMetadata' in JSON.parse(depGraphResult.dependencyGraphResults[imageName]),
     'snyk-monitor sent expected data to upstream in the expected timeframe');
 });
 
-tap.test('snyk-monitor sends deleted workload to homebase', async (t) => {
+tap.test('snyk-monitor sends deleted workload to kubernetes-upstream', async (t) => {
   // First ensure the deployment exists from the previous test
   const deploymentValidatorFn: WorkloadLocatorValidator = (workloads) => {
     return workloads !== undefined &&
       workloads.find((workload) => workload.name === 'nginx-deployment' &&
         workload.type === WorkloadKind.Deployment) !== undefined;
   };
 
-  const homebaseTestResult = await validateHomebaseStoredData(deploymentValidatorFn,
+  const testResult = await validateUpstreamStoredData(deploymentValidatorFn,
     `api/v2/workloads/${integrationId}/Default cluster/services`);
-  t.ok(homebaseTestResult, 'snyk-monitor sent expected data to homebase in the expected timeframe');
+  t.ok(testResult, 'snyk-monitor sent expected data to kubernetes-upstream in the expected timeframe');
 
   const deploymentName = 'nginx-deployment';
   const namespace = 'services';
   await kubectl.deleteDeployment(deploymentName, namespace);
 
-  // Finally, remove the workload and ensure that the snyk-monitor notifies Homebase
+  // Finally, remove the workload and ensure that the snyk-monitor notifies kubernetes-upstream
   const deleteValidatorFn: WorkloadLocatorValidator = (workloads) => {
     return workloads !== undefined && workloads.every((workload) => workload.name !== 'nginx-deployment');
   };
 
   const clusterName = 'Default cluster';
-  const homebaseDeleteTestResult = await validateHomebaseStoredData(deleteValidatorFn,
+  const deleteTestResult = await validateUpstreamStoredData(deleteValidatorFn,
     `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`);
-  t.ok(homebaseDeleteTestResult, 'snyk-monitor sent deleted workload data to homebase in the expected timeframe');
+  t.ok(deleteTestResult, 'snyk-monitor sent deleted workload data to kubernetes-upstream in the expected timeframe');
 });
 
 tap.test(`snyk-monitor has resource limits`, async (t) => {
@@ -277,7 +277,7 @@ tap.test('notify upstream of deleted pods that have no OwnerReference', async (t
     );
   };
 
-  const validationResult = await validateHomebaseStoredData(
+  const validationResult = await validateUpstreamStoredData(
     validatorFn,
     `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`,
   );
diff --git a/test/integration/package-manager.test.ts b/test/integration/package-manager.test.ts
@@ -3,7 +3,7 @@ import * as tap from 'tap';
 import { unlinkSync } from 'fs';
 import { resolve } from 'path';
 import { tmpdir } from 'os';
-import { validateHomebaseStoredData } from '../helpers/homebase';
+import { validateUpstreamStoredData } from '../helpers/kubernetes-upstream';
 import kubectl = require('../helpers/kubectl');
 import { deployMonitor, removeMonitor } from '../setup';
 import * as fixtureReader from './fixture-reader';
@@ -62,7 +62,7 @@ tap.test(
     // For every workload, create a promise that:
     // - creates a temporary deployment file for this workload (with the appropriate name and image)
     // - apply the deployment
-    // - clean up the temporary file, then await for the monitor to detect the workload and report to Homebase
+    // - clean up the temporary file, then await for the monitor to detect the workload and report to kubernetes-upstream
     const promisesToAwait = Object.keys(workloads).map((deploymentName) => {
       const imageName = workloads[deploymentName];
 
@@ -73,16 +73,16 @@ tap.test(
         .applyK8sYaml(tmpYamlPath)
         .then(() => {
           unlinkSync(tmpYamlPath);
-          return validateHomebaseStoredData(
+          return validateUpstreamStoredData(
             validatorFactory(deploymentName),
             `api/v2/workloads/${integrationId}/${clusterName}/${namespace}`,
             // Wait for up to ~16 minutes for this workload.
             // We are starting a lot of them in parallel so they may take a while to scan.
             200,
           );
         })
-        .then((homebaseResult) => {
-          t.ok(homebaseResult, `Deployed ${deploymentName} successfully`);
+        .then((upstreamResult) => {
+          t.ok(upstreamResult, `Deployed ${deploymentName} successfully`);
         });
     });
 
diff --git a/test/setup/index.ts b/test/setup/index.ts
@@ -47,7 +47,7 @@ function createTestYamlDeployment(
     value: integrationId,
   };
 
-  // Inject the baseUrl of homebase that snyk-monitor container use to send metadata
+  // Inject the baseUrl of kubernetes-upstream that snyk-monitor container use to send metadata
   deployment.spec.template.spec.containers[0].env[2] = {
     name: 'SNYK_INTEGRATION_API',
     value: 'https://kubernetes-upstream.dev.snyk.io',
