Add AWS CloudFormation Provisioning and SDK Configuration

src/Aspire.Hosting.AWS/Aspire.Hosting.AWS.csproj

@@ -12,5 +12,9 @@
     <PackageReference Include="AWSSDK.Core" />
     <PackageReference Include="AWSSDK.CloudFormation" />
   </ItemGroup>
-
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Aspire.Hosting.Tests" />
+  </ItemGroup>
+
 </Project>

src/Aspire.Hosting.AWS/CloudFormation/CloudFormationStackResource.cs

@@ -12,14 +12,14 @@ internal sealed class CloudFormationStackResource(string name) : CloudFormationR
     internal void WriteToManifest(ManifestPublishingContext context)
     {
         context.Writer.WriteString("type", "aws.cloudformation.stack.v0");
-        context.Writer.TryWriteString("stack-name", context.GetManifestRelativePath(Name));
+        context.Writer.TryWriteString("stack-name", Name);
 
         context.Writer.WritePropertyName("references");
         context.Writer.WriteStartArray();
         foreach (var cloudFormationResource in Annotations.OfType<CloudFormationReferenceAnnotation>())
         {
             context.Writer.WriteStartObject();
-            context.Writer.WriteString("TargetResource", cloudFormationResource.TargetResource);
+            context.Writer.WriteString("target-resource", cloudFormationResource.TargetResource);
             context.Writer.WriteEndObject();
         }
         context.Writer.WriteEndArray();

src/Aspire.Hosting.AWS/CloudFormation/CloudFormationTemplateResource.cs

@@ -36,15 +36,15 @@ public ICloudFormationTemplateResource AddParameter(string parameterName, string
     internal void WriteToManifest(ManifestPublishingContext context)
     {
         context.Writer.WriteString("type", "aws.cloudformation.template.v0");
-        context.Writer.TryWriteString("stack-name", context.GetManifestRelativePath(Name));
+        context.Writer.TryWriteString("stack-name", Name);
         context.Writer.TryWriteString("template-path", context.GetManifestRelativePath(TemplatePath));
 
         context.Writer.WritePropertyName("references");
         context.Writer.WriteStartArray();
         foreach (var cloudFormationResource in Annotations.OfType<CloudFormationReferenceAnnotation>())
         {
             context.Writer.WriteStartObject();
-            context.Writer.WriteString("TargetResource", cloudFormationResource.TargetResource);
+            context.Writer.WriteString("target-resource", cloudFormationResource.TargetResource);
             context.Writer.WriteEndObject();
         }
         context.Writer.WriteEndArray();

tests/Aspire.Hosting.Tests/AWS/AWSCloudFormationResourceTests.cs

@@ -0,0 +1,113 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json.Nodes;
+using Amazon;
+using Aspire.Hosting.AWS.CloudFormation;
+using Aspire.Hosting.Utils;
+using Xunit;
+
+namespace Aspire.Hosting.Tests.AWS;
+public class AWSCloudFormationResourceTests
+{
+    [Fact]
+    public void AddAWSCloudFormationStackResourceTest()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var awsSdkConfig = builder.AddAWSSDKConfig()
+                                .WithRegion(RegionEndpoint.USWest2)
+                                .WithProfile("test-profile");
+
+        var resource = builder.AddAWSCloudFormationStack("ExistingStack")
+                                                    .WithReference(awsSdkConfig)
+                                                    .Resource;
+
+        Assert.Equal("ExistingStack", resource.Name);
+        Assert.NotNull(resource.AWSSDKConfig);
+        Assert.Equal(RegionEndpoint.USWest2, resource.AWSSDKConfig.Region);
+        Assert.Equal("test-profile", resource.AWSSDKConfig.Profile);
+    }
+
+    [Fact]
+    public void AddAWSCloudFormationTemplateResourceTest()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var awsSdkConfig = builder.AddAWSSDKConfig()
+                                .WithRegion(RegionEndpoint.USWest2)
+                                .WithProfile("test-profile");
+
+        var resource = builder.AddAWSCloudFormationTemplate("NewStack", "cf.template")
+                                                    .WithParameter("key1", "value1")
+                                                    .WithParameter("key2", "value2")
+                                                    .WithReference(awsSdkConfig)
+                                                    .Resource as CloudFormationTemplateResource;
+
+        Assert.NotNull(resource);
+        Assert.Equal("NewStack", resource.Name);
+        Assert.Equal("cf.template", resource.TemplatePath);
+        Assert.NotNull(resource.AWSSDKConfig);
+        Assert.Equal(RegionEndpoint.USWest2, resource.AWSSDKConfig.Region);
+        Assert.Equal("test-profile", resource.AWSSDKConfig.Profile);
+
+        Assert.Equal(2, resource.CloudFormationParameters.Count);
+        Assert.Equal("value1", resource.CloudFormationParameters["key1"]);
+        Assert.Equal("value2", resource.CloudFormationParameters["key2"]);
+    }
+
+    [Fact]
+    public void ManifestAWSCloudFormationStackResourceTest()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var resourceBuilder = builder.AddAWSCloudFormationStack("ExistingStack");
+
+        var projectBuilder = builder.AddProject<Projects.ServiceA>("serviceA")
+                                    .WithReference(resourceBuilder);
+
+        var resource = resourceBuilder.Resource as CloudFormationStackResource;
+        Assert.NotNull(resource);
+        var obj = ManifestUtils.GetManifest(resource.WriteToManifest);
+
+        Assert.NotNull(obj);
+        Assert.Equal("aws.cloudformation.stack.v0", obj["type"]?.ToString());
+        Assert.Equal("ExistingStack", obj["stack-name"]?.ToString());
+
+        var references = obj["references"] as JsonArray;
+        Assert.NotNull(references);
+        Assert.Single(references);
+
+        var ref1 = references[0];
+        Assert.NotNull(ref1);
+        Assert.Equal("serviceA", ref1["target-resource"]?.ToString());
+    }
+
+    [Fact]
+    public void ManifestAWSCloudFormationTemplateResourceTest()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var resourceBuilder = builder.AddAWSCloudFormationTemplate("NewStack", "cf.template");
+
+        var projectBuilder = builder.AddProject<Projects.ServiceA>("serviceA")
+                                    .WithReference(resourceBuilder);
+
+        var resource = resourceBuilder.Resource as CloudFormationTemplateResource;
+        Assert.NotNull(resource);
+        var obj = ManifestUtils.GetManifest(resource.WriteToManifest);
+
+        Assert.NotNull(obj);
+        Assert.Equal("aws.cloudformation.template.v0", obj["type"]?.ToString());
+        Assert.Equal("NewStack", obj["stack-name"]?.ToString());
+        Assert.Equal("net8.0/cf.template", obj["template-path"]?.ToString());
+
+        var references = obj["references"] as JsonArray;
+        Assert.NotNull(references);
+        Assert.Single(references);
+
+        var ref1 = references[0];
+        Assert.NotNull(ref1);
+        Assert.Equal("serviceA", ref1["target-resource"]?.ToString());
+    }
+}

tests/Aspire.Hosting.Tests/AWS/StackOutputReferenceTests.cs

@@ -0,0 +1,76 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Amazon.CloudFormation.Model;
+using Aspire.Hosting.AWS.CloudFormation;
+using Xunit;
+
+namespace Aspire.Hosting.Tests.AWS;
+public class StackOutputReferenceTests
+{
+    [Fact]
+    public async Task GetValueAsyncTest()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var resourceBuilder = builder.AddAWSCloudFormationTemplate("NewStack", "cf.template");
+
+        var resource = resourceBuilder.Resource as CloudFormationTemplateResource;
+        Assert.NotNull(resource);
+
+        resource.Outputs = new List<Output>
+        {
+            new Output{OutputKey = "key1", OutputValue = "value1"}
+        };
+
+        resource.ProvisioningTaskCompletionSource = new TaskCompletionSource();
+
+        var reference = resourceBuilder.GetOutput("key1");
+        Assert.Equal("key1", reference.Name);
+
+        var cancellationSource = new CancellationTokenSource(TimeSpan.FromSeconds(2));
+        await Assert.ThrowsAsync<TaskCanceledException>(() => reference.GetValueAsync(cancellationSource.Token).AsTask());
+
+        resource.ProvisioningTaskCompletionSource.TrySetResult();
+        var value = await reference.GetValueAsync(cancellationSource.Token);
+        Assert.Equal("value1", value);
+    }
+
+    [Fact]
+    public void ValueExpressionTest()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var resourceBuilder = builder.AddAWSCloudFormationTemplate("NewStack", "cf.template");
+
+        var resource = resourceBuilder.Resource as CloudFormationTemplateResource;
+        Assert.NotNull(resource);
+
+        resource.Outputs = new List<Output>
+        {
+            new Output{OutputKey = "key1", OutputValue = "value1"}
+        };
+
+        var reference = resourceBuilder.GetOutput("key1");
+        Assert.Equal("{NewStack.output.key1}", reference.ValueExpression);
+    }
+
+    [Fact]
+    public void InvalidOutputKey()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+
+        var resourceBuilder = builder.AddAWSCloudFormationTemplate("NewStack", "cf.template");
+
+        var resource = resourceBuilder.Resource as CloudFormationTemplateResource;
+        Assert.NotNull(resource);
+
+        resource.Outputs = new List<Output>
+        {
+            new Output{OutputKey = "key1", OutputValue = "value1"}
+        };
+
+        var reference = resourceBuilder.GetOutput("not-found");
+        Assert.Throws<System.InvalidOperationException>(() => reference.Value);
+    }
+}

tests/Aspire.Hosting.Tests/Aspire.Hosting.Tests.csproj

@@ -1,3 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Aspire.Hosting\Aspire.Hosting.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\..\src\Aspire.Hosting.AWS\Aspire.Hosting.AWS.csproj" IsAspireProjectResource="false" />    
     <ProjectReference Include="..\..\src\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" IsAspireProjectResource="false" />
     <ProjectReference Include="..\testproject\TestProject.AppHost\TestProject.AppHost.csproj" IsAspireProjectResource="false" />