Preserve permissions using upkg (#1625)w

* changed upload to zip

* working state: permissions preserved.

* working state

* Format and regenerate messages

* reuse zip tool

* Format and regenerate messages

* refactoring

* nitpick

* print error on failure

* Format and regenerate messages

* cleanup temp dir

* ensure temp directory gets cleaned up

* nitpick

* Format and regenerate messages

* move write block to where the others are

* Format and regenerate messages

---------

Co-authored-by: Javier Matos <[email protected]>

Author: JavierMatosD

src/vcpkg/binarycaching.cpp

@@ -1335,12 +1335,12 @@ namespace
         ExpectedL<Unit> publish(const AzureUpkgSource& src,
                                 StringView package_name,
                                 StringView package_version,
-                                const Path& package_dir,
+                                const Path& zip_path,
                                 StringView description,
                                 MessageSink& sink) const
         {
             Command cmd = base_cmd(src, package_name, package_version, "publish");
-            cmd.string_arg("--description").string_arg(description).string_arg("--path").string_arg(package_dir);
+            cmd.string_arg("--description").string_arg(description).string_arg("--path").string_arg(zip_path);
             return run_az_artifacts_cmd(cmd, sink);
         }
 
@@ -1383,10 +1383,12 @@ namespace
             size_t count_stored = 0;
             auto ref = make_feedref(request, "");
             std::string package_description = "Cached package for " + ref.id;
+
+            const Path& zip_path = request.zip_path.value_or_exit(VCPKG_LINE_INFO);
             for (auto&& write_src : m_sources)
             {
-                auto res = m_azure_tool.publish(
-                    write_src, ref.id, ref.version, request.package_dir, package_description, msg_sink);
+                auto res =
+                    m_azure_tool.publish(write_src, ref.id, ref.version, zip_path, package_description, msg_sink);
                 if (res)
                 {
                     count_stored++;
@@ -1401,17 +1403,26 @@ namespace
         }
 
         bool needs_nuspec_data() const override { return false; }
-        bool needs_zip_file() const override { return false; }
+        bool needs_zip_file() const override { return true; }
 
     private:
         AzureUpkgTool m_azure_tool;
         std::vector<AzureUpkgSource> m_sources;
     };
 
-    struct AzureUpkgGetBinaryProvider : public IReadBinaryProvider
+    struct AzureUpkgGetBinaryProvider : public ZipReadBinaryProvider
     {
-        AzureUpkgGetBinaryProvider(const ToolCache& cache, MessageSink& sink, AzureUpkgSource source)
-            : m_azure_tool(cache, sink), m_sink(sink), m_source(source)
+        AzureUpkgGetBinaryProvider(ZipTool zip,
+                                   const Filesystem& fs,
+                                   const ToolCache& cache,
+                                   MessageSink& sink,
+                                   const AzureUpkgSource& source,
+                                   const Path& buildtrees)
+            : ZipReadBinaryProvider(std::move(zip), fs)
+            , m_azure_tool(cache, sink)
+            , m_sink(sink)
+            , m_source(std::move(source))
+            , m_buildtrees(buildtrees)
         {
         }
 
@@ -1424,21 +1435,32 @@ namespace
             return msg::format(msgRestoredPackagesFromAZUPKG, msg::count = count, msg::elapsed = ElapsedTime(elapsed));
         }
 
-        void fetch(View<const InstallPlanAction*> actions, Span<RestoreResult> out_status) const override
+        void acquire_zips(View<const InstallPlanAction*> actions, Span<Optional<ZipResource>> out_zips) const override
         {
             for (size_t i = 0; i < actions.size(); ++i)
             {
-                auto info = BinaryPackageReadInfo{*actions[i]};
-                auto ref = make_feedref(info, "");
-                auto res = m_azure_tool.download(m_source, ref.id, ref.version, info.package_dir, m_sink);
+                const auto& action = *actions[i];
+                const auto info = BinaryPackageReadInfo{action};
+                const auto ref = make_feedref(info, "");
 
-                if (res)
+                Path temp_dir = m_buildtrees / fmt::format("upkg_download_{}", info.package_abi);
+                Path temp_zip_path = temp_dir / fmt::format("{}.zip", ref.id);
+                Path final_zip_path = m_buildtrees / fmt::format("{}.zip", ref.id);
+
+                const auto result = m_azure_tool.download(m_source, ref.id, ref.version, temp_dir, m_sink);
+                if (result.has_value() && m_fs.exists(temp_zip_path, IgnoreErrors{}))
                 {
-                    out_status[i] = RestoreResult::restored;
+                    m_fs.rename(temp_zip_path, final_zip_path, VCPKG_LINE_INFO);
+                    out_zips[i].emplace(std::move(final_zip_path), RemoveWhen::always);
                 }
                 else
                 {
-                    out_status[i] = RestoreResult::unavailable;
+                    msg::println_warning(result.error());
+                }
+
+                if (m_fs.exists(temp_dir, IgnoreErrors{}))
+                {
+                    m_fs.remove(temp_dir, VCPKG_LINE_INFO);
                 }
             }
         }
@@ -1447,6 +1469,7 @@ namespace
         AzureUpkgTool m_azure_tool;
         MessageSink& m_sink;
         AzureUpkgSource m_source;
+        const Path& m_buildtrees;
     };
 
     ExpectedL<Path> default_cache_path_impl()
@@ -2413,7 +2436,8 @@ namespace vcpkg
             }
 
             if (!s.archives_to_read.empty() || !s.url_templates_to_get.empty() || !s.gcs_read_prefixes.empty() ||
-                !s.aws_read_prefixes.empty() || !s.cos_read_prefixes.empty() || s.gha_read)
+                !s.aws_read_prefixes.empty() || !s.cos_read_prefixes.empty() || s.gha_read ||
+                !s.upkg_templates_to_get.empty())
             {
                 ZipTool zip_tool;
                 zip_tool.setup(tools, out_sink);
@@ -2446,13 +2470,24 @@ namespace vcpkg
                         std::make_unique<ObjectStorageProvider>(zip_tool, fs, buildtrees, std::move(prefix), cos_tool));
                 }
 
+                for (auto&& src : s.upkg_templates_to_get)
+                {
+                    m_config.read.push_back(std::make_unique<AzureUpkgGetBinaryProvider>(
+                        zip_tool, fs, tools, out_sink, std::move(src), buildtrees));
+                }
+
                 if (s.gha_read)
                 {
                     const auto& url = *args.actions_cache_url.get();
                     const auto& token = *args.actions_runtime_token.get();
                     m_config.read.push_back(std::make_unique<GHABinaryProvider>(zip_tool, fs, buildtrees, url, token));
                 }
             }
+            if (!s.upkg_templates_to_put.empty())
+            {
+                m_config.write.push_back(
+                    std::make_unique<AzureUpkgPutBinaryProvider>(tools, out_sink, std::move(s.upkg_templates_to_put)));
+            }
             if (!s.archives_to_write.empty())
             {
                 m_config.write.push_back(
@@ -2502,20 +2537,6 @@ namespace vcpkg
                         nuget_base, std::move(s.sources_to_write), std::move(s.configs_to_write)));
                 }
             }
-
-            if (!s.upkg_templates_to_get.empty())
-            {
-                for (auto&& src : s.upkg_templates_to_get)
-                {
-                    m_config.read.push_back(
-                        std::make_unique<AzureUpkgGetBinaryProvider>(tools, out_sink, std::move(src)));
-                }
-            }
-            if (!s.upkg_templates_to_put.empty())
-            {
-                m_config.write.push_back(
-                    std::make_unique<AzureUpkgPutBinaryProvider>(tools, out_sink, std::move(s.upkg_templates_to_put)));
-            }
         }
 
         m_needs_nuspec_data = Util::any_of(m_config.write, [](auto&& p) { return p->needs_nuspec_data(); });