fix: remove support for LEDs

README.md

@@ -30,16 +30,6 @@ npm ci
 npx cdk deploy
 ```
 
-## Support for the MQTT Sample
-
-Because the sample is not using the shadow, some manual work is needed to make
-it work:
-
-1. Create a thing type `rgb-light` (they cannot be created using
-   CloudFormation).
-1. Assign the thing type `rgb-light` to the thing which should act as a light
-   bulb.
-
 ## Authentication
 
 For changing the state of light bulbs, create a Thing attribute named `code` and

cdk/BackendLambdas.d.ts

@@ -10,5 +10,4 @@ type BackendLambdas = {
 	publishSummaries: PackedLambda
 	onNewNetworkSurvey: PackedLambda
 	onNetworkSurveyLocated: PackedLambda
-	lightbulbPing: PackedLambda
 }

cdk/backend.ts

@@ -45,7 +45,6 @@ new BackendApp({
 		publishSummaries: await pack('publishSummaries'),
 		onNewNetworkSurvey: await pack('onNewNetworkSurvey'),
 		onNetworkSurveyLocated: await pack('onNetworkSurveyLocated'),
-		lightbulbPing: await pack('lightbulbPing'),
 	},
 	layer: await packLayer({
 		id: 'baseLayer',

cdk/packLayer.ts

@@ -31,17 +31,20 @@ export const packLayer = async ({
 
 	await mkdir(nodejsDir, { recursive: true })
 
-	const depsToBeInstalled = dependencies.reduce((resolved, dep) => {
-		const resolvedDependency = deps[dep] ?? devDeps[dep]
-		if (resolvedDependency === undefined)
-			throw new Error(
-				`Could not resolve dependency "${dep}" in ${packageJsonFile}!`,
-			)
-		return {
-			...resolved,
-			[dep]: resolvedDependency,
-		}
-	}, {} as Record<string, string>)
+	const depsToBeInstalled = dependencies.reduce(
+		(resolved, dep) => {
+			const resolvedDependency = deps[dep] ?? devDeps[dep]
+			if (resolvedDependency === undefined)
+				throw new Error(
+					`Could not resolve dependency "${dep}" in ${packageJsonFile}!`,
+				)
+			return {
+				...resolved,
+				[dep]: resolvedDependency,
+			}
+		},
+		{} as Record<string, string>,
+	)
 
 	await writeFile(
 		path.join(nodejsDir, 'package.json'),

cdk/resources/PublishSummaries.ts

@@ -5,11 +5,11 @@ import {
 	aws_lambda as Lambda,
 	Duration,
 	Stack,
+	aws_logs as Logs,
 } from 'aws-cdk-lib'
 import type { IPrincipal } from 'aws-cdk-lib/aws-iam/index.js'
 import { Construct } from 'constructs'
 import type { PackedLambda } from '../backend.js'
-import { LambdaLogGroup } from '../resources/LambdaLogGroup.js'
 import type { WebsocketAPI } from './WebsocketAPI.js'
 
 /**
@@ -78,10 +78,9 @@ export class PublishSummaries extends Construct {
 					resources: ['*'],
 				}),
 			],
+			logRetention: Logs.RetentionDays.ONE_WEEK,
 		})
 
-		new LambdaLogGroup(this, 'Logs', lambda)
-
 		websocketAPI.connectionsTable.grantFullAccess(lambda)
 
 		const rule = new Events.Rule(this, 'Rule', {

cdk/resources/ResolveCellLocation.ts

@@ -6,10 +6,10 @@ import {
 	aws_iot as IoT,
 	aws_lambda as Lambda,
 	Stack,
+	aws_logs as Logs,
 } from 'aws-cdk-lib'
 import { Construct } from 'constructs'
 import type { PackedLambda } from '../backend.js'
-import { LambdaLogGroup } from '../resources/LambdaLogGroup.js'
 import type { WebsocketAPI } from './WebsocketAPI.js'
 
 export class ResolveCellLocation extends Construct {
@@ -66,11 +66,10 @@ export class ResolveCellLocation extends Construct {
 						resources: ['*'],
 					}),
 				],
+				logRetention: Logs.RetentionDays.ONE_WEEK,
 			},
 		)
 
-		new LambdaLogGroup(this, 'resolveCellLocationLogs', resolveCellLocation)
-
 		websocketAPI.connectionsTable.grantFullAccess(resolveCellLocation)
 
 		const resolveCellLocationRuleRole = new IAM.Role(
@@ -167,16 +166,11 @@ export class ResolveCellLocation extends Construct {
 					}),
 				],
 				layers: [baseLayer],
+				logRetention: Logs.RetentionDays.ONE_WEEK,
 			},
 		)
 		websocketAPI.connectionsTable.grantFullAccess(onCellGeoLocationResolved)
 
-		new LambdaLogGroup(
-			this,
-			'onCellGeoLocationResolvedLogGroup',
-			onCellGeoLocationResolved,
-		)
-
 		const publishCellGeolocationSuccessEventsRule = new Events.Rule(
 			this,
 			'publishCellGeolocationSuccessEventsRule',

cdk/resources/ResolveNetworkSurveyGeoLocation.ts

@@ -7,10 +7,10 @@ import {
 	aws_lambda as Lambda,
 	aws_lambda_event_sources as LambdaEvents,
 	Stack,
+	aws_logs as Logs,
 } from 'aws-cdk-lib'
 import { Construct } from 'constructs'
 import type { PackedLambda } from '../backend'
-import { LambdaLogGroup } from './LambdaLogGroup.js'
 import type { WebsocketAPI } from './WebsocketAPI'
 
 /**
@@ -71,10 +71,9 @@ export class ResolveNetworkSurveyGeoLocation extends Construct {
 					resources: ['*'],
 				}),
 			],
+			logRetention: Logs.RetentionDays.ONE_WEEK,
 		})
 
-		new LambdaLogGroup(this, 'onNewNetworkSurveyLogs', onNewNetworkSurvey)
-
 		websocketAPI.connectionsTable.grantFullAccess(onNewNetworkSurvey)
 
 		onNewNetworkSurvey.addEventSource(
@@ -118,17 +117,12 @@ export class ResolveNetworkSurveyGeoLocation extends Construct {
 					}),
 				],
 				layers: [baseLayer],
+				logRetention: Logs.RetentionDays.ONE_WEEK,
 			},
 		)
 		websocketAPI.connectionsTable.grantFullAccess(onNetworkSurveyLocated)
 		surveysTable.grantReadData(onNetworkSurveyLocated)
 
-		new LambdaLogGroup(
-			this,
-			'onNetworkSurveyLocatedLogGroup',
-			onNetworkSurveyLocated,
-		)
-
 		const publishNetworkSurveyGeolocationSuccessEventsRule = new Events.Rule(
 			this,
 			'publishNetworkSurveyGeolocationSuccessEventsRule',

cdk/resources/WebsocketAPI.ts

@@ -7,10 +7,10 @@ import {
 	aws_lambda as Lambda,
 	RemovalPolicy,
 	Stack,
+	aws_logs as Logs,
 } from 'aws-cdk-lib'
 import { Construct } from 'constructs'
 import type { PackedLambda } from '../backend.js'
-import { LambdaLogGroup } from '../resources/LambdaLogGroup.js'
 
 export class WebsocketAPI extends Construct {
 	public readonly websocketURI: string
@@ -82,10 +82,10 @@ export class WebsocketAPI extends Construct {
 			},
 			initialPolicy: [],
 			layers: [baseLayer],
+			logRetention: Logs.RetentionDays.ONE_WEEK,
 		})
 		this.connectionsTable.grantWriteData(onConnect)
 
-		new LambdaLogGroup(this, 'onConnectLogs', onConnect)
 		const connectIntegration = new ApiGateway.CfnIntegration(
 			this,
 			'connectIntegration',
@@ -117,27 +117,12 @@ export class WebsocketAPI extends Construct {
 			environment: {
 				VERSION: this.node.tryGetContext('version'),
 				CONNECTIONS_TABLE_NAME: this.connectionsTable.tableName,
-				WEBSOCKET_MANAGEMENT_API_URL: this.websocketManagementAPIURL,
 			},
-			initialPolicy: [
-				new IAM.PolicyStatement({
-					actions: ['iot:DescribeThing'],
-					resources: ['*'],
-				}),
-				new IAM.PolicyStatement({
-					actions: ['iot:Publish'],
-					resources: ['arn:aws:iot:*:*:topic/*/light-bulb/*'],
-				}),
-				new IAM.PolicyStatement({
-					actions: ['execute-api:ManageConnections'],
-					resources: [this.websocketAPIArn],
-				}),
-			],
 			layers: [baseLayer],
+			logRetention: Logs.RetentionDays.ONE_WEEK,
 		})
 		this.connectionsTable.grantReadWriteData(onMessage)
 
-		new LambdaLogGroup(this, 'onMessageLogs', onMessage)
 		const sendMessageIntegration = new ApiGateway.CfnIntegration(
 			this,
 			'sendMessageIntegration',
@@ -172,10 +157,10 @@ export class WebsocketAPI extends Construct {
 			},
 			initialPolicy: [],
 			layers: [baseLayer],
+			logRetention: Logs.RetentionDays.ONE_WEEK,
 		})
 		this.connectionsTable.grantWriteData(onDisconnect)
 
-		new LambdaLogGroup(this, 'onDisconnectLogs', onDisconnect)
 		const disconnectIntegration = new ApiGateway.CfnIntegration(
 			this,
 			'disconnectIntegration',
@@ -244,17 +229,12 @@ export class WebsocketAPI extends Construct {
 					}),
 				],
 				layers: [baseLayer],
+				logRetention: Logs.RetentionDays.ONE_WEEK,
 			},
 		)
 
 		this.connectionsTable.grantReadWriteData(publishToWebsocketClients)
 
-		new LambdaLogGroup(
-			this,
-			'publishToWebsocketClientsLogs',
-			publishToWebsocketClients,
-		)
-
 		const publishToWebsocketClientsRuleRole = new IAM.Role(
 			this,
 			'publishToWebsocketClientsRuleRole',