Simplify publishing output paths

src/ImageBuilder.Tests/AnnotateEolDigestsCommandTests.cs

@@ -145,11 +145,12 @@ private AnnotateEolDigestsCommand InitializeCommand(
             AnnotateEolDigestsCommand command = new(
                 loggerServiceMock.Object,
                 lifecycleMetadataServiceMock.Object,
-                Mock.Of<IRegistryCredentialsProvider>());
+                Mock.Of<IRegistryCredentialsProvider>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.RepoPrefix = RepoPrefix;
             command.Options.AcrName = AcrName;
             command.Options.EolDigestsListPath = eolDigestsListPath;
-            command.Options.AnnotationDigestsOutputPath = Path.Combine(tempFolderContext.Path, AnnotationsOutputPath);
+            command.Options.AnnotationDigestsOutputPath = AnnotationsOutputPath;
             return command;
         }
 

src/ImageBuilder.Tests/ArtifactServiceTests.cs

@@ -0,0 +1,72 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using Microsoft.DotNet.ImageBuilder.Configuration;
+using Microsoft.DotNet.ImageBuilder.Tests.Helpers;
+using Microsoft.Extensions.Options;
+using Shouldly;
+
+namespace Microsoft.DotNet.ImageBuilder.Tests;
+
+[TestClass]
+public class ArtifactServiceTests
+{
+    private static readonly string s_outputRoot = Path.Combine(Path.GetTempPath(), "artifacts");
+
+    [TestMethod]
+    public void ResolvePath_RelativePath_ResolvesUnderArtifactStagingDirectory()
+    {
+        var service = CreateService(new InMemoryFileSystem());
+
+        string path = service.ResolvePath(Path.Combine("image-info", "input.json"));
+
+        path.ShouldBe(Path.Combine(s_outputRoot, "image-info", "input.json"));
+    }
+
+    [TestMethod]
+    public void WriteAllText_WritesUnderArtifactStagingDirectory()
+    {
+        var fileSystem = new InMemoryFileSystem();
+        var service = CreateService(fileSystem);
+        string expectedPath = Path.Combine(s_outputRoot, "image-info", "output.json");
+
+        service.WriteAllText(Path.Combine("image-info", "output.json"), "contents");
+
+        fileSystem.DirectoriesCreated.ShouldContain(Path.GetDirectoryName(expectedPath));
+        fileSystem.GetFileText(expectedPath).ShouldBe("contents");
+    }
+
+    [TestMethod]
+    public void WriteAllText_MissingArtifactStagingDirectory_Throws()
+    {
+        var service = new ArtifactService(
+            new InMemoryFileSystem(),
+            Options.Create(new BuildConfiguration()));
+
+        InvalidOperationException exception = Should.Throw<InvalidOperationException>(
+            () => service.WriteAllText("output.json", "contents"));
+
+        exception.Message.ShouldContain(nameof(BuildConfiguration.ArtifactStagingDirectory));
+    }
+
+    [TestMethod]
+    public void WriteAllText_PathOutsideArtifactStagingDirectory_Throws()
+    {
+        var service = CreateService(new InMemoryFileSystem());
+
+        Should.Throw<ArgumentException>(
+            () => service.WriteAllText(Path.Combine("..", "output.json"), "contents"));
+    }
+
+    private static ArtifactService CreateService(IFileSystem fileSystem) =>
+        new(
+            fileSystem,
+            Options.Create(
+                new BuildConfiguration
+                {
+                    ArtifactStagingDirectory = s_outputRoot
+                }));
+}

src/ImageBuilder.Tests/CopyAcrImagesCommandTests.cs

@@ -37,11 +37,12 @@ public async Task CopyAcrImagesCommand_CustomDockerfileName()
                 CopyAcrImagesCommand command = new(
                     TestHelper.CreateManifestJsonService(),
                     copyImageServiceMock.Object,
-                    Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                    Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                    TestHelper.CreateArtifactService(tempFolderContext.Path));
                 command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
                 command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
                 command.Options.SourceRegistry = SourceRegistry;
-                command.Options.ImageInfoPath = "image-info.json";
+                command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
                 const string runtimeRelativeDir = "1.0/runtime/os";
                 Directory.CreateDirectory(Path.Combine(tempFolderContext.Path, runtimeRelativeDir));
@@ -127,11 +128,12 @@ public async Task CopyAcrImagesCommand_SharedDockerfile()
                 var command = new CopyAcrImagesCommand(
                     TestHelper.CreateManifestJsonService(),
                     copyImageServiceMock.Object,
-                    Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                    Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                    TestHelper.CreateArtifactService(tempFolderContext.Path));
                 command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
                 command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
                 command.Options.SourceRegistry = SourceRegistry;
-                command.Options.ImageInfoPath = "image-info.json";
+                command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
                 const string runtimeRelativeDir = "1.0/runtime/os";
                 Directory.CreateDirectory(Path.Combine(tempFolderContext.Path, runtimeRelativeDir));
@@ -229,11 +231,12 @@ public async Task CopyAcrImagesCommand_RuntimeDepsSharing()
             var command = new CopyAcrImagesCommand(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("3.1/runtime-deps/os", tempFolderContext);
 
@@ -342,11 +345,12 @@ public async Task SyndicatedTags()
             var command = new CopyAcrImagesCommand(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             const string runtimeRelativeDir = "1.0/runtime/os";
             Directory.CreateDirectory(Path.Combine(tempFolderContext.Path, runtimeRelativeDir));
@@ -456,11 +460,12 @@ public async Task CopyAcrImagesCommand_CopiesManifestListTags()
             CopyAcrImagesCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("1.0/runtime/os", tempFolderContext);
 
@@ -562,11 +567,12 @@ public async Task CopyAcrImagesCommand_CopiesSyndicatedManifestListTags()
             CopyAcrImagesCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("1.0/runtime/os", tempFolderContext);
 
@@ -678,11 +684,12 @@ public async Task CopyAcrImagesCommand_SkipsManifestListsWithNoManifestData()
             CopyAcrImagesCommand command = new(
                 TestHelper.CreateManifestJsonService(),
                 copyImageServiceMock.Object,
-                Mock.Of<ILogger<CopyAcrImagesCommand>>());
+                Mock.Of<ILogger<CopyAcrImagesCommand>>(),
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.Manifest = Path.Combine(tempFolderContext.Path, "manifest.json");
             command.Options.SourceRepoPrefix = command.Options.RepoPrefix = "test/";
             command.Options.SourceRegistry = SourceRegistry;
-            command.Options.ImageInfoPath = "image-info.json";
+            command.Options.ImageInfoPath = Path.Combine(tempFolderContext.Path, "image-info.json");
 
             string dockerfileRelativePath = DockerfileHelper.CreateDockerfile("1.0/runtime/os", tempFolderContext);
 

src/ImageBuilder.Tests/CreateManifestListCommandTests.cs

@@ -705,7 +705,8 @@ private static CreateManifestListCommand CreateCommand(
             copyImageServiceMock.Object,
             Mock.Of<ILogger<CreateManifestListCommand>>(),
             dateTimeService,
-            Mock.Of<IRegistryCredentialsProvider>());
+            Mock.Of<IRegistryCredentialsProvider>(),
+            TestHelper.CreateArtifactService(Path.GetTempPath()));
 
     private static void SetupCommand(
         CreateManifestListCommand command,

src/ImageBuilder.Tests/GenerateEolAnnotationDataForPublishCommandTests.cs

@@ -1148,10 +1148,11 @@ private static GenerateEolAnnotationDataForPublishCommand InitializeCommand(
                 acrClientFactory: registryClientFactory,
                 acrContentClientFactory: registryContentClientFactory,
                 lifecycleMetadataService: lifecycleMetadataService,
-                registryCredentialsProvider: Mock.Of<IRegistryCredentialsProvider>());
+                registryCredentialsProvider: Mock.Of<IRegistryCredentialsProvider>(),
+                artifactService: TestHelper.CreateArtifactService(Path.GetDirectoryName(newEolDigestsListPath)));
             command.Options.OldImageInfoPath = oldImageInfoPath;
             command.Options.NewImageInfoPath = newImageInfoPath;
-            command.Options.EolDigestsListPath = newEolDigestsListPath;
+            command.Options.EolDigestsListPath = Path.GetFileName(newEolDigestsListPath);
             command.Options.RegistryOptions = new() { RepoPrefix = repoPrefix, Registry = AcrName };
             return command;
         }

src/ImageBuilder.Tests/Helpers/TestHelper.cs

@@ -6,6 +6,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Microsoft.DotNet.ImageBuilder.Configuration;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.DotNet.ImageBuilder.Tests.Helpers
 {
@@ -20,6 +22,16 @@ public static IManifestJsonService CreateManifestJsonService() =>
                 fileSystem: new FileSystem(),
                 logger: new LoggerFactory().CreateLogger<ManifestJsonService>());
 
+        public static IArtifactService CreateArtifactService(string artifactStagingDirectory)
+        {
+            BuildConfiguration buildConfiguration = new()
+            {
+                ArtifactStagingDirectory = artifactStagingDirectory
+            };
+
+            return new ArtifactService(new FileSystem(), Options.Create(buildConfiguration));
+        }
+
         public static TempFolderContext UseTempFolder()
         {
             return new TempFolderContext();

src/ImageBuilder.Tests/IngestKustoImageInfoCommandTests.cs

@@ -277,7 +277,11 @@ private async Task ValidateExecuteAsync(
                 .Callback<string, string, string, string, IServiceConnection>(
                     (csv, _, _, table, _) => ingestedData.Add(table, csv));
 
-            IngestKustoImageInfoCommand command = new(TestHelper.CreateManifestJsonService(), Mock.Of<ILogger<IngestKustoImageInfoCommand>>(), kustoClientMock.Object);
+            IngestKustoImageInfoCommand command = new(
+                TestHelper.CreateManifestJsonService(),
+                Mock.Of<ILogger<IngestKustoImageInfoCommand>>(),
+                kustoClientMock.Object,
+                TestHelper.CreateArtifactService(tempFolderContext.Path));
             command.Options.ImageInfoPath = imageInfoPath;
             command.Options.Manifest = manifestPath;
             command.Options.ImageTable = "ImageInfo";