Merge pull request #288 from snyk/chore/supervisor-scanner-continued

chore: organising more code to the supervisor/scanner

Author: Amir Moualem

src/scanner/image/index.ts

@@ -1,7 +1,7 @@
 import * as plugin from 'snyk-docker-plugin';
 import logger = require('../../common/logger');
 import { IStaticAnalysisOptions, StaticAnalysisImageType } from '../types';
-import { IPullableImage } from '../../images/types';
+import { IPullableImage } from '../images/types';
 import config = require('../../common/config');
 import { IScanResult } from '../types';
 

src/images/credentials.ts renamed to src/scanner/images/credentials.ts

@@ -1,6 +1,6 @@
 import * as aws from 'aws-sdk';
 
-import logger = require('../common/logger');
+import logger = require('../../common/logger');
 
 export async function getSourceCredentials(imageSource: string): Promise<string | undefined> {
   // TODO is this the best way we can determine the image's source?

src/images/index.ts renamed to src/scanner/images/index.ts

@@ -1,4 +1,4 @@
-import logger = require('../common/logger');
+import logger = require('../../common/logger');
 import { pull as skopeoCopy, getDestinationForImage } from './skopeo';
 import { unlink } from 'fs';
 import { IPullableImage } from './types';

src/images/skopeo.ts renamed to src/scanner/images/skopeo.ts

@@ -1,7 +1,7 @@
 import { SpawnPromiseResult } from 'child-process-promise';
 
-import * as processWrapper from '../common/process';
-import * as config from'../common/config';
+import * as processWrapper from '../../common/process';
+import * as config from '../../common/config';
 import * as credentials from './credentials';
 import { SkopeoRepositoryType } from './types';
 

src/images/types.ts renamed to src/scanner/images/types.ts

@@ -1,10 +1,10 @@
 import logger = require('../common/logger');
-import { pullImages, removePulledImages, getImagesWithFileSystemPath } from '../images';
+import { pullImages, removePulledImages, getImagesWithFileSystemPath } from './images';
 import { scanImages } from './image';
 import { deleteWorkload, sendDepGraph } from '../transmitter';
 import { constructDeleteWorkloadPayload, constructDepGraph } from '../transmitter/payload';
 import { IWorkload, ILocalWorkloadLocator } from '../transmitter/types';
-import { IPullableImage } from '../images/types';
+import { IPullableImage } from './images/types';
 
 export = class WorkloadWorker {
   private readonly name: string;

src/scanner/index.ts

@@ -1,6 +1,6 @@
 import * as tap from 'tap';
 
-import * as credentials from '../../src/images/credentials';
+import * as credentials from '../../../src/scanner/images/credentials';
 
 tap.test('ecrRegionFromFullImageName()', async (t) => {
   const imageFullNameTemplate = 'aws_account_id.dkr.ecr.region.amazonaws.com/my-web-app:latest';

test/unit/image-registry-credentials.test.ts renamed to test/unit/scanner/image-registry-credentials.test.ts

@@ -1,7 +1,7 @@
 import * as tap from 'tap';
-import { getImagesWithFileSystemPath, pullImages } from '../../src/images';
-import { IPullableImage } from '../../src/images/types';
-import config = require('../../src/common/config');
+import { getImagesWithFileSystemPath, pullImages } from '../../../src/scanner/images';
+import { IPullableImage } from '../../../src/scanner/images/types';
+import config = require('../../../src/common/config');
 
 tap.test('getImagesWithFileSystemPath()', async (t) => {
   const noImages: string[] = [];

test/unit/images.test.ts renamed to test/unit/scanner/images.test.ts

@@ -1,6 +1,6 @@
 import * as tap from 'tap';
 
-import * as skopeo from '../../src/images/skopeo';
+import * as skopeo from '../../../src/scanner/images/skopeo';
 
 tap.test('getCredentialParameters()', async (t) => {
   const noCredentials = undefined;