Skip to content

Remove ForceUtf8ZipFileDecodingFeatureToggle #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
APErebus merged 1 commit into from
Jun 16, 2026
Merged

Remove ForceUtf8ZipFileDecodingFeatureToggle #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions source/Calamari.Common/FeatureToggles/FeatureToggle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
/// </summary>
public enum FeatureToggle {
SkunkworksFeatureToggle,
OidcAccountsFeatureToggle,

@APErebus APErebus Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was also unused, so can go

KubernetesAuthAwsCliWithExecFeatureToggle,
ForceUtf8ZipFileDecodingFeatureToggle,
BashParametersArrayFeatureToggle
}
}
2 changes: 1 addition & 1 deletion source/Calamari.Common/Features/Packages/CombinedPackageExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public CombinedPackageExtractor(ILog log, ICalamariFileSystem calamariFileSystem
new NupkgExtractor(log),
new TarGzipPackageExtractor(log),
new TarBzipPackageExtractor(log),
new ZipPackageExtractor(log, FeatureToggle.ForceUtf8ZipFileDecodingFeatureToggle.IsEnabled(variables)),
new ZipPackageExtractor(log),
new TarPackageExtractor(log),
new JarPackageExtractor(new JarTool(commandLineRunner, log, calamariFileSystem, variables))
}.Select(e => e.WithExtractionLimits(log, variables)).ToArray();
Expand Down
17 changes: 2 additions & 15 deletions source/Calamari.Common/Features/Packages/ZipPackageExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,9 @@

namespace Calamari.Common.Features.Packages
{
public class ZipPackageExtractor : IPackageEntryExtractor
public class ZipPackageExtractor(ILog log) : IPackageEntryExtractor
{
readonly ILog log;
readonly bool forceUtf8ZipFiles; //to be removed once transitioned to netcore

//used by extractor tests.
public ZipPackageExtractor(ILog log): this(log, true) {
}

public ZipPackageExtractor(ILog log, bool forceUtf8ZipFiles)
{
this.log = log;
this.forceUtf8ZipFiles = forceUtf8ZipFiles;
}

public string[] Extensions => new[] { ".zip", ".whl" };
public string[] Extensions => [".zip", ".whl"];

public int Extract(string packageFile, string directory)
{
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void CanExtractZipFileContainingSpecialCharacters(string filename)
{
var fileName = GetFixtureResource("Samples", string.Format(filename));

var extractor = new ZipPackageExtractor(ConsoleLog.Instance, true);
var extractor = new ZipPackageExtractor(ConsoleLog.Instance);
var targetDir = GetTargetDir(extractor.GetType(), fileName);

var filesExtracted = extractor.Extract(fileName, targetDir);
Expand Down