Merge pull request #116 from aws-observability/fix/blueprintsRelease

Upgrade Versions due to Blueprints Release
aws-observability · Oct 7, 2023 · 3123c85 · 3123c85
2 parents 8f07b19 + d1f6206
commit 3123c85
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts
@@ -118,7 +118,8 @@ export default class ExistingEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .clusterProvider(importClusterProvider)
             .resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))

diff --git a/lib/multi-acc-new-eks-mixed-observability-pattern/amp-monitoring.ts b/lib/multi-acc-new-eks-mixed-observability-pattern/amp-monitoring.ts
@@ -63,7 +63,8 @@ export default class AmpMonitoringConstruct {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .teams(new team.TeamGeordi, new team.CorePlatformTeam);

diff --git a/lib/single-new-eks-opensource-observability-pattern/gpu-index.ts b/lib/single-new-eks-opensource-observability-pattern/gpu-index.ts
@@ -75,7 +75,8 @@ export default class SingleNewEksGpuOpenSourceObservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(
                 new blueprints.GenericClusterProvider({

diff --git a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts b/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts
@@ -92,7 +92,8 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampAddOnProps,"v1.27.1-eksbuild.1")
+            .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(new blueprints.MngClusterProvider(mngProps))
             .addOns(...addOns)

diff --git a/lib/single-new-eks-opensource-observability-pattern/index.ts b/lib/single-new-eks-opensource-observability-pattern/index.ts
@@ -100,7 +100,8 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .build(scope, stackId);

diff --git a/package.json b/package.json
@@ -10,29 +10,29 @@
     "lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "devDependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.11.3",
+    "@aws-quickstart/eks-blueprints": "^1.12.0",
     "@types/jest": "^29.5.1",
-    "@types/node": "^18.15.12",
-    "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
+    "@types/node": "^18.17.5",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.38.0",
-    "jest": "^29.5.0",
+    "jest": "^29.6.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.11.3",
-    "aws-cdk": "2.91.0",
+    "@aws-quickstart/eks-blueprints": "^1.12.0",
+    "aws-cdk": "2.99.1",
     "aws-sdk": "^2.1455.0",
-    "constructs": "^10.0.0",
+    "constructs": "^10.2.33",
     "eks-blueprints-cdk-kubeflow-ext": "0.1.9",
     "source-map-support": "^0.5.21"
   },
   "overrides": {
-    "@aws-quickstart/eks-blueprints": "^1.11.3",
-    "aws-cdk": "2.91.0",
+    "@aws-quickstart/eks-blueprints": "^1.12.0",
+    "aws-cdk": "2.99.1",
     "xml2js": "0.5.0"
   }
-}
+}