Merge branch 'main' into link-to-rss-feeds-from-head

Author: emdash-ie

dotcom-rendering/.storybook/mocks/bridgetApi.ts

@@ -86,9 +86,9 @@ export const getDiscussionClient: BridgetApi<'getDiscussionClient'> = () => ({
 	recommend: async () => discussionErrorResponse,
 });
 
-export const getInteractionClient: BridgetApi<
-	'getInteractionClient'
-> = () => ({});
+export const getInteractionClient: BridgetApi<'getInteractionClient'> = () => ({
+	disableArticleSwipe: async () => void 0,
+});
 
 export const getInteractivesClient: BridgetApi<
 	'getInteractivesClient'

dotcom-rendering/cdk/lib/__snapshots__/renderingStack.test.ts.snap

@@ -1061,7 +1061,7 @@ exports[`The RenderingCDKStack matches the snapshot 1`] = `
           },
           {
             "Key": "access_logs.s3.prefix",
-            "Value": "ELBLogs/frontend/article-rendering/PROD",
+            "Value": "application-load-balancer/PROD/frontend/article-rendering",
           },
           {
             "Key": "idle_timeout.timeout_seconds",

dotcom-rendering/cdk/lib/renderingStack.ts

@@ -210,7 +210,8 @@ export class RenderingCDKStack extends CDKStack {
 			},
 			accessLogging: {
 				enabled: true,
-				prefix: `ELBLogs/${guStack}/${guApp}/${stage}`,
+				// This is the prefix pattern DevX assume so that the logs can be shown on the Availability dashboard.
+				prefix: `application-load-balancer/${stage}/${guStack}/${guApp}`,
 			},
 			applicationLogging: {
 				enabled: true,