diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2e436846..e70bc4d4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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: diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts index 1a137282..a36fe2c5 100644 --- a/lib/existing-eks-opensource-observability-pattern/index.ts +++ b/lib/existing-eks-opensource-observability-pattern/index.ts @@ -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' diff --git a/lib/single-new-eks-fargate-opensource-observability-pattern/index.ts b/lib/single-new-eks-fargate-opensource-observability-pattern/index.ts index ffaefd80..7c6ff2e3 100644 --- a/lib/single-new-eks-fargate-opensource-observability-pattern/index.ts +++ b/lib/single-new-eks-fargate-opensource-observability-pattern/index.ts @@ -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' diff --git a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts b/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts index db1b86b5..e5b1fad7 100644 --- a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts +++ b/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts @@ -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' diff --git a/lib/single-new-eks-opensource-observability-pattern/index.ts b/lib/single-new-eks-opensource-observability-pattern/index.ts index ea5db0d8..7368e6fe 100644 --- a/lib/single-new-eks-opensource-observability-pattern/index.ts +++ b/lib/single-new-eks-opensource-observability-pattern/index.ts @@ -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' diff --git a/package.json b/package.json index bfd7f962..0bdea734 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" } } \ No newline at end of file