Index.json in Consolidated zip stores full path, not just hash #1416
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rain-on
changed the title
flin-8
reviewed
Dec 18, 2024
| @@ -39,7 +39,8 @@ public IReadOnlyList<SourceFile> GetSourceFiles(ILogger log) | |||
| IsNupkg = false, | |||
| FullNameInDestinationArchive = string.Join("/", parts.Skip(1)), | |||
| FullNameInSourceArchive = entry.FullName, | |||
| Hash = hasher.Hash(entry) | |||
| Hash = hasher.Hash(entry), | |||
| FileName = parts.Last() | |||
There was a problem hiding this comment.
FWIW entry.Name should give you the file name
APErebus
reviewed
Dec 19, 2024
| var entryName = Path.Combine(uniqueFile.Hash, uniqueFile.FullNameInDestinationArchive); | ||
| var entry = zip.CreateEntry(entryName, CompressionLevel.Fastest); | ||
|
|
||
| var entry = zip.CreateEntry(uniqueFile.EntryNameInConsolidationArchive(), CompressionLevel.Fastest); |
There was a problem hiding this comment.
could CompressionLevel.SmallestSize be a good way to go? We can afford extra creation time if it makes it a smaller archive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At the moment the index.json in consolidated calamari contains a list of hashes (aka directories) which must be consolidated in order for a given flavour of calamari to execute.
Thus when octopus is trying to construct a calamari to run, it copies ALL files from each of the listed directories into a single zip (with pathing) - and sends that over to the target.
Up until now, that works correctly.
As part of the migration to netcore - AzureWebApp required a "shim app" to wrap the capabilities in Microsoft.Deployments.Web (which does not have a netcore counterpart) - this shim-app is a netfx app - and uses newtonsoft.
When a consolidated calamari is created - the AzureWebApp now list in its hashes:
Unfortunately, this means that Newtonsoft is pulled in 3 times:
Thus - the netcore version of newtonsoft in the root-directory is overwritten with the netfx version - meaning Calamari.AzureWebApp fails to start when it is reconstructed from a consolidated calamari.
================
The solution is to replace the hashes, with a full-blown file-reference (See example below).
NOTE: Linux path separators are used as they are valid cross platform.
{ "Packages": { "Calamari": { "PackageId": "Calamari", "Version": "27.3.5-pullrequest1416-0028", "IsNupkg": true, "PlatformHashes": { "netfx": [ "01656ee57f64634592a6f674815ad8b6/Cloud/Microsoft.Azure.Management.Network.Fluent.dll", "01656ee57f64634592a6f674815ad8b6/Microsoft.Azure.Management.Network.Fluent.dll", "022cfe9926214ee1ca1326f7582bb06c/Octopus.Versioning.dll", "0589b3488d5f50ef7bffca1f6e4d5740/Calamari.CloudAccounts.pdb", "0589b3488d5f50ef7bffca1f6e4d5740/Cloud/Calamari.CloudAccounts.pdb", "05d1b950c470ea8b0aa357f9a59cf264/Cloud/System.Resources.Writer.dll",