fix: add null check on pagination

Author: coderbyheart

Diff for: cdk/createThingGroup.ts

@@ -2,6 +2,7 @@ import { Iot } from 'aws-sdk'
 import { CloudFormationCustomResourceEvent } from 'aws-lambda'
 import { paginate } from '../util/paginate'
 import { cfnResponse, ResponseStatus } from '@bifravst/cloudformation-helpers'
+import { isNullOrUndefined } from 'util'
 
 const iot = new Iot()
 
@@ -32,7 +33,7 @@ export const handler = async (
 					thingGroupProperties: ThingGroupProperties,
 				})
 				.promise()
-			if (thingGroupArn === undefined) {
+			if (isNullOrUndefined(thingGroupArn)) {
 				throw new Error(`Failed to create thing group ${ThingGroupName}!`)
 			}
 			await iot

Diff for: cdk/helper/getIotEndpoint.ts

@@ -1,11 +1,12 @@
 import { Iot } from 'aws-sdk'
+import { isNullOrUndefined } from 'util'
 
 export const getIotEndpoint = async (iot: Iot): Promise<string> =>
 	iot
 		.describeEndpoint({ endpointType: 'iot:Data-ATS' })
 		.promise()
 		.then(({ endpointAddress }) => {
-			if (endpointAddress === undefined) {
+			if (isNullOrUndefined(endpointAddress)) {
 				throw new Error(`Failed to resolved AWS IoT endpoint`)
 			}
 			return endpointAddress

Diff for: cdk/helper/getLambdaSourceCodeBucketName.ts

@@ -1,5 +1,6 @@
 import { CloudFormation } from 'aws-sdk'
 import { stackId } from '../stacks/stackId'
+import { isNullOrUndefined } from 'util'
 
 const cf = new CloudFormation({
 	region: process.env.AWS_DEFAULT_REGION,
@@ -13,7 +14,7 @@ export const getLambdaSourceCodeBucketName = async (): Promise<string> => {
 		})
 		.promise()
 		.then(({ Stacks }) => {
-			if (Stacks === undefined || !Stacks.length) {
+			if (isNullOrUndefined(Stacks) || !Stacks.length) {
 				throw new Error(`${StackName} stack is not available.`)
 			} else {
 				const stack = Stacks[0]

Diff for: cli/commands/purge-iot-user-policy-principals.ts

@@ -18,29 +18,28 @@ export const purgeIotUserPolicyPrincipals = ({
 		const policyName = userIotPolicyArn?.split('/').pop() as string
 		const iot = new Iot({ region })
 		await paginate({
-			paginator: async (marker?: any) =>
-				iot
+			paginator: async (marker?: any) => {
+				const { principals, nextMarker } = await iot
 					.listPolicyPrincipals({
 						policyName,
 						marker,
 					})
 					.promise()
-					.then(async ({ principals, nextMarker }) => {
-						await Promise.all(
-							principals?.map(async (principal) => {
-								console.log(
-									`Detaching principal ${principal} from policy ${policyName} ...`,
-								)
-								return iot
-									.detachPrincipalPolicy({
-										policyName,
-										principal,
-									})
-									.promise()
-							}) ?? [],
+				await Promise.all(
+					principals?.map(async (principal) => {
+						console.log(
+							`Detaching principal ${principal} from policy ${policyName} ...`,
 						)
-						return nextMarker
-					}),
+						return iot
+							.detachPrincipalPolicy({
+								policyName,
+								principal,
+							})
+							.promise()
+					}) ?? [],
+				)
+				return nextMarker
+			},
 		})
 	},
 	help: 'Purges all principals from the user IoT policy',

Diff for: feature-runner/steps/bifravst.ts

@@ -11,10 +11,7 @@ import * as path from 'path'
 import { device, thingShadow } from 'aws-iot-device-sdk'
 import { deviceFileLocations } from '../../cli/jitp/deviceFileLocations'
 import { expect } from 'chai'
-
-const isNullOrUndefined = (arg?: unknown | null): boolean =>
-	arg === undefined || arg === null
-const isNotNullOrUndefined = (arg?: unknown | null) => !isNullOrUndefined(arg)
+import { isNotNullOrUndefined } from '../../util/isNullOrUndefined'
 
 const connect = (mqttEndpoint: string) => (clientId: string) => {
 	const deviceFiles = deviceFileLocations({

Diff for: historicalData/collectFiles.ts

@@ -1,4 +1,8 @@
 import { S3 } from 'aws-sdk'
+import {
+	isNotNullOrUndefined,
+	isNullOrUndefined,
+} from '../util/isNullOrUndefined'
 
 export type CollectFilesArgs = {
 	Prefix: string
@@ -42,14 +46,14 @@ export const collectFiles = ({
 					if (d >= notAfterDate) {
 						return files
 					}
-					if (files[d] === undefined) {
+					if (isNullOrUndefined(files[d])) {
 						files[d] = [file]
 					} else {
 						files[d].push(file)
 					}
 					return files
 				}, files ?? {})
-			if (NextMarker !== undefined) {
+			if (isNotNullOrUndefined(NextMarker)) {
 				return collectFiles({ Bucket, s3 })({
 					files: f,
 					Marker: NextMarker,

Diff for: package-lock.json

@@ -0,0 +1,5 @@
+export const isNullOrUndefined = (arg?: unknown | null): boolean =>
+	arg === undefined || arg === null
+
+export const isNotNullOrUndefined = (arg?: unknown | null): boolean =>
+	!isNullOrUndefined(arg)

Diff for: util/isNullOrUndefined.ts

@@ -1,3 +1,5 @@
+import { isNotNullOrUndefined } from './isNullOrUndefined'
+
 /**
  * Iteratively follows paginated results.
  * NOTE: This method has no upper runtime limit and may time out.
@@ -10,7 +12,7 @@ export const paginate = async ({
 	startKey?: any
 }): Promise<void> => {
 	const nextStartKey = await paginator(startKey)
-	if (nextStartKey !== undefined) {
+	if (isNotNullOrUndefined(nextStartKey)) {
 		await paginate({
 			paginator,
 			startKey: nextStartKey,