Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [18]
node-version: [20]

steps:
- uses: actions/checkout@v2
Expand All @@ -23,7 +23,7 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand Down
4 changes: 2 additions & 2 deletions lib/common/construct-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export async function prevalidateSecrets(pattern: string, region?: string, ...se
try {
await utils.validateSecret(secret, region ?? process.env.CDK_DEFAULT_REGION!);
}
catch(error) {
throw new Error(`${secret} secret must be setup for the ${pattern} pattern to work`);
catch(_error) {
throw new Error(`${secret} secret must be setup for the ${pattern} pattern to work` + _error);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions lib/existing-eks-opensource-observability-pattern/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export default class ExistingEksOpenSourceobservabilityPattern {
}

if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
ampAddOnProps.enableAPIServerJob = true,
ampAddOnProps.ampRules?.ruleFilePaths.push(
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export default class SingleNewEksFargateOpenSourceObservabilityConstruct {
}

if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
ampAddOnProps.enableAPIServerJob = true,
ampAddOnProps.ampRules?.ruleFilePaths.push(
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
}

if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
ampAddOnProps.enableAPIServerJob = true,
ampAddOnProps.ampRules?.ruleFilePaths.push(
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
}

if (utils.valueFromContext(scope, "apiserver.pattern.enabled", false)) {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
ampAddOnProps.enableAPIServerJob = true,
ampAddOnProps.ampRules?.ruleFilePaths.push(
__dirname + '/../common/resources/amp-config/apiserver/recording-rules.yml'
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cdk-aws-observability-accelerator",
"version": "1.7.0",
"version": "1.8.0",
"scripts": {
"build": "rm -rf dist && tsc --skipLibCheck",
"watch": "tsc -w",
Expand All @@ -10,33 +10,33 @@
"lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
},
"devDependencies": {
"@aws-quickstart/eks-blueprints": "1.16.3",
"@types/jest": "^29.5.11",
"@types/node": "^20.10.4",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"aws-cdk": "2.173.4",
"@aws-quickstart/eks-blueprints": "1.17.2",
"@types/jest": "^30.0.0",
"@types/node": "^24.0.13",
"@typescript-eslint/eslint-plugin": "^8.36.0",
"@typescript-eslint/parser": "^8.36.0",
"aws-cdk": "2.1020.2",
"copyfiles": "^2.4.1",
"eslint": "^8.56.0",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"ts-jest": "^29.4.0",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
"typescript": "^5.8.2"
},
"dependencies": {
"@kubecost/kubecost-eks-blueprints-addon": "^0.1.8",
"@aws-quickstart/eks-blueprints": "1.16.3",
"aws-cdk": "2.173.4",
"aws-cdk-lib": "2.173.4",
"@aws-quickstart/eks-blueprints": "1.17.2",
"aws-cdk": "2.1020.2",
"aws-cdk-lib": "2.204.0",
"aws-sdk": "^2.1455.0",
"constructs": "^10.3.0",
"eks-blueprints-cdk-kubeflow-ext": "0.1.9",
"source-map-support": "^0.5.21"
},
"overrides": {
"@aws-quickstart/eks-blueprints": "1.16.3",
"aws-cdk": "2.173.4",
"aws-cdk-lib": "2.173.4",
"@aws-quickstart/eks-blueprints": "1.17.2",
"aws-cdk": "2.1020.2",
"aws-cdk-lib": "2.204.0",
"xml2js": "0.5.0"
}
}