From 38bf1c5d228f5727d4d3e8e39726049fd2944963 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 29 Jan 2024 14:57:39 -0500
Subject: [PATCH] install-aws-cli: Move into puppet files.

---
 .../zulip_ops/files/install-aws-cli                           | 0
 tools/setup/bootstrap-aws-installer                           | 2 +-
 tools/setup/install-aws-server                                | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/setup/bootstrap-awscli.sh => puppet/zulip_ops/files/install-aws-cli (100%)

diff --git a/tools/setup/bootstrap-awscli.sh b/puppet/zulip_ops/files/install-aws-cli
similarity index 100%
rename from tools/setup/bootstrap-awscli.sh
rename to puppet/zulip_ops/files/install-aws-cli
diff --git a/tools/setup/bootstrap-aws-installer b/tools/setup/bootstrap-aws-installer
index 9efec06e8a..048bb190e0 100644
--- a/tools/setup/bootstrap-aws-installer
+++ b/tools/setup/bootstrap-aws-installer
@@ -38,7 +38,7 @@ export DEBIAN_FRONTEND=noninteractive
     apt-get -qy autoclean
 )
 
-# The following line gets subbed in with the contents of bootstrap-awscli.sh
+# The following line gets subbed in with the contents of install-aws-cli
 AWS=
 
 # Set up a bare-bones AWS configuration
diff --git a/tools/setup/install-aws-server b/tools/setup/install-aws-server
index 2d0640b395..3ed4aa0b76 100755
--- a/tools/setup/install-aws-server
+++ b/tools/setup/install-aws-server
@@ -78,7 +78,7 @@ set -x
 
 cd "$(dirname "$0")"
 
-source ./bootstrap-awscli.sh
+source ./../../puppet/zulip_ops/files/install-aws-cli
 
 zulip_install_config_file="$HOME/.zulip-install-server.conf"
 if [ ! -f "$zulip_install_config_file" ]; then
@@ -157,7 +157,7 @@ BOOTDATA=$(mktemp)
     echo "REPO_URL=$REPO_URL"
     echo "BRANCH=$BRANCH"
     echo "SSH_SECRET_ID=$SSH_SECRET_ID"
-    sed '/^AWS=/ r ./bootstrap-awscli.sh' bootstrap-aws-installer
+    sed '/^AWS=/ r ./../../puppet/zulip_ops/files/install-aws-cli' bootstrap-aws-installer
 } >>"$BOOTDATA"
 
 TAG_ROLE_NAMES="$ROLES"