Image age verification option

Directory.Packages.props

@@ -36,5 +36,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
+    <PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.4" />
   </ItemGroup>
 </Project>

src/Aspirate.Commands/Actions/Containers/BuildAndPushContainersFromProjectsAction.cs

@@ -34,7 +34,7 @@ public override async Task<bool> ExecuteAsync()
                 BuildArgs = CurrentState.ContainerBuildArgs?.ToDictionary(arg => arg.Split('=')[0], arg => arg.Split('=')[1]),
                 BuildContext = CurrentState.ContainerBuildContext,
                 Tags = CurrentState.ContainerImageTags
-            }, CurrentState.NonInteractive, CurrentState.RuntimeIdentifier, CurrentState.PreferDockerfile);
+            }, CurrentState.NonInteractive, CurrentState.RuntimeIdentifier, CurrentState.PreferDockerfile, CurrentState.VerifyImageAge, CurrentState.PrivateRegistryUsername, CurrentState.PrivateRegistryPassword);
         }
 
         Logger.MarkupLine("[bold]Building and push completed for all selected project components.[/]");

src/Aspirate.Commands/Commands/Build/BuildCommand.cs

@@ -6,15 +6,16 @@ public sealed class BuildCommand : BaseCommand<BuildOptions, BuildCommandHandler
 
     public BuildCommand() : base("build", "Builds and pushes containers")
     {
-       AddOption(ProjectPathOption.Instance);
-       AddOption(AspireManifestOption.Instance);
-       AddOption(ContainerBuilderOption.Instance);
-       AddOption(ContainerBuildContextOption.Instance);
-       AddOption(ContainerImageTagOption.Instance);
-       AddOption(ContainerBuildArgsOption.Instance);
-       AddOption(PreferDockerfileOption.Instance);
-       AddOption(ContainerRegistryOption.Instance);
-       AddOption(ContainerRepositoryPrefixOption.Instance);
-       AddOption(RuntimeIdentifierOption.Instance);
+        AddOption(ProjectPathOption.Instance);
+        AddOption(AspireManifestOption.Instance);
+        AddOption(ContainerBuilderOption.Instance);
+        AddOption(ContainerBuildContextOption.Instance);
+        AddOption(ContainerImageTagOption.Instance);
+        AddOption(ContainerBuildArgsOption.Instance);
+        AddOption(PreferDockerfileOption.Instance);
+        AddOption(ContainerRegistryOption.Instance);
+        AddOption(ContainerRepositoryPrefixOption.Instance);
+        AddOption(VerifyImageAgeOption.Instance);
+        AddOption(RuntimeIdentifierOption.Instance);
     }
 }

src/Aspirate.Commands/Commands/Build/BuildOptions.cs

@@ -13,4 +13,5 @@ public sealed class BuildOptions : BaseCommandOptions, IBuildOptions, IContainer
     public string? RuntimeIdentifier { get; set; }
     public List<string>? ComposeBuilds { get; set; }
     public bool PreferDockerfile { get; set; }
+    public bool VerifyImageAge { get; set; }
 }

src/Aspirate.Commands/Commands/Generate/GenerateCommand.cs

@@ -6,31 +6,32 @@ public sealed class GenerateCommand : BaseCommand<GenerateOptions, GenerateComma
 
     public GenerateCommand() : base("generate", "Builds, pushes containers, generates aspire manifest, helm chart and kustomize manifests.")
     {
-       AddOption(ProjectPathOption.Instance);
-       AddOption(AspireManifestOption.Instance);
-       AddOption(OutputPathOption.Instance);
-       AddOption(SkipBuildOption.Instance);
-       AddOption(SkipFinalKustomizeGenerationOption.Instance);
-       AddOption(ContainerBuilderOption.Instance);
-       AddOption(ContainerBuildContextOption.Instance);
-       AddOption(ContainerImageTagOption.Instance);
-       AddOption(ContainerBuildArgsOption.Instance);
-       AddOption(PreferDockerfileOption.Instance);
-       AddOption(ContainerRegistryOption.Instance);
-       AddOption(ContainerRepositoryPrefixOption.Instance);
-       AddOption(ImagePullPolicyOption.Instance);
-       AddOption(NamespaceOption.Instance);
-       AddOption(OutputFormatOption.Instance);
-       AddOption(RuntimeIdentifierOption.Instance);
-       AddOption(SecretPasswordOption.Instance);
-       AddOption(PrivateRegistryOption.Instance);
-       AddOption(PrivateRegistryUrlOption.Instance);
-       AddOption(PrivateRegistryUsernameOption.Instance);
-       AddOption(PrivateRegistryPasswordOption.Instance);
-       AddOption(PrivateRegistryEmailOption.Instance);
-       AddOption(IncludeDashboardOption.Instance);
-       AddOption(ComposeBuildsOption.Instance);
-       AddOption(ReplaceSecretsOption.Instance);
-       AddOption(ParameterResourceValueOption.Instance);
+        AddOption(ProjectPathOption.Instance);
+        AddOption(AspireManifestOption.Instance);
+        AddOption(OutputPathOption.Instance);
+        AddOption(SkipBuildOption.Instance);
+        AddOption(SkipFinalKustomizeGenerationOption.Instance);
+        AddOption(ContainerBuilderOption.Instance);
+        AddOption(ContainerBuildContextOption.Instance);
+        AddOption(ContainerImageTagOption.Instance);
+        AddOption(ContainerBuildArgsOption.Instance);
+        AddOption(PreferDockerfileOption.Instance);
+        AddOption(ContainerRegistryOption.Instance);
+        AddOption(ContainerRepositoryPrefixOption.Instance);
+        AddOption(VerifyImageAgeOption.Instance);
+        AddOption(ImagePullPolicyOption.Instance);
+        AddOption(NamespaceOption.Instance);
+        AddOption(OutputFormatOption.Instance);
+        AddOption(RuntimeIdentifierOption.Instance);
+        AddOption(SecretPasswordOption.Instance);
+        AddOption(PrivateRegistryOption.Instance);
+        AddOption(PrivateRegistryUrlOption.Instance);
+        AddOption(PrivateRegistryUsernameOption.Instance);
+        AddOption(PrivateRegistryPasswordOption.Instance);
+        AddOption(PrivateRegistryEmailOption.Instance);
+        AddOption(IncludeDashboardOption.Instance);
+        AddOption(ComposeBuildsOption.Instance);
+        AddOption(ReplaceSecretsOption.Instance);
+        AddOption(ParameterResourceValueOption.Instance);
     }
 }

src/Aspirate.Commands/Commands/Generate/GenerateOptions.cs

@@ -27,6 +27,7 @@ public sealed class GenerateOptions : BaseCommandOptions,
     public string? RuntimeIdentifier { get; set; }
     public List<string>? ComposeBuilds { get; set; }
     public bool PreferDockerfile { get; set; }
+    public bool VerifyImageAge { get; set; }
     public string? PrivateRegistryUrl { get; set; }
     public string? PrivateRegistryUsername { get; set; }
     public string? PrivateRegistryPassword { get; set; }

src/Aspirate.Commands/Commands/Run/RunCommand.cs

@@ -6,26 +6,27 @@ public sealed class RunCommand : BaseCommand<RunOptions, RunCommandHandler>
 
     public RunCommand() : base("run", "Builds, pushes containers, and runs the current solution directly against a kubernetes cluster.")
     {
-       AddOption(ProjectPathOption.Instance);
-       AddOption(AspireManifestOption.Instance);
-       AddOption(SkipBuildOption.Instance);
-       AddOption(ContainerBuilderOption.Instance);
-       AddOption(ContainerBuildContextOption.Instance);
-       AddOption(ContainerImageTagOption.Instance);
-       AddOption(ContainerBuildArgsOption.Instance);
-       AddOption(PreferDockerfileOption.Instance);
-       AddOption(ContainerRegistryOption.Instance);
-       AddOption(ContainerRepositoryPrefixOption.Instance);
-       AddOption(ImagePullPolicyOption.Instance);
-       AddOption(NamespaceOption.Instance);
-       AddOption(RuntimeIdentifierOption.Instance);
-       AddOption(SecretPasswordOption.Instance);
-       AddOption(PrivateRegistryOption.Instance);
-       AddOption(PrivateRegistryUrlOption.Instance);
-       AddOption(PrivateRegistryUsernameOption.Instance);
-       AddOption(PrivateRegistryPasswordOption.Instance);
-       AddOption(PrivateRegistryEmailOption.Instance);
-       AddOption(IncludeDashboardOption.Instance);
-       AddOption(AllowClearNamespaceOption.Instance);
+        AddOption(ProjectPathOption.Instance);
+        AddOption(AspireManifestOption.Instance);
+        AddOption(SkipBuildOption.Instance);
+        AddOption(ContainerBuilderOption.Instance);
+        AddOption(ContainerBuildContextOption.Instance);
+        AddOption(ContainerImageTagOption.Instance);
+        AddOption(ContainerBuildArgsOption.Instance);
+        AddOption(PreferDockerfileOption.Instance);
+        AddOption(ContainerRegistryOption.Instance);
+        AddOption(ContainerRepositoryPrefixOption.Instance);
+        AddOption(VerifyImageAgeOption.Instance);
+        AddOption(ImagePullPolicyOption.Instance);
+        AddOption(NamespaceOption.Instance);
+        AddOption(RuntimeIdentifierOption.Instance);
+        AddOption(SecretPasswordOption.Instance);
+        AddOption(PrivateRegistryOption.Instance);
+        AddOption(PrivateRegistryUrlOption.Instance);
+        AddOption(PrivateRegistryUsernameOption.Instance);
+        AddOption(PrivateRegistryPasswordOption.Instance);
+        AddOption(PrivateRegistryEmailOption.Instance);
+        AddOption(IncludeDashboardOption.Instance);
+        AddOption(AllowClearNamespaceOption.Instance);
     }
 }

src/Aspirate.Commands/Options/VerifyImageAgeOption.cs

@@ -0,0 +1,21 @@
+namespace Aspirate.Commands.Options;
+
+public sealed class VerifyImageAgeOption : BaseOption<bool?>
+{
+    private static readonly string[] _aliases =
+    [
+        "--verify-image-age"
+    ];
+
+    private VerifyImageAgeOption() : base(_aliases, "ASPIRATE_VERIFY_IMAGE_AGE", null)
+    {
+        Name = nameof(IBuildOptions.VerifyImageAge);
+        Description = "Verifies the age of published images";
+        Arity = ArgumentArity.ZeroOrOne;
+        IsRequired = false;
+    }
+
+    public static VerifyImageAgeOption Instance { get; } = new();
+
+    public override bool IsSecret => false;
+}

src/Aspirate.Processors/Resources/Project/ProjectProcessor.cs

@@ -70,7 +70,7 @@ private KubernetesDeploymentData PopulateKubernetesDeploymentData(BaseKubernetes
             .SetWithPrivateRegistry(options.WithPrivateRegistry.GetValueOrDefault())
             .Validate();
 
-    public async Task BuildAndPushProjectContainer(KeyValuePair<string, Resource> resource, ContainerOptions options, bool nonInteractive, string? runtimeIdentifier, bool preferDockerfile)
+    public async Task BuildAndPushProjectContainer(KeyValuePair<string, Resource> resource, ContainerOptions options, bool nonInteractive, string? runtimeIdentifier, bool preferDockerfile, bool verifyImageAge, string? privateRegistryUsername, string? privateRegistryPassword)
     {
         var project = resource.Value as ProjectResource;
 
@@ -100,7 +100,7 @@ public async Task BuildAndPushProjectContainer(KeyValuePair<string, Resource> re
         }
         else
         {
-            await containerCompositionService.BuildAndPushContainerForProject(project, containerDetails, options, nonInteractive, runtimeIdentifier);
+            await containerCompositionService.BuildAndPushContainerForProject(project, containerDetails, options, nonInteractive, runtimeIdentifier, verifyImageAge, privateRegistryUsername, privateRegistryPassword);
         }
 
         _console.MarkupLine($"[green]({EmojiLiterals.CheckMark}) Done: [/] Building and Pushing container for project [blue]{resource.Key}[/]");

src/Aspirate.Services/Aspirate.Services.csproj

@@ -9,6 +9,7 @@
     <PackageReference Include="CliWrap" />
     <PackageReference Include="KubernetesClient" />
     <PackageReference Include="NuGet.Protocol" />
+    <PackageReference Include="Valleysoft.DockerCredsProvider" />
   </ItemGroup>
 
     <ItemGroup>