Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@

using Aspire.Hosting.ApplicationModel;
using Aspire.Hosting.Foundry;
using Aspire.Hosting.Publishing;
using Aspire.Hosting.Tests;
using Aspire.Hosting.Utils;
using Microsoft.Extensions.DependencyInjection;

namespace Aspire.Hosting.Azure.Tests;

Expand All @@ -19,11 +15,7 @@ public class AzureKubernetesFoundryReferenceTests(ITestOutputHelper outputHelper
public async Task EndpointReferenceToFoundryHostedAgentIsResolvedAcrossComputeEnvironments()
{
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = TestDistributedApplicationBuilder.Create(
DistributedApplicationOperation.Publish,
workspace.Path);

builder.Services.AddSingleton<IResourceContainerImageManager, MockImageBuilder>();
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);

var aks = builder.AddAzureKubernetesEnvironment("aks");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
using Aspire.Hosting.ApplicationModel;
using Aspire.Hosting.Azure.Kubernetes;
using Aspire.Hosting.Kubernetes;
using Aspire.Hosting.Utils;

namespace Aspire.Hosting.Azure.Tests;

public class AzureKubernetesHelmChartTests
public class AzureKubernetesHelmChartTests(ITestOutputHelper outputHelper)
{
[Fact]
public void AksAddHelmChart_HasCorrectParent()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("cert-manager", "oci://quay.io/jetstack/charts/cert-manager", "1.17.0");
Expand All @@ -28,7 +28,8 @@ public void AksAddHelmChart_HasCorrectParent()
[Fact]
public void AksAddHelmChart_BasicProperties()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("cert-manager", "oci://quay.io/jetstack/charts/cert-manager", "1.17.0");
Expand All @@ -41,7 +42,8 @@ public void AksAddHelmChart_BasicProperties()
[Fact]
public void AksAddHelmChart_WithHelmValue_StoresValues()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("cert-manager", "oci://quay.io/jetstack/charts/cert-manager", "1.17.0")
Expand All @@ -56,7 +58,8 @@ public void AksAddHelmChart_WithHelmValue_StoresValues()
[Fact]
public void AksAddHelmChart_WithNamespace_SetsNamespace()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("nginx", "oci://ghcr.io/nginx/charts/nginx-ingress", "1.5.0")
Expand All @@ -68,7 +71,8 @@ public void AksAddHelmChart_WithNamespace_SetsNamespace()
[Fact]
public void AksAddHelmChart_WithReleaseName_SetsReleaseName()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("nginx", "oci://ghcr.io/nginx/charts/nginx-ingress", "1.5.0")
Expand All @@ -80,7 +84,8 @@ public void AksAddHelmChart_WithReleaseName_SetsReleaseName()
[Fact]
public void AksAddHelmChart_WithDestroy_OptsIn()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("podinfo", "oci://ghcr.io/stefanprodan/charts/podinfo", "6.7.1")
Expand All @@ -92,7 +97,8 @@ public void AksAddHelmChart_WithDestroy_OptsIn()
[Fact]
public void AksAddHelmChart_DestroyDefaultsToFalse()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

var chart = aks.AddHelmChart("podinfo", "oci://ghcr.io/stefanprodan/charts/podinfo", "6.7.1");
Expand All @@ -117,7 +123,8 @@ public void AksAddHelmChart_ThrowsOnNullBuilder()
[InlineData("test", "oci://example.com/chart", "")]
public void AksAddHelmChart_ThrowsOnNullOrEmptyArgs(string? name, string? chartReference, string? chartVersion)
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

Assert.ThrowsAny<ArgumentException>(() => aks.AddHelmChart(name!, chartReference!, chartVersion!));
Expand All @@ -126,7 +133,8 @@ public void AksAddHelmChart_ThrowsOnNullOrEmptyArgs(string? name, string? chartR
[Fact]
public void AksAddHelmChart_RejectsInvalidChartVersion()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

Assert.Throws<ArgumentException>(() =>
Expand All @@ -136,7 +144,8 @@ public void AksAddHelmChart_RejectsInvalidChartVersion()
[Fact]
public void AksAddHelmChart_RejectsMaliciousChartReference()
{
var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
using var workspace = TemporaryWorkspace.Create(outputHelper);
using var builder = AzureKubernetesTestBuilder.Create(outputHelper, workspace);
var aks = builder.AddAzureKubernetesEnvironment("aks");

Assert.Throws<ArgumentException>(() =>
Expand Down
Loading
Loading