Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
],
"dependencies": {
"@apollo/server": "^4.11.0",
"@console/console-platform-log4js-utils": "^4.1.0",
"@graphql-tools/schema": "^9.0.12",
"@graphql-tools/utils": "^9.1.3",
"@ibm-cloud/platform-services": "^0.47.0",
Expand Down
5 changes: 2 additions & 3 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import dotenv from 'dotenv';
import * as loggerUtils from '@console/console-platform-log4js-utils';
import NodeCache from 'node-cache';
import * as log4js from 'log4js';import NodeCache from 'node-cache';
import { Pool, PoolConfig } from 'pg';
import tmp from 'tmp';
import fs from 'fs';
Expand Down Expand Up @@ -132,7 +131,7 @@ function generateGcpKeyFile(): string {
return tmpFile.name;
}

const logger = loggerUtils.getLogger('cloud-pricing-api');
const logger = log4js.getLogger('cloud-pricing-api');

const cache = new NodeCache();

Expand Down
12 changes: 6 additions & 6 deletions src/scrapers/awsBulk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ async function downloadService(offer: Offer, prefix?: string) {
`data/${prefix}-${offer.offerCode}-${region.regionCode}.json`
);
resp.data.pipe(writer);
await new Promise((resolve) => {
writer.on('finish', resolve);
});
await new Promise<void>((resolve) => {
writer.on('finish', () => resolve());
});
}
} else {
config.logger.info(`Downloading ${offer.currentVersionUrl}`);
Expand All @@ -153,8 +153,8 @@ async function downloadService(offer: Offer, prefix?: string) {
`data/${prefix}-${offer.offerCode}.json`
);
resp.data.pipe(writer);
await new Promise((resolve) => {
writer.on('finish', resolve);
await new Promise<void>((resolve) => {
writer.on('finish', () => resolve());
});
}
}
Expand Down Expand Up @@ -257,4 +257,4 @@ function parsePrices(

export default {
scrape,
};
};
4 changes: 2 additions & 2 deletions src/scrapers/gcpCatalog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ async function downloadService(service: ServiceJson): Promise<void> {
filename = `data/${filename}.json`;
const writer = fs.createWriteStream(filename);
resp.data.pipe(writer);
await new Promise((resolve) => {
writer.on('finish', resolve);
await new Promise<void>((resolve) => {
writer.on('finish', () => resolve());
});

const body = fs.readFileSync(filename);
Expand Down
10 changes: 7 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"compilerOptions": {
"target": "ES2015",
"module": "commonjs",
"sourceMap": true,
"outDir": "dist",
"strict": true,
"lib": ["esnext","dom"],
"lib": ["esnext", "dom"],
"esModuleInterop": true,
"declaration": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
},
"include": [
"src/**/*"
],
}
]
}