Merge pull request #51 from snyk-tech-services/fix/ensure-logging-pat…

…h-set Fix/ensure logging path set
snyk · Jun 16, 2020 · d89fe18 · d89fe18
2 parents c8266ec + 426789a
commit d89fe18
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -6,8 +6,10 @@ const debug = debugLib('snyk:import-projects-script');
 export * from './lib';
 import { ImportProjects } from './scripts/import-projects';
 import { getImportProjectsFile } from './lib/get-import-path';
+import { getLoggingPath } from './lib/get-logging-path';
 
 try {
+ getLoggingPath()
  const importFile = getImportProjectsFile();
  ImportProjects(importFile);
 } catch (e) {

diff --git a/src/lib/poll-import/index.ts b/src/lib/poll-import/index.ts
@@ -11,7 +11,7 @@ import { logFailedPollUrls } from '../../log-failed-polls';
 import { logImportedProjects } from '../../log-imported-projects';
 
 const debug = debugLib('snyk:poll-import');
-const MIN_RETRY_WAIT_TIME = 30000;
+const MIN_RETRY_WAIT_TIME = 20000;
 const MAX_RETRY_COUNT = 1000;
 
 export async function pollImportUrl(

diff --git a/test/lib/index.test.ts b/test/lib/index.test.ts
@@ -58,7 +58,7 @@ describe('Multiple targets', () => {
  process.env.SNYK_API = SNYK_API_TEST;
  process.env.SNYK_TOKEN = process.env.SNYK_TOKEN_TEST;
 
- it('importTargets &  pollImportUrls multiple repos', async () => {
+ it('importTargets & pollImportUrls multiple repos', async () => {
  logs = Object.values(generateLogsPaths(__dirname, ORG_ID));
  const pollingUrls = await importTargets([
  {

diff --git a/test/scripts/import-projects.test.ts b/test/scripts/import-projects.test.ts
@@ -190,6 +190,18 @@ describe('Error handling', () => {
  ),
  ).rejects.toThrow('Failed to parse targets from');
  }, 300);
+
+ it('shows correct error when SNYK_LOG_PATH is not set', async () => {
+ delete process.env.SNYK_LOG_PATH;
+ expect(
+ ImportProjects(
+ path.resolve(
+ __dirname +
+ '/fixtures/invalid-target/import-projects-invalid-target.json',
+ ),
+ ),
+ ).rejects.toThrow('Please set the SNYK_LOG_PATH e.g. export SNYK_LOG_PATH');
+ }, 300);
 });
 
 describe('Polling', () => {