From 528d47505347f22f89adef855143ac3ee6879fbe Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Fri, 19 Apr 2024 13:36:15 -0400
Subject: [PATCH] puppet: Factor out sentry-cli installation.

---
 puppet/zulip/manifests/hooks/sentry.pp | 20 ++------------------
 puppet/zulip/manifests/sentry_cli.pp   | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 puppet/zulip/manifests/sentry_cli.pp

diff --git a/puppet/zulip/manifests/hooks/sentry.pp b/puppet/zulip/manifests/hooks/sentry.pp
index 3623a7e28b..7458a05a0e 100644
--- a/puppet/zulip/manifests/hooks/sentry.pp
+++ b/puppet/zulip/manifests/hooks/sentry.pp
@@ -1,24 +1,8 @@
-# @summary Install sentry-cli binary and pre/post deploy hooks
+# @summary Install Sentry pre/post deploy hooks
 #
 class zulip::hooks::sentry {
   include zulip::hooks::base
-  $version = $zulip::common::versions['sentry-cli']['version']
-  $bin = "/srv/zulip-sentry-cli-${version}"
-
-  $arch = $facts['os']['architecture'] ? {
-    'amd64'   => 'x86_64',
-    'aarch64' => 'aarch64',
-  }
-
-  zulip::external_dep { 'sentry-cli':
-    version => $version,
-    url     => "https://downloads.sentry-cdn.com/sentry-cli/${version}/sentry-cli-Linux-${arch}",
-  }
-
-  file { '/usr/local/bin/sentry-cli':
-    ensure => link,
-    target => $bin,
-  }
+  include zulip::sentry_cli
 
   zulip::hooks::file { [
     'common/sentry.sh',
diff --git a/puppet/zulip/manifests/sentry_cli.pp b/puppet/zulip/manifests/sentry_cli.pp
new file mode 100644
index 0000000000..43f5263898
--- /dev/null
+++ b/puppet/zulip/manifests/sentry_cli.pp
@@ -0,0 +1,23 @@
+# @summary Install sentry-cli binary
+#
+class zulip::sentry_cli {
+  $version = $zulip::common::versions['sentry-cli']['version']
+  $bin = "/srv/zulip-sentry-cli-${version}"
+
+  $arch = $facts['os']['architecture'] ? {
+    'amd64'   => 'x86_64',
+    'aarch64' => 'aarch64',
+  }
+
+  zulip::external_dep { 'sentry-cli':
+    version => $version,
+    url     => "https://downloads.sentry-cdn.com/sentry-cli/${version}/sentry-cli-Linux-${arch}",
+  }
+
+  file { '/usr/local/bin/sentry-cli':
+    ensure  => link,
+    target  => $bin,
+    require => File[$bin],
+    before  => Exec['Cleanup sentry-cli'],
+  }
+}