Upgraded libraries, removed vulnerabilities, blueprints upgraded to 1…

….13.1 (#157)
aws-samples · Dec 29, 2023 · 5443da3 · 5443da3
1 parent a4aa232
commit 5443da3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/lib/dynatrace-construct/index.ts b/lib/dynatrace-construct/index.ts
@@ -10,10 +10,7 @@ export default class DynatraceOperatorConstruct {
         // AddOns for the cluster
         const stackId = `${id}-blueprint`;
 
-        const DynatraceOperator = new DynatraceAddOn({
-            // Setup ssmSecret dynatrace-tokens described here (https://github.com/dynatrace-oss/dynatrace-eks-blueprints-addon#aws-secret-manager-secrets)
-            ssmSecretName: 'dynatrace-tokens'
-        });
+        const DynatraceOperator = new DynatraceAddOn();
 
         EksBlueprint.builder()
             .account(process.env.CDK_DEFAULT_ACCOUNT!)

diff --git a/lib/rafay-construct/index.ts b/lib/rafay-construct/index.ts
@@ -5,19 +5,19 @@ import * as cdk from 'aws-cdk-lib';
 
 export default class RafayConstruct {
     async buildAsync(scope: cdk.App, id: string) {
-        await prevalidateSecrets(RafayConstruct.name, undefined, 'rafay-password-secret');
-        const stackId = `${id}-blueprint`;
-
         let rafayConfig = {
             organizationName: "rafay-eks-org-1", // replace with your organization Name
             email: "[email protected]", // replace with your email
             firstName: "John", // replace with your first Name
             lastName: "Doe", // replace with your last Name
-            passwordSecret: "rafay-password-secret", // replace with a secret name in secrets manager that you have created
+            passwordSecret: "rafay-password-json", // replace with a secret name in secrets manager that you have created, must contain a single field "password"
             clusterName: "eks-cluster-1", // replace with the name that you want the cluster to be created in Rafay Console
             blueprintName: "minimal"
         } as rafayAddOn.RafayConfig;
 
+        await prevalidateSecrets(RafayConstruct.name, undefined, rafayConfig.passwordSecret!);
+        const stackId = `${id}-blueprint`;
+
         const addOns: Array<blueprints.ClusterAddOn> = [
             new rafayAddOn.RafayClusterAddOn(rafayConfig)
         ];

diff --git a/package.json b/package.json
@@ -12,21 +12,21 @@
     "lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.1",
-    "@types/node": "^18.17.5",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.10.5",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "@typescript-eslint/parser": "^6.15.0",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.38.0",
-    "jest": "^29.6.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "eslint": "^8.56.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.12.0",
+    "@aws-quickstart/eks-blueprints": "1.13.1",
     "@datadog/datadog-eks-blueprints-addon": "^0.1.2",
-    "@dynatrace/dynatrace-eks-blueprints-addon": "^0.0.3",
+    "@dynatrace/dynatrace-eks-blueprints-addon": "^0.0.4",
     "@claranet-ch/konveyor-eks-blueprint-addon": "^1.0.2",
     "@kastenhq/kasten-eks-blueprints-addon": "^1.0.1",
     "@keptn/keptn-controlplane-eks-blueprints-addon": "^0.5.0",
@@ -35,17 +35,21 @@
     "@newrelic/newrelic-eks-blueprints-addon": "^1.0.9",
     "@paralus/paralus-eks-blueprints-addon": "^0.1.5",
     "@rafaysystems/rafay-eks-blueprints-addon": "^0.0.2",
-    "@snyk-partners/snyk-monitor-eks-blueprints-addon": "^1.1.0",
-    "aws-cdk": "2.99.1",
-    "@aws-sdk/client-eks": "^3.316.0",
+    "@snyk-partners/snyk-monitor-eks-blueprints-addon": "^1.1.1",
+    "aws-cdk": "2.115.0",
+    "aws-cdk-lib": "2.115.0",
+    "@aws-sdk/client-eks": "^3.478.0",
     "eks-blueprints-cdk-kubeflow-ext": "0.1.9",
     "source-map-support": "^0.5.21",
     "@instana/aws-eks-blueprint-addon": "^1.0.4",
     "@granulate/gmaestro-eks-blueprints-addon": "^1.0.16"
   },
   "overrides": {
-    "@aws-quickstart/eks-blueprints": "^1.12.0",
-    "aws-cdk": "2.99.1",
-    "xml2js": "0.5.0"
+    "@aws-quickstart/eks-blueprints": "1.13.1",
+    "aws-cdk": "2.115.0",
+    "aws-cdk-lib": "2.115.0",
+    "xml2js": "0.5.0",
+    "@aws-cdk/core": "../_EXCLUDED_",
+    "axios": "^1.6.2"
   }
 }