From 075ebf7a569eb4b77899900becf0d5f144c65863 Mon Sep 17 00:00:00 2001
From: Clare Liguori <liguori@amazon.com>
Date: Sun, 1 Oct 2023 15:28:01 -0700
Subject: [PATCH] Use pre-installed version of npm in CodeBuild

---
 canaries/buildspec.yml                                           | 1 -
 chat-bot/buildspec.yml                                           | 1 -
 chat-bot/lex-model/buildspec.yml                                 | 1 -
 static-site/buildspec.yml                                        | 1 -
 trivia-backend/infra/cdk/buildspec.yml                           | 1 -
 trivia-backend/infra/codedeploy-blue-green/buildspec.yml         | 1 -
 .../infra/codedeploy-lifecycle-event-hooks/buildspec.yml         | 1 -
 7 files changed, 7 deletions(-)

diff --git a/canaries/buildspec.yml b/canaries/buildspec.yml
index 60f068e1e..c09566817 100644
--- a/canaries/buildspec.yml
+++ b/canaries/buildspec.yml
@@ -6,7 +6,6 @@ phases:
       nodejs: latest
     commands:
       - cd canaries
-      - npm install -g npm@latest
       - npm ci
       - export CANARY_CODE_FILENAME=trivia-game-canary-code-`echo $CODEBUILD_BUILD_ID | awk -F":" '{print $2}'`.zip
   build:
diff --git a/chat-bot/buildspec.yml b/chat-bot/buildspec.yml
index 37b7d900e..f669e794a 100644
--- a/chat-bot/buildspec.yml
+++ b/chat-bot/buildspec.yml
@@ -6,7 +6,6 @@ phases:
       nodejs: latest
     commands:
       - cd chat-bot/bot
-      - npm install -g npm@latest
       - npm ci
       - cd ..
   build:
diff --git a/chat-bot/lex-model/buildspec.yml b/chat-bot/lex-model/buildspec.yml
index e55937a50..1e0dbafcc 100644
--- a/chat-bot/lex-model/buildspec.yml
+++ b/chat-bot/lex-model/buildspec.yml
@@ -8,7 +8,6 @@ phases:
       - export AWS_ACCOUNT_ID=`echo $CODEBUILD_BUILD_ARN | awk -F":" '{print $5}'`
       - cd chat-bot/lex-model
       - chmod +x gen-lex-model.sh
-      - npm install -g npm@latest
       - npm ci
   build:
     commands:
diff --git a/static-site/buildspec.yml b/static-site/buildspec.yml
index e145f24d1..64f925595 100644
--- a/static-site/buildspec.yml
+++ b/static-site/buildspec.yml
@@ -10,7 +10,6 @@ phases:
       nodejs: latest
     commands:
       # Install dependencies for both site content and for CDK
-      - npm install -g npm@latest
       - npm install -g aws-cdk
       - cd static-site/app
       - npm ci
diff --git a/trivia-backend/infra/cdk/buildspec.yml b/trivia-backend/infra/cdk/buildspec.yml
index 113c569db..3e0b180ab 100644
--- a/trivia-backend/infra/cdk/buildspec.yml
+++ b/trivia-backend/infra/cdk/buildspec.yml
@@ -11,7 +11,6 @@ phases:
     commands:
       # Install CDK & jq, upgrade npm
       - yum install -y jq
-      - npm install -g npm@latest
       - npm install -g aws-cdk
 
   pre_build:
diff --git a/trivia-backend/infra/codedeploy-blue-green/buildspec.yml b/trivia-backend/infra/codedeploy-blue-green/buildspec.yml
index 79de3a8ec..06b46ffcf 100644
--- a/trivia-backend/infra/codedeploy-blue-green/buildspec.yml
+++ b/trivia-backend/infra/codedeploy-blue-green/buildspec.yml
@@ -10,7 +10,6 @@ phases:
       nodejs: latest
     commands:
       - yum install -y jq
-      - npm install -g npm@latest
 
   pre_build:
     commands:
diff --git a/trivia-backend/infra/codedeploy-lifecycle-event-hooks/buildspec.yml b/trivia-backend/infra/codedeploy-lifecycle-event-hooks/buildspec.yml
index 36e67a7cb..292206e52 100644
--- a/trivia-backend/infra/codedeploy-lifecycle-event-hooks/buildspec.yml
+++ b/trivia-backend/infra/codedeploy-lifecycle-event-hooks/buildspec.yml
@@ -6,7 +6,6 @@ phases:
       nodejs: latest
     commands:
       - cd trivia-backend/infra/codedeploy-lifecycle-event-hooks
-      - npm install -g npm@latest
       - npm ci
   build:
     commands: