From f9a39b6703b9a91e87f74c4b2906b839d4de3582 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Fri, 31 Dec 2021 17:09:38 -0800
Subject: [PATCH] puppet: Manage extracted resources again.

1e4e6a09af23 removed the resources for the unpacked directory, on the
argument that they were unnecessary.  However, the directory (or file,
see below) that is unpacked must be managed, or it will be tidied on
the next puppet apply.

Add back the resource for `$dir`, but mark it `ensure => present`, to
support tarballs which only unpack to a single file (e.g. wal-g).
---
 puppet/zulip/manifests/external_dep.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/puppet/zulip/manifests/external_dep.pp b/puppet/zulip/manifests/external_dep.pp
index 6da9432b07..2fff928958 100644
--- a/puppet/zulip/manifests/external_dep.pp
+++ b/puppet/zulip/manifests/external_dep.pp
@@ -29,6 +29,11 @@ define zulip::external_dep(
     },
   }
 
+  file { $dir:
+    ensure  => present,
+    require => Zulip::Sha256_Tarball_To[$title],
+  }
+
   unless $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '18.04' {
     # Puppet 5.5.0 and below make this always-noisy, as they spout out
     # a notify line about tidying the managed directory above.  Skip
@@ -39,7 +44,7 @@ define zulip::external_dep(
       recurse => 1,
       rmdirs  => true,
       matches => "zulip-${title}-*",
-      require => Zulip::Sha256_Tarball_To[$title],
+      require => File[$dir],
     }
   }
 }