Skip to content

Commit 28a24b5

Browse files
authored
Merge pull request #188 from aws-observability/releasePrep/V1.8.0
Release prep/v1.8.0
2 parents 0aa9c34 + 26487e0 commit 28a24b5

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [18]
15+
node-version: [20]
1616

1717
steps:
1818
- uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
2323
node-version: ${{ matrix.node-version }}
2424

2525
- name: Cache node modules
26-
uses: actions/cache@v2
26+
uses: actions/cache@v4
2727
env:
2828
cache-name: cache-node-modules
2929
with:

lib/common/construct-utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ export async function prevalidateSecrets(pattern: string, region?: string, ...se
2727
try {
2828
await utils.validateSecret(secret, region ?? process.env.CDK_DEFAULT_REGION!);
2929
}
30-
catch(error) {
31-
throw new Error(`${secret} secret must be setup for the ${pattern} pattern to work`);
30+
catch(_error) {
31+
throw new Error(`${secret} secret must be setup for the ${pattern} pattern to work` + _error);
3232
}
3333
}
3434
}

lib/existing-eks-opensource-observability-pattern/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ export default class ExistingEksOpenSourceobservabilityPattern {
120120
}
121121

122122
if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
123+
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
123124
ampAddOnProps.enableAPIServerJob = true,
124125
ampAddOnProps.ampRules?.ruleFilePaths.push(
125126
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'

lib/single-new-eks-fargate-opensource-observability-pattern/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default class SingleNewEksFargateOpenSourceObservabilityConstruct {
9494
}
9595

9696
if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
97+
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
9798
ampAddOnProps.enableAPIServerJob = true,
9899
ampAddOnProps.ampRules?.ruleFilePaths.push(
99100
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'

lib/single-new-eks-opensource-observability-pattern/graviton-index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
125125
}
126126

127127
if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
128+
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
128129
ampAddOnProps.enableAPIServerJob = true,
129130
ampAddOnProps.ampRules?.ruleFilePaths.push(
130131
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'

lib/single-new-eks-opensource-observability-pattern/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
127127
}
128128

129129
if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
130+
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
130131
ampAddOnProps.enableAPIServerJob = true,
131132
ampAddOnProps.ampRules?.ruleFilePaths.push(
132133
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cdk-aws-observability-accelerator",
3-
"version": "1.7.0",
3+
"version": "1.8.0",
44
"scripts": {
55
"build": "rm -rf dist && tsc --skipLibCheck",
66
"watch": "tsc -w",
@@ -10,33 +10,33 @@
1010
"lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
1111
},
1212
"devDependencies": {
13-
"@aws-quickstart/eks-blueprints": "1.16.3",
14-
"@types/jest": "^29.5.11",
15-
"@types/node": "^20.10.4",
16-
"@typescript-eslint/eslint-plugin": "^6.15.0",
17-
"@typescript-eslint/parser": "^6.15.0",
18-
"aws-cdk": "2.173.4",
13+
"@aws-quickstart/eks-blueprints": "1.17.2",
14+
"@types/jest": "^30.0.0",
15+
"@types/node": "^24.0.13",
16+
"@typescript-eslint/eslint-plugin": "^8.36.0",
17+
"@typescript-eslint/parser": "^8.36.0",
18+
"aws-cdk": "2.1020.2",
1919
"copyfiles": "^2.4.1",
2020
"eslint": "^8.56.0",
2121
"jest": "^29.7.0",
22-
"ts-jest": "^29.1.1",
22+
"ts-jest": "^29.4.0",
2323
"ts-node": "^10.9.2",
24-
"typescript": "^5.3.3"
24+
"typescript": "^5.8.2"
2525
},
2626
"dependencies": {
2727
"@kubecost/kubecost-eks-blueprints-addon": "^0.1.8",
28-
"@aws-quickstart/eks-blueprints": "1.16.3",
29-
"aws-cdk": "2.173.4",
30-
"aws-cdk-lib": "2.173.4",
28+
"@aws-quickstart/eks-blueprints": "1.17.2",
29+
"aws-cdk": "2.1020.2",
30+
"aws-cdk-lib": "2.204.0",
3131
"aws-sdk": "^2.1455.0",
3232
"constructs": "^10.3.0",
3333
"eks-blueprints-cdk-kubeflow-ext": "0.1.9",
3434
"source-map-support": "^0.5.21"
3535
},
3636
"overrides": {
37-
"@aws-quickstart/eks-blueprints": "1.16.3",
38-
"aws-cdk": "2.173.4",
39-
"aws-cdk-lib": "2.173.4",
37+
"@aws-quickstart/eks-blueprints": "1.17.2",
38+
"aws-cdk": "2.1020.2",
39+
"aws-cdk-lib": "2.204.0",
4040
"xml2js": "0.5.0"
4141
}
4242
}

0 commit comments

Comments
 (0)