Skip to content

Commit

Permalink
Undo some superfluous changes to make the PR diff smaller
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbussell
lbussell committed May 17, 2024
1 parent 78f5fbd commit c8d9e0b
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 63 deletions.
1 change: 0 additions & 1 deletion src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using System.Threading.Tasks;
using Microsoft.DotNet.ImageBuilder.Models.Image;
using Microsoft.DotNet.ImageBuilder.ViewModel;
using Microsoft.Win32;

#nullable enable
namespace Microsoft.DotNet.ImageBuilder.Commands
Expand Down
74 changes: 38 additions & 36 deletions src/Microsoft.DotNet.ImageBuilder/src/Commands/BuildOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System.Collections.Generic;
using System.CommandLine;
using System.Linq;
using static Microsoft.DotNet.ImageBuilder.Commands.CliHelper;

#nullable enable
Expand Down Expand Up @@ -35,43 +36,44 @@ public class BuildOptionsBuilder : DockerRegistryOptionsBuilder
private readonly BaseImageOverrideOptionsBuilder _baseImageOverrideOptionsBuilder = new();

public override IEnumerable<Option> GetCliOptions() =>
[
..base.GetCliOptions(),
.._manifestFilterOptionsBuilder.GetCliOptions(),
.._baseImageOverrideOptionsBuilder.GetCliOptions(),
CreateOption<bool>("push", nameof(BuildOptions.IsPushEnabled),
"Push built images to Docker registry"),
CreateOption<bool>("retry", nameof(BuildOptions.IsRetryEnabled),
"Retry building images upon failure"),
CreateOption<bool>("skip-pulling", nameof(BuildOptions.IsSkipPullingEnabled),
"Skip explicitly pulling the base images of the Dockerfiles"),
CreateOption<string?>("image-info-output-path", nameof(BuildOptions.ImageInfoOutputPath),
"Path to output image info"),
CreateOption<string?>("image-info-source-path", nameof(BuildOptions.ImageInfoSourcePath),
"Path to source image info"),
CreateOption<string?>("source-repo", nameof(BuildOptions.SourceRepoUrl),
"Repo URL of the Dockerfile sources"),
CreateOption<bool>("no-cache", nameof(BuildOptions.NoCache),
"Disables build cache feature"),
CreateOption<string?>("source-repo-prefix", nameof(BuildOptions.SourceRepoPrefix),
"Prefix to add to the external base image names when pulling them"),
CreateDictionaryOption("build-arg", nameof(BuildOptions.BuildArgs),
"Build argument to pass to the Dockerfiles (<name>=<value>)"),
CreateOption<bool>("skip-platform-check", nameof(BuildOptions.SkipPlatformCheck),
"Skips validation that ensures the Dockerfile's base image's platform matches the manifest configuration"),
CreateOption<string>("digests-out-var", nameof(BuildOptions.OutputVariableName),
"Azure DevOps variable name to use for outputting the list of built image digests"),
CreateOption<string>("acr-subscription", nameof(BuildOptions.Subscription),
"Azure subscription to operate on"),
CreateOption<string>("acr-resource-group", nameof(BuildOptions.ResourceGroup),
"Azure resource group to operate on"),
];
base.GetCliOptions()
.Concat(_manifestFilterOptionsBuilder.GetCliOptions())
.Concat(_baseImageOverrideOptionsBuilder.GetCliOptions())
.Concat(
new Option[]
{
CreateOption<bool>("push", nameof(BuildOptions.IsPushEnabled),
"Push built images to Docker registry"),
CreateOption<bool>("retry", nameof(BuildOptions.IsRetryEnabled),
"Retry building images upon failure"),
CreateOption<bool>("skip-pulling", nameof(BuildOptions.IsSkipPullingEnabled),
"Skip explicitly pulling the base images of the Dockerfiles"),
CreateOption<string?>("image-info-output-path", nameof(BuildOptions.ImageInfoOutputPath),
"Path to output image info"),
CreateOption<string?>("image-info-source-path", nameof(BuildOptions.ImageInfoSourcePath),
"Path to source image info"),
CreateOption<string?>("source-repo", nameof(BuildOptions.SourceRepoUrl),
"Repo URL of the Dockerfile sources"),
CreateOption<bool>("no-cache", nameof(BuildOptions.NoCache),
"Disables build cache feature"),
CreateOption<string?>("source-repo-prefix", nameof(BuildOptions.SourceRepoPrefix),
"Prefix to add to the external base image names when pulling them"),
CreateDictionaryOption("build-arg", nameof(BuildOptions.BuildArgs),
"Build argument to pass to the Dockerfiles (<name>=<value>)"),
CreateOption<bool>("skip-platform-check", nameof(BuildOptions.SkipPlatformCheck),
"Skips validation that ensures the Dockerfile's base image's platform matches the manifest configuration"),
CreateOption<string>("digests-out-var", nameof(BuildOptions.OutputVariableName),
"Azure DevOps variable name to use for outputting the list of built image digests"),
CreateOption<string>("acr-subscription", nameof(BuildOptions.Subscription),
"Azure subscription to operate on"),
CreateOption<string>("acr-resource-group", nameof(BuildOptions.ResourceGroup),
"Azure resource group to operate on"),
});

public override IEnumerable<Argument> GetCliArguments() =>
[
..base.GetCliArguments(),
.._manifestFilterOptionsBuilder.GetCliArguments(),
.._baseImageOverrideOptionsBuilder.GetCliArguments(),
];
base.GetCliArguments()
.Concat(_manifestFilterOptionsBuilder.GetCliArguments())
.Concat(_baseImageOverrideOptionsBuilder.GetCliArguments());
}
}
#nullable disable
43 changes: 24 additions & 19 deletions src/Microsoft.DotNet.ImageBuilder/src/Commands/GetStaleImagesOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System.Collections.Generic;
using System.CommandLine;
using System.Linq;
using static Microsoft.DotNet.ImageBuilder.Commands.CliHelper;

#nullable enable
Expand Down Expand Up @@ -35,26 +36,30 @@ public class GetStaleImagesOptionsBuilder : CliOptionsBuilder
private readonly BaseImageOverrideOptionsBuilder _baseImageOverrideOptionsBuilder = new();

public override IEnumerable<Option> GetCliOptions() =>
[
..base.GetCliOptions(),
.._subscriptionOptionsBuilder.GetCliOptions(),
.._manifestFilterOptionsBuilder.GetCliOptions(),
.._gitOptionsBuilder.GetCliOptions(),
.._registryCredentialsOptionsBuilder.GetCliOptions(),
.._baseImageOverrideOptionsBuilder.GetCliOptions(),
CreateOption<string?>("owned-acr", nameof(GetStaleImagesOptions.OwnedAcr),
"The name of the ACR to authenticate with"),
];
base.GetCliOptions()
.Concat(_subscriptionOptionsBuilder.GetCliOptions())
.Concat(_manifestFilterOptionsBuilder.GetCliOptions())
.Concat(_gitOptionsBuilder.GetCliOptions())
.Concat(_registryCredentialsOptionsBuilder.GetCliOptions())
.Concat(_baseImageOverrideOptionsBuilder.GetCliOptions())
.Concat(
[
CreateOption<string?>("owned-acr",
nameof(GetStaleImagesOptions.OwnedAcr), "The name of the ACR to authenticate with"),
]);

public override IEnumerable<Argument> GetCliArguments() =>
[
..base.GetCliArguments(),
.._subscriptionOptionsBuilder.GetCliArguments(),
.._manifestFilterOptionsBuilder.GetCliArguments(),
.._gitOptionsBuilder.GetCliArguments(),
.._registryCredentialsOptionsBuilder.GetCliArguments(),
new Argument<string>(nameof(GetStaleImagesOptions.VariableName),
"The Azure Pipeline variable name to assign the image paths to"),
];
base.GetCliArguments()
.Concat(_subscriptionOptionsBuilder.GetCliArguments())
.Concat(_manifestFilterOptionsBuilder.GetCliArguments())
.Concat(_gitOptionsBuilder.GetCliArguments())
.Concat(_registryCredentialsOptionsBuilder.GetCliArguments()
.Concat(
new Argument[]
{
new Argument<string>(nameof(GetStaleImagesOptions.VariableName),
"The Azure Pipeline variable name to assign the image paths to")
}));
}
}
#nullable disable
3 changes: 1 addition & 2 deletions src/Microsoft.DotNet.ImageBuilder/src/Commands/PublishManifestCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ private async Task SaveTagInfoToImageInfoFileAsync(DateTime createdDate, ImageAr
image.Manifest.Digest = DockerHelper.GetDigestString(
image.ManifestRepo.FullModelName,
await _manifestService.Value.GetManifestDigestShaAsync(
sharedTag.FullyQualifiedName,
Options.IsDryRun));
sharedTag.FullyQualifiedName, Options.IsDryRun));

IEnumerable<(string Repo, string Tag)> syndicatedRepresentativeSharedTags = image.ManifestImage.SharedTags
.Where(tag => tag.SyndicatedRepo is not null)
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.ImageBuilder/src/DockerHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ public static Docker.Manifest InspectManifest(string image, bool isDryRun)
}
}


return null;
}

Expand Down
13 changes: 8 additions & 5 deletions src/Microsoft.DotNet.ImageBuilder/tests/Helpers/ManifestServiceHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@ public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
IEnumerable<ImageLayersResults>? imageLayersResults = null) =>
CreateManifestServiceFactoryMock(CreateManifestServiceMock(imageDigestResults, imageLayersResults));

public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(Mock<IInnerManifestService> innerManifestService) =>
CreateManifestServiceFactoryMock(new ManifestService(innerManifestService.Object));
public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
Mock<IInnerManifestService> innerManifestService) =>
CreateManifestServiceFactoryMock(new ManifestService(innerManifestService.Object));

public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(Mock<IManifestService> manifestServiceMock) =>
CreateManifestServiceFactoryMock(manifestServiceMock.Object);
public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
Mock<IManifestService> manifestServiceMock) =>
CreateManifestServiceFactoryMock(manifestServiceMock.Object);

public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(IManifestService manifestService)
public static Mock<IManifestServiceFactory> CreateManifestServiceFactoryMock(
IManifestService manifestService)
{
Mock<IManifestServiceFactory> manifestServiceFactoryMock = new();
manifestServiceFactoryMock
Expand Down

0 comments on commit c8d9e0b

Please sign in to comment.