@@ -22,8 +22,8 @@ import {HOST_ADDRESS} from 'gcp-metadata';
2222import * as nock from 'nock' ;
2323import { Duplex } from 'stream' ;
2424import * as uuid from 'uuid' ;
25- import * as http2spy from 'http2spy' ;
26- import { Logging , Sink } from '../src' ;
25+ const http2spy = require ( 'http2spy' ) ;
26+ import { Logging , Sink , Log , Entry } from '../src' ;
2727
2828// block all attempts to chat with the metadata server (kokoro runs on GCE)
2929nock ( HOST_ADDRESS )
@@ -99,7 +99,8 @@ describe('Logging', () => {
9999 async function getAndDelete ( method : Function ) {
100100 const [ objects ] = await method ( ) ;
101101 return Promise . all (
102- objects
102+ // tslint:disable-next-line no-any
103+ ( objects as any [ ] )
103104 . filter ( o => {
104105 const name = o . name || o . id ;
105106 if ( ! name . startsWith ( TESTS_PREFIX ) ) {
@@ -242,7 +243,10 @@ describe('Logging', () => {
242243 return { log, logEntries} ;
243244 }
244245
245- function getEntriesFromLog ( log , callback ) {
246+ function getEntriesFromLog (
247+ log : Log ,
248+ callback : ( err : Error | null , entries ?: Entry [ ] ) => void
249+ ) {
246250 let numAttempts = 0 ;
247251
248252 setTimeout ( pollForMessages , WRITE_CONSISTENCY_DELAY_MS ) ;
@@ -303,7 +307,7 @@ describe('Logging', () => {
303307
304308 getEntriesFromLog ( log , ( err , entries ) => {
305309 assert . ifError ( err ) ;
306- assert . strictEqual ( entries . length , logEntries . length ) ;
310+ assert . strictEqual ( entries ! . length , logEntries . length ) ;
307311 done ( ) ;
308312 } ) ;
309313 } ) ;
@@ -327,7 +331,8 @@ describe('Logging', () => {
327331 } ) ;
328332
329333 describe ( 'log-specific entries' , ( ) => {
330- let logExpected , logEntriesExpected ;
334+ let logExpected : Log ;
335+ let logEntriesExpected : Entry [ ] ;
331336
332337 before ( done => {
333338 const { log, logEntries} = getTestLog ( ) ;
@@ -339,7 +344,7 @@ describe('Logging', () => {
339344 it ( 'should list log entries' , done => {
340345 getEntriesFromLog ( logExpected , ( err , entries ) => {
341346 assert . ifError ( err ) ;
342- assert . strictEqual ( entries . length , logEntriesExpected . length ) ;
347+ assert . strictEqual ( entries ! . length , logEntriesExpected . length ) ;
343348 done ( ) ;
344349 } ) ;
345350 } ) ;
@@ -377,7 +382,7 @@ describe('Logging', () => {
377382 getEntriesFromLog ( log , ( err , entries ) => {
378383 assert . ifError ( err ) ;
379384
380- assert . deepStrictEqual ( entries . map ( x => x . data ) . reverse ( ) , [
385+ assert . deepStrictEqual ( entries ! . map ( x => x . data ) . reverse ( ) , [
381386 'log entry 1' ,
382387 { delegate : 'my_username' } ,
383388 {
@@ -595,7 +600,7 @@ describe('Logging', () => {
595600 // Parse the time the resource was created using the resource id
596601 // Format 1: ${TESTS_PREFIX}-${date}-${uuid}
597602 // Format 2: ${TESTS_PREFIX}_${date}_${uuid}
598- function getDateFromGeneratedName ( name ) {
603+ function getDateFromGeneratedName ( name : string ) {
599604 const timeCreated = name . substr ( TESTS_PREFIX . length + 1 ) . split ( / - | _ / g) [ 0 ] ;
600605 return new Date ( Number ( timeCreated ) ) ;
601606 }
0 commit comments