Merge branch 'dev'

Author: aws-sdk-dotnet-automation

.github/workflows/aws-ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 #v4
+        uses: aws-actions/configure-aws-credentials@f24d7193d98baebaeacc7e2227925dd47cc267f5 #v4
         with:
           role-to-assume: ${{ secrets.CI_MAIN_TESTING_ACCOUNT_ROLE_ARN }}
           role-duration-seconds: 7200
@@ -29,7 +29,7 @@ jobs:
           $roleArn=$(cat ./response.json)
           "roleArn=$($roleArn -replace '"', '')" >> $env:GITHUB_OUTPUT
       - name: Configure Test Runner Credentials
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 #v4
+        uses: aws-actions/configure-aws-credentials@f24d7193d98baebaeacc7e2227925dd47cc267f5 #v4
         with:
           role-to-assume: ${{ steps.lambda.outputs.roleArn }}
           role-duration-seconds: 7200

.github/workflows/create-release-pr.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 #v4
+        uses: aws-actions/configure-aws-credentials@f24d7193d98baebaeacc7e2227925dd47cc267f5 #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2

.github/workflows/semgrep-analysis.yml

@@ -35,7 +35,7 @@ jobs:
             p/owasp-top-ten
 
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 #v3.28.16 
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b #v3.28.17
         with:
           sarif_file: semgrep.sarif
         if: always()

.github/workflows/sync-main-dev.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 #v4
+        uses: aws-actions/configure-aws-credentials@f24d7193d98baebaeacc7e2227925dd47cc267f5 #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Release 2025-05-19
+
+### Aspire.Hosting.AWS (9.2.2)
+* Update default Amazon.Lambda.TestTool version to 0.10.3
+* Add IResourceWithWaitSupport support for CloudFormation provisioning. This is useful when using LocalStack container as the CloudFormation endpoint.
+
 ## Release 2025-05-08
 
 ### Aspire.Hosting.AWS (9.2.1)

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

@@ -6,7 +6,7 @@
     <PackageTags>aspire integration hosting aws</PackageTags>
     <Description>Add support for provisioning AWS application resources and configuring the AWS SDK for .NET.</Description>
     <NoWarn>$(NoWarn);CS8002</NoWarn> <!-- AWS CDK packages are not signed -->
-    <Version>9.2.1</Version>
+    <Version>9.2.2</Version>
     <PackageReadmeFile>docs\README.md</PackageReadmeFile>
   </PropertyGroup>
 

src/Aspire.Hosting.AWS/CDK/IConstructResource.cs

@@ -7,4 +7,4 @@ namespace Aspire.Hosting.AWS.CDK;
 /// <summary>
 /// Resource representing an AWS CDK construct.
 /// </summary>
-public interface IConstructResource : IResourceWithParent<IResourceWithConstruct>, IResourceWithConstruct;
+public interface IConstructResource : IResourceWithParent<IResourceWithConstruct>, IResourceWithConstruct, IResourceWithWaitSupport;

src/Aspire.Hosting.AWS/CDK/IStackResource.cs

@@ -1,14 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 using Amazon.CDK;
+using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.AWS.CloudFormation;
 
 namespace Aspire.Hosting.AWS.CDK;
 
 /// <summary>
 /// Resource representing an AWS CDK stack.
 /// </summary>
-public interface IStackResource : ICloudFormationTemplateResource, IResourceWithConstruct
+public interface IStackResource : ICloudFormationTemplateResource, IResourceWithConstruct, IResourceWithWaitSupport
 {
     /// <summary>
     /// The AWS CDK stack

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

@@ -2,13 +2,14 @@
 
 using Amazon.CloudFormation;
 using Amazon.CloudFormation.Model;
+using Aspire.Hosting.ApplicationModel;
 
 namespace Aspire.Hosting.AWS.CloudFormation;
 
 /// <summary>
 /// Resource representing an AWS CloudFormation stack.
 /// </summary>
-public interface ICloudFormationResource : IAWSResource
+public interface ICloudFormationResource : IAWSResource, IResourceWithWaitSupport
 {
     /// <summary>
     /// The configured Amazon CloudFormation service client used to make service calls. If this property set

src/Aspire.Hosting.AWS/Constants.cs

@@ -46,5 +46,5 @@ internal static class Constants
     /// <summary>
     /// The default version of Amazon.Lambda.TestTool that will be automatically installed
     /// </summary>
-    internal const string DefaultLambdaTestToolVersion = "0.10.1";
+    internal const string DefaultLambdaTestToolVersion = "0.10.3";
 }

src/Aspire.Hosting.AWS/Provisioning/AWSResourceProvisionerOfT.cs

@@ -1,18 +1,33 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+using Aspire.Hosting.ApplicationModel;
+
 namespace Aspire.Hosting.AWS.Provisioning;
 
 internal interface IAWSResourceProvisioner
 {
     Task GetOrCreateResourceAsync(IAWSResource resource, CancellationToken cancellationToken = default);
 }
 
-internal abstract class AWSResourceProvisioner<TResource> : IAWSResourceProvisioner
+internal abstract class AWSResourceProvisioner<TResource>(ResourceNotificationService notificationService) : IAWSResourceProvisioner
     where TResource : IAWSResource
 {
-    public Task GetOrCreateResourceAsync(
+    protected ResourceNotificationService NotificationService => notificationService;
+
+    public async Task GetOrCreateResourceAsync(
         IAWSResource resource,
         CancellationToken cancellationToken)
-        => GetOrCreateResourceAsync((TResource)resource, cancellationToken);
+    {
+        if (resource is IResourceWithWaitSupport waitResource)
+        {
+            await notificationService.WaitForDependenciesAsync(waitResource, cancellationToken).ConfigureAwait(false);
+            await NotificationService.PublishUpdateAsync(resource, state => state with
+            {
+                State = new ResourceStateSnapshot("Starting", KnownResourceStateStyles.Info)
+            }).ConfigureAwait(false);
+        }
+
+        await GetOrCreateResourceAsync((TResource)resource, cancellationToken);
+    }
 
     protected abstract Task GetOrCreateResourceAsync(TResource resource, CancellationToken cancellationToken);
 }

src/Aspire.Hosting.AWS/Provisioning/CloudFormationResourceProvisioner.cs

@@ -12,13 +12,11 @@
 
 namespace Aspire.Hosting.AWS.Provisioning;
 
-internal abstract partial class CloudFormationResourceProvisioner<T>(ResourceLoggerService loggerService, ResourceNotificationService notificationService) : AWSResourceProvisioner<T>
+internal abstract partial class CloudFormationResourceProvisioner<T>(ResourceLoggerService loggerService, ResourceNotificationService notificationService) : AWSResourceProvisioner<T>(notificationService) 
     where T : ICloudFormationResource
 {
     protected ResourceLoggerService LoggerService => loggerService;
 
-    protected ResourceNotificationService NotificationService => notificationService;
-
     protected async Task PublishCloudFormationUpdatePropertiesAsync(T resource, ImmutableArray<ResourcePropertySnapshot>? properties = null, ImmutableArray<UrlSnapshot>? urls = default)
     {
         if (properties == null)