Skip to content

Commit 5f213ff

Browse files
DanielCliftonGuardianDanielCliftonGuardian
authored
Merge branch 'main' into improve-dev
2 parents dc3fcad + 1d01676 commit 5f213ff

File tree

96 files changed

+2395
-2285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+2395
-2285
lines changed

‎.github/workflows/ar-chromatic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Chromatic - Apps Rendering
4040
env:
4141
NODE_OPTIONS: '--max_old_space_size=4096'
42-
uses: chromaui/action@v11.3.0
42+
uses: chromaui/action@v11.27.0
4343

4444
with:
4545
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN__APPS_RENDERING }}

‎.github/workflows/dcr-chromatic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Chromatic - DCR
4040
env:
4141
NODE_OPTIONS: '--max_old_space_size=4096'
42-
uses: chromaui/action@v11.3.0
42+
uses: chromaui/action@v11.27.0
4343
with:
4444
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN__DOTCOM_RENDERING }}
4545
token: ${{ secrets.GITHUB_TOKEN }}

‎dotcom-rendering/cdk/bin/cdk.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ new RenderingCDKStack(cdkApp, 'ArticleRendering-PROD', {
2828
stage: 'PROD',
2929
domainName: 'article-rendering.guardianapis.com',
3030
scaling: {
31-
minimumInstances: 27,
32-
maximumInstances: 270,
31+
minimumInstances: 24,
32+
maximumInstances: 240,
3333
policies: {
3434
step: {
3535
cpu: cpuScalingSteps,
@@ -52,7 +52,7 @@ new RenderingCDKStack(cdkApp, 'ArticleRendering-PROD', {
5252
},
5353
},
5454
},
55-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
55+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
5656
});
5757

5858
/** Facia */
@@ -68,8 +68,8 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
6868
stage: 'PROD',
6969
domainName: 'facia-rendering.guardianapis.com',
7070
scaling: {
71-
minimumInstances: 30,
72-
maximumInstances: 180,
71+
minimumInstances: 21,
72+
maximumInstances: 210,
7373
policies: {
7474
step: {
7575
cpu: cpuScalingSteps,
@@ -92,7 +92,7 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
9292
},
9393
},
9494
},
95-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
95+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
9696
});
9797

9898
/** Tag pages */
@@ -108,8 +108,8 @@ new RenderingCDKStack(cdkApp, 'TagPageRendering-PROD', {
108108
stage: 'PROD',
109109
domainName: 'tag-page-rendering.guardianapis.com',
110110
scaling: {
111-
minimumInstances: 15,
112-
maximumInstances: 150,
111+
minimumInstances: 9,
112+
maximumInstances: 90,
113113
policies: {
114114
step: {
115115
cpu: cpuScalingSteps,
@@ -132,7 +132,7 @@ new RenderingCDKStack(cdkApp, 'TagPageRendering-PROD', {
132132
},
133133
},
134134
},
135-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
135+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
136136
});
137137

138138
/** Interactive */
@@ -172,5 +172,5 @@ new RenderingCDKStack(cdkApp, 'InteractiveRendering-PROD', {
172172
},
173173
},
174174
},
175-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
175+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
176176
});

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

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,24 @@ exports[`The RenderingCDKStack matches the snapshot 1`] = `
282282
"MetricName": "CPUUtilization",
283283
"Namespace": "AWS/EC2",
284284
"Period": 30,
285+
"Tags": [
286+
{
287+
"Key": "gu:cdk:version",
288+
"Value": "TEST",
289+
},
290+
{
291+
"Key": "gu:repo",
292+
"Value": "guardian/dotcom-rendering",
293+
},
294+
{
295+
"Key": "Stack",
296+
"Value": "frontend",
297+
},
298+
{
299+
"Key": "Stage",
300+
"Value": "PROD",
301+
},
302+
],
285303
"Threshold": 70,
286304
"Unit": "Percent",
287305
},
@@ -652,6 +670,24 @@ exports[`The RenderingCDKStack matches the snapshot 1`] = `
652670
"ReturnData": false,
653671
},
654672
],
673+
"Tags": [
674+
{
675+
"Key": "gu:cdk:version",
676+
"Value": "TEST",
677+
},
678+
{
679+
"Key": "gu:repo",
680+
"Value": "guardian/dotcom-rendering",
681+
},
682+
{
683+
"Key": "Stack",
684+
"Value": "frontend",
685+
},
686+
{
687+
"Key": "Stage",
688+
"Value": "PROD",
689+
},
690+
],
655691
"Threshold": 0.5,
656692
"TreatMissingData": "notBreaching",
657693
},
@@ -827,6 +863,24 @@ exports[`The RenderingCDKStack matches the snapshot 1`] = `
827863
"Namespace": "AWS/ApplicationELB",
828864
"Period": 30,
829865
"Statistic": "Average",
866+
"Tags": [
867+
{
868+
"Key": "gu:cdk:version",
869+
"Value": "TEST",
870+
},
871+
{
872+
"Key": "gu:repo",
873+
"Value": "guardian/dotcom-rendering",
874+
},
875+
{
876+
"Key": "Stack",
877+
"Value": "frontend",
878+
},
879+
{
880+
"Key": "Stage",
881+
"Value": "PROD",
882+
},
883+
],
830884
"Threshold": 0.15,
831885
},
832886
"Type": "AWS::CloudWatch::Alarm",
@@ -885,6 +939,24 @@ exports[`The RenderingCDKStack matches the snapshot 1`] = `
885939
"Namespace": "AWS/ApplicationELB",
886940
"Period": 30,
887941
"Statistic": "Average",
942+
"Tags": [
943+
{
944+
"Key": "gu:cdk:version",
945+
"Value": "TEST",
946+
},
947+
{
948+
"Key": "gu:repo",
949+
"Value": "guardian/dotcom-rendering",
950+
},
951+
{
952+
"Key": "Stack",
953+
"Value": "frontend",
954+
},
955+
{
956+
"Key": "Stage",
957+
"Value": "PROD",
958+
},
959+
],
888960
"Threshold": 0.2,
889961
},
890962
"Type": "AWS::CloudWatch::Alarm",
@@ -1336,6 +1408,24 @@ exports[`The RenderingCDKStack matches the snapshot 1`] = `
13361408
"Namespace": "AWS/ApplicationELB",
13371409
"Period": 60,
13381410
"Statistic": "Maximum",
1411+
"Tags": [
1412+
{
1413+
"Key": "gu:cdk:version",
1414+
"Value": "TEST",
1415+
},
1416+
{
1417+
"Key": "gu:repo",
1418+
"Value": "guardian/dotcom-rendering",
1419+
},
1420+
{
1421+
"Key": "Stack",
1422+
"Value": "frontend",
1423+
},
1424+
{
1425+
"Key": "Stage",
1426+
"Value": "PROD",
1427+
},
1428+
],
13391429
"Threshold": 1,
13401430
"TreatMissingData": "notBreaching",
13411431
},

‎dotcom-rendering/fixtures/manual/footballData.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { FootballMatches, Regions } from '../../src/footballMatches';
1+
import type { FootballMatches, Region } from '../../src/footballMatches';
22

3-
export const regions: Regions = [
3+
export const regions: Region[] = [
44
{
55
name: 'England',
66
competitions: [
@@ -45,6 +45,21 @@ export const initialDays: FootballMatches = [
4545
},
4646
status: '1st',
4747
},
48+
{
49+
kind: 'Live',
50+
dateTimeISOString: new Date(
51+
'2022-01-01T11:11:00Z',
52+
).toISOString(),
53+
paId: '12345',
54+
homeTeam: {
55+
name: 'Fiorentina',
56+
},
57+
awayTeam: {
58+
name: 'Bologna',
59+
},
60+
status: 'S',
61+
comment: 'Awaiting officials decision',
62+
},
4863
{
4964
kind: 'Fixture',
5065
dateTimeISOString: new Date(

‎dotcom-rendering/fixtures/manual/footballMatches.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ export const matchDayLive: FEMatchDay = {
7070
},
7171
};
7272

73+
export const matchDayLiveSecondHalf: FEMatchDay = {
74+
...matchDayLive,
75+
matchStatus: 'SHS',
76+
};
77+
7378
export const liveMatch: FELive = {
7479
...matchData,
7580
type: 'LiveMatch',

‎dotcom-rendering/fixtures/manual/show-more-trails.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Exporting this 'as' FEFrontCard because we know it should be of the right shape.
55
*/
66

7-
import type { FEFrontCard } from '../../src/types/front';
7+
import type { FEFrontCard } from '../../src/frontend/feFront';
88

99
export const trails: [
1010
FEFrontCard,

‎dotcom-rendering/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@guardian/bridget": "8.1.0",
4242
"@guardian/browserslist-config": "6.1.0",
4343
"@guardian/cdk": "50.13.0",
44-
"@guardian/commercial": "25.0.0",
44+
"@guardian/commercial": "26.0.0",
4545
"@guardian/core-web-vitals": "7.0.0",
4646
"@guardian/eslint-config": "7.0.1",
4747
"@guardian/eslint-config-typescript": "9.0.1",
@@ -50,7 +50,7 @@
5050
"@guardian/libs": "22.0.0",
5151
"@guardian/ophan-tracker-js": "2.2.5",
5252
"@guardian/react-crossword": "2.0.2",
53-
"@guardian/react-crossword-next": "npm:@guardian/react-crossword@0.0.0-canary-20250307143039",
53+
"@guardian/react-crossword-next": "npm:@guardian/react-crossword@4.1.0",
5454
"@guardian/shimport": "1.0.2",
5555
"@guardian/source": "8.0.0",
5656
"@guardian/source-development-kitchen": "12.0.0",
@@ -113,8 +113,8 @@
113113
"ajv": "8.17.1",
114114
"ajv-formats": "2.1.1",
115115
"amphtml-validator": "1.0.35",
116-
"aws-cdk": "2.100.0",
117-
"aws-cdk-lib": "2.100.0",
116+
"aws-cdk": "2.179.0",
117+
"aws-cdk-lib": "2.179.0",
118118
"babel-loader": "9.2.1",
119119
"babel-plugin-polyfill-corejs3": "0.11.1",
120120
"babel-plugin-transform-runtime": "6.23.0",

‎dotcom-rendering/playwright/lib/load-page.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,30 +98,6 @@ const loadPageWithOverrides = async (
9898
await loadPage({ page, path, queryParamsOn: false });
9999
};
100100

101-
/**
102-
* Allows us to continue using cookies for signed in features
103-
* until we figure out how to use Okta in e2e testing.
104-
* See https://github.com/guardian/dotcom-rendering/issues/8758
105-
*/
106-
const loadPageNoOkta = async (
107-
page: Page,
108-
article: FEArticleType,
109-
overrides?: {
110-
configOverrides?: Record<string, unknown>;
111-
switchOverrides?: Record<string, unknown>;
112-
},
113-
): Promise<void> => {
114-
await loadPageWithOverrides(page, article, {
115-
configOverrides: overrides?.configOverrides,
116-
switchOverrides: {
117-
...overrides?.switchOverrides,
118-
okta: false,
119-
idCookieRefresh: false,
120-
userFeaturesDcr: true,
121-
},
122-
});
123-
};
124-
125101
/**
126102
* Fetch the page json from PROD then load it as a POST with overrides
127103
*/
@@ -148,6 +124,5 @@ export {
148124
BASE_URL,
149125
fetchAndloadPageWithOverrides,
150126
loadPage,
151-
loadPageNoOkta,
152127
loadPageWithOverrides,
153128
};

0 commit comments

Comments
 (0)