Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions packages/apollo-datasource-axios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"@types/http-cache-semantics": "^4.0.0",
"@types/jest": "^24.0.13",
"@types/nock": "^10.0.3",
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"graphql": "^14.3.1",
"jest": "^24.8.0",
"nock": "^10.0.6",
"prettier": "^1.17.1",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0"
"typescript": "^4.1.6"
},
"jest": {
"preset": "../../jest-preset.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-datasource-axios/src/AxiosDataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export abstract class AxiosDataSource extends DataSource {
async request(config: AxiosRequestConfig) {
try {
return await this.api.request(config);
} catch (error) {
} catch (error: any) {
if (error.response) {
const {
status,
Expand Down
4 changes: 2 additions & 2 deletions packages/avro-logical-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"devDependencies": {
"@types/jest": "^24.0.13",
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"avsc": "^5.4.10",
"jest": "^24.8.0",
"kafka-node": "^4.1.3",
Expand All @@ -28,7 +28,7 @@
"ts-jest": "^24.0.2",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0"
"typescript": "^4.1.6"
},
"jest": {
"preset": "../../jest-preset.json"
Expand Down
4 changes: 2 additions & 2 deletions packages/avro-stream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"@ovotech/avro-logical-types": "^1.0.0",
"@types/jest": "^24.0.13",
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"@types/node-fetch": "^2.3.5",
"@types/stream-mock": "^1.2.0",
"@types/uuid": "^3.4.4",
Expand All @@ -35,7 +35,7 @@
"ts-jest": "^24.0.2",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0",
"typescript": "^4.1.6",
"uuid": "^3.3.2"
},
"jest": {
Expand Down
2 changes: 1 addition & 1 deletion packages/avro-stream/src/AvroDeserializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class AvroDeserializer extends AvroSchemaTransform {
const type = this.typeForSchema(schema);
const transformedMessage: AvroMessage = { ...message, schema, value: type.fromBuffer(buffer) };
callback(undefined, transformedMessage);
} catch (error) {
} catch (error: any) {
callback(new AvroDeserializerError(error.message, message, encoding, error));
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/avro-stream/src/AvroSerializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class AvroSerializer<TValue = any> extends AvroSchemaTransform {
...request,
messages: request.messages.map(message => constructMessage({ schemaId, buffer: type.toBuffer(message) })),
});
} catch (error) {
} catch (error: any) {
callback(new AvroSerializerError<TValue>(error.message, request, encoding, error));
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/avro-stream/src/MockAvroSerializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class MockAvroSerializer<TValue = any> extends AvroSchemaTransform {
messages.forEach(message => this.push(message));

callback();
} catch (error) {
} catch (error: any) {
callback(new AvroSerializerError<TValue>(error.message, request, encoding, error));
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/avro-stream/test/AvroDeserializer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('AvroDeserializer test', () => {

sourceStream.pipe(serializer).pipe(sinkStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
sinkStream.on('finish', () => {
expect(schemaResolverMock.fromId).toHaveBeenCalledTimes(4);
expect(schemaResolverMock.fromId).toHaveBeenNthCalledWith(1, 1);
Expand All @@ -61,7 +61,7 @@ describe('AvroDeserializer test', () => {

sourceStream.pipe(serializer).pipe(sinkStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
serializer.on('error', (error: AvroDeserializerError) => {
expect(error).toBeInstanceOf(AvroDeserializerError);
expect(error).toMatchObject({
Expand Down
4 changes: 2 additions & 2 deletions packages/avro-stream/test/AvroSerializer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('Integration test', () => {

sourceStream.pipe(serializer).pipe(sinkStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
sinkStream.on('finish', () => {
expect(schemaResolverMock.toId).toHaveBeenCalledTimes(2);
expect(schemaResolverMock.toId).toHaveBeenCalledWith(sourceData[0].topic, sourceData[0].schema);
Expand Down Expand Up @@ -84,7 +84,7 @@ describe('Integration test', () => {

sourceStream.pipe(serializer).pipe(sinkStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
serializer.on('error', (error: AvroSerializerError) => {
expect(error).toBeInstanceOf(AvroSerializerError);
expect(error).toMatchObject({
Expand Down
20 changes: 11 additions & 9 deletions packages/avro-stream/test/integration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { AvroSerializer } from '../src';
const createTopics = async (topics: string[]) => {
const producer = new Producer(new KafkaClient({ kafkaHost: 'localhost:29092' }));

await new Promise(resolve => producer.on('ready', resolve));
await new Promise<void>(resolve => producer.on('ready', resolve));

return await new Promise((resolve, reject) =>
return await new Promise<void>((resolve, reject) =>
producer.createTopics(topics, false, error => {
if (error) {
reject(error);
Expand Down Expand Up @@ -52,7 +52,7 @@ describe('Integration test', () => {

sourceStream.pipe(serializer).pipe(sinkStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
sinkStream.on('finish', async () => {
for (const [itemIndex, item] of sinkStream.data.entries()) {
const type = Type.forSchema(item.schema);
Expand All @@ -71,7 +71,7 @@ describe('Integration test', () => {
});
});

it('Test Deserializer with kafka', async () => {
it('Test Deserializer with kafka', async (cb) => {
const sourceStream = new ReadableMock(unqiueSourceData, { objectMode: true });
const sinkStream = new WritableMock({ objectMode: true });
const topics = unqiueSourceData.map(item => item.topic);
Expand All @@ -96,7 +96,7 @@ describe('Integration test', () => {
consumerStream.pipe(deserializer).pipe(sinkStream);
sourceStream.pipe(serializer).pipe(producerStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
sinkStream.on('finish', () => {
for (let index = 0; index < messagesCount; index++) {
expect(sinkStream.data[index]).toMatchSnapshot({
Expand All @@ -109,9 +109,10 @@ describe('Integration test', () => {
consumerStream.close(resolve);
});
});
}, 15000);
cb()
}, 25000);

it('Test AvroTopicSender with kafka', async () => {
it('Test AvroTopicSender with kafka', async (cb) => {
const topic = uuid.v4();
const sender = new AvroTopicSender<{ accountId: string }>({
topic,
Expand Down Expand Up @@ -145,7 +146,7 @@ describe('Integration test', () => {
stopStreamOnCount(1, consumerStream);
sender.send({ accountId: '234' });

await new Promise(resolve => {
await new Promise<void>(resolve => {
sinkStream.on('finish', () => {
expect(sinkStream.data).toEqual([
expect.objectContaining({
Expand All @@ -158,5 +159,6 @@ describe('Integration test', () => {
consumerStream.close(resolve);
});
});
}, 15000);
cb();
}, 25000);
});
2 changes: 1 addition & 1 deletion packages/avro-stream/test/mocks.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('Integration test', () => {

sourceStream.pipe(serializer).pipe(sinkStream);

await new Promise(resolve => {
await new Promise<void>(resolve => {
sinkStream.on('finish', () => {
expect(sinkStream.data).toMatchSnapshot();
resolve();
Expand Down
4 changes: 2 additions & 2 deletions packages/axios-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
},
"devDependencies": {
"@types/jest": "^24.0.13",
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"axios": "^0.21.1",
"jest": "^24.8.0",
"prettier": "^1.17.1",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0"
"typescript": "^4.1.6"
},
"jest": {
"preset": "../../jest-preset.json"
Expand Down
4 changes: 2 additions & 2 deletions packages/bigquery-pg-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"pg": "*"
},
"devDependencies": {
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"@types/pg": "^7.4.14",
"pg": "^7.11.0",
"prettier": "^1.17.1",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0",
"typescript": "^4.1.6",
"uuid": "^3.3.2"
},
"jest": {
Expand Down
4 changes: 2 additions & 2 deletions packages/bigquery-pg-sink/src/PGSinkStream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class BigQueryPGSinkStream extends Writable {
await this.pg.query(insert.query, insert.values);
}
callback();
} catch (error) {
} catch (error: any) {
callback(new Error(error));
}
}
Expand All @@ -36,7 +36,7 @@ export class BigQueryPGSinkStream extends Writable {
await this.pg.query(insert.query, insert.values);
}
callback();
} catch (error) {
} catch (error: any) {
callback(new Error(error));
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/config-file/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
},
"devDependencies": {
"@types/jest": "^24.0.13",
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"jest": "^24.8.0",
"prettier": "^1.17.1",
"ts-jest": "^24.0.2",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0"
"typescript": "^4.1.6"
},
"jest": {
"preset": "../../jest-preset.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/config-file/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const loadConfigFile = <T>({ env, file, defaults = {}, required = [] }: L

const missingKeys = required.filter(key => !Object.keys(userConfig).includes(String(key)));
if (missingKeys.length) {
throw new Error(`Configuration should include ${missingKeys.map(key => `"${key}"`).join(', ')} in ${file}`);
throw new Error(`Configuration should include ${missingKeys.map(key => `"${String(key)}"`).join(', ')} in ${file}`);
}
const config = resolveValues(userConfig, env);

Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-metrics-tracker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"ts-jest": "^24.0.2",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0"
"typescript": "^4.1.6"
},
"jest": {
"preset": "../../jest-preset.json"
Expand Down
4 changes: 2 additions & 2 deletions packages/datadog-metrics-tracker/src/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export abstract class MetricsTracker {
value,
});
return;
} catch (err) {
} catch (err: any) {
this.logger.error('Error tracking Datadog metric', {
metric: measurementName,
tags: JSON.stringify(validTags),
Expand All @@ -63,7 +63,7 @@ export abstract class MetricsTracker {
return Object.entries(tags)
.filter(([_, value]) => value?.length === 0)
.reduce((names: string[], [key, _]) => names.concat([key]), []);
} catch (error) {
} catch (error: any) {
this.logger.error('Error Datadog metric - getInvalidTagNames', {
metric: measurementName,
tags: JSON.stringify(tags),
Expand Down
2 changes: 1 addition & 1 deletion packages/influx-metrics-tracker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"ts-jest": "^24.0.2",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0"
"typescript": "^4.1.6"
},
"jest": {
"preset": "../../jest-preset.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/influx-metrics-tracker/src/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export abstract class MetricsTracker {
timestamp: timestamp || new Date(),
});
return;
} catch (err) {
} catch (err: any) {
this.logger.error('Error tracking Influx metric', {
metric: measurementName,
tags: JSON.stringify(validTags),
Expand Down
4 changes: 2 additions & 2 deletions packages/kafka-avro-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@types/jest": "^24.0.13",
"@types/node": "^11.11.4",
"@types/node": "^14.14.31",
"@types/node-fetch": "^2.3.5",
"@types/stream-mock": "^1.2.0",
"@types/supports-color": "^5.3.0",
Expand All @@ -46,7 +46,7 @@
"ts-node": "^8.2.0",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.7.0",
"typescript": "^4.1.6",
"uuid": "^3.3.2"
},
"jest": {
Expand Down
6 changes: 3 additions & 3 deletions packages/kafka-avro-cli/src/cli/commands/create-topic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const createTopic: CommandModule<{}, CreateTopicArgs> = {
const client = new KafkaClient(kafkaClient);
const { topic, partitions, 'replication-factor': replicationFactor } = args;

await new Promise(resolve => client.on('ready', resolve));
await new Promise(resolve => client.on('ready', () => resolve(null)));

try {
await new Promise((resolve, reject) =>
Expand All @@ -39,12 +39,12 @@ export const createTopic: CommandModule<{}, CreateTopicArgs> = {
partitions,
)} {green replication factor} ${String(replicationFactor)}\n`,
);
client.close(resolve);
client.close(() => resolve(null));
}
}
}),
);
} catch (error) {
} catch (error: any) {
process.stderr.write(chalk`{red Error ${error.message}}\n`);
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kafka-avro-cli/src/cli/commands/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const schema: CommandModule<{}, SchemaArgs> = {
process.stdout.write(`${item}\n`);
}
}
} catch (error) {
} catch (error: any) {
process.stderr.write(chalk`{red Error ${error.message}}\n`);
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kafka-avro-cli/src/cli/commands/topic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const topic: CommandModule<{}, TopicArgs> = {

const client = new KafkaClient(kafkaClient);

await new Promise(resolve => client.on('ready', resolve));
await new Promise(resolve => client.on('ready', () => resolve(null)));

const [, { metadata }] = await new Promise<MetadataResult>((resolve, reject) =>
(client as any).loadMetadataForTopics([], (error: Error | null, results: any) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export class StopOnFinishProgressTransform extends Transform {
super({ objectMode: true });
}

async _transform(message: ProgressMessage, encoding: string, callback: TransformCallback) {
async _transform(message: ProgressMessage, encoding: BufferEncoding, callback: TransformCallback) {
this.push(message, encoding);

if (this.active && message.progress.total >= 1) {
Expand Down
Loading