audit work, fixed StellaOps.sln warnings/errors, fixed tests, sprints work, new advisories
This commit is contained in:
@@ -36,14 +36,16 @@ public sealed class LayerSbomEndpointsTests
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.GetAsync($"{BasePath}/{scanId}/layers");
|
||||
@@ -60,7 +62,7 @@ public sealed class LayerSbomEndpointsTests
|
||||
[Fact]
|
||||
public async Task ListLayers_WhenScanNotFound_Returns404()
|
||||
{
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
@@ -88,14 +90,16 @@ public sealed class LayerSbomEndpointsTests
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.GetAsync($"{BasePath}/{scanId}/layers");
|
||||
@@ -125,14 +129,16 @@ public sealed class LayerSbomEndpointsTests
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.GetAsync($"{BasePath}/{scanId}/layers/{layerDigest}/sbom");
|
||||
@@ -155,14 +161,16 @@ public sealed class LayerSbomEndpointsTests
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.GetAsync($"{BasePath}/{scanId}/layers/{layerDigest}/sbom?format=spdx");
|
||||
@@ -184,14 +192,16 @@ public sealed class LayerSbomEndpointsTests
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.GetAsync($"{BasePath}/{scanId}/layers/{layerDigest}/sbom");
|
||||
@@ -206,7 +216,7 @@ public sealed class LayerSbomEndpointsTests
|
||||
[Fact]
|
||||
public async Task GetLayerSbom_WhenScanNotFound_Returns404()
|
||||
{
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
@@ -226,7 +236,7 @@ public sealed class LayerSbomEndpointsTests
|
||||
var mockService = new InMemoryLayerSbomService();
|
||||
mockService.AddScan(scanId, "sha256:image123", CreateTestLayers(1));
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
@@ -250,13 +260,19 @@ public sealed class LayerSbomEndpointsTests
|
||||
var mockService = new InMemoryLayerSbomService();
|
||||
mockService.AddScan(scanId, "sha256:image123", CreateTestLayers(2));
|
||||
mockService.AddCompositionRecipe(scanId, CreateTestRecipe(scanId, "sha256:image123", 2));
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.GetAsync($"{BasePath}/{scanId}/composition-recipe");
|
||||
@@ -274,7 +290,7 @@ public sealed class LayerSbomEndpointsTests
|
||||
[Fact]
|
||||
public async Task GetCompositionRecipe_WhenScanNotFound_Returns404()
|
||||
{
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
@@ -295,7 +311,7 @@ public sealed class LayerSbomEndpointsTests
|
||||
mockService.AddScan(scanId, "sha256:image123", CreateTestLayers(1));
|
||||
// Note: not adding composition recipe
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
@@ -325,13 +341,19 @@ public sealed class LayerSbomEndpointsTests
|
||||
LayerDigestsMatch = true,
|
||||
Errors = ImmutableArray<string>.Empty,
|
||||
});
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.PostAsync($"{BasePath}/{scanId}/composition-recipe/verify", null);
|
||||
@@ -358,13 +380,19 @@ public sealed class LayerSbomEndpointsTests
|
||||
LayerDigestsMatch = true,
|
||||
Errors = ImmutableArray.Create("Merkle root mismatch: expected sha256:abc, got sha256:def"),
|
||||
});
|
||||
var stubCoordinator = new StubScanCoordinator();
|
||||
stubCoordinator.AddScan(scanId, "sha256:image123");
|
||||
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
});
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(
|
||||
configureConfiguration: config => config["scanner:authority:enabled"] = "false",
|
||||
configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
services.RemoveAll<IScanCoordinator>();
|
||||
services.AddSingleton<ILayerSbomService>(mockService);
|
||||
services.AddSingleton<IScanCoordinator>(stubCoordinator);
|
||||
});
|
||||
using var client = factory.CreateClient();
|
||||
|
||||
var response = await client.PostAsync($"{BasePath}/{scanId}/composition-recipe/verify", null);
|
||||
@@ -382,7 +410,7 @@ public sealed class LayerSbomEndpointsTests
|
||||
[Fact]
|
||||
public async Task VerifyCompositionRecipe_WhenScanNotFound_Returns404()
|
||||
{
|
||||
using var factory = new ScannerApplicationFactory()
|
||||
using var factory = ScannerApplicationFactory.CreateLightweight()
|
||||
.WithOverrides(configureServices: services =>
|
||||
{
|
||||
services.RemoveAll<ILayerSbomService>();
|
||||
@@ -584,9 +612,9 @@ internal sealed class StubScanCoordinator : IScanCoordinator
|
||||
public void AddScan(string scanId, string imageDigest)
|
||||
{
|
||||
var snapshot = new ScanSnapshot(
|
||||
ScanId.Parse(scanId),
|
||||
new ScanTarget("test-image", imageDigest, null),
|
||||
ScanStatus.Completed,
|
||||
new ScanId(scanId),
|
||||
new ScanTarget("test-image", imageDigest),
|
||||
ScanStatus.Succeeded,
|
||||
DateTimeOffset.UtcNow.AddMinutes(-5),
|
||||
DateTimeOffset.UtcNow,
|
||||
null, null, null);
|
||||
|
||||
Reference in New Issue
Block a user