Merge branch 'dev'

Author: aws-sdk-dotnet-automation

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Release 2025-06-25
+
+### AWS.Deploy.CLI (2.0.1)
+* Fixed intermittent IAM permission failures in delete-deployment command by ensuring CloudFormation client is created after AWS credentials are configured
+### AWS.Deploy.Recipes.CDK.Common (2.0.1)
+### AWS.Deploy.ServerMode.Client (2.0.1)
+
 ## Release 2025-06-16
 
 ### AWS.Deploy.CLI (2.0.0)

src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj

@@ -22,7 +22,7 @@
     <NoWarn>$(NoWarn);1570;1591;ASP0000</NoWarn>
     <RollForward>Major</RollForward>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AWS.Deploy.CLI/Commands/DeleteDeploymentCommand.cs

@@ -1,10 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Amazon;
 using Amazon.CloudFormation;
 using Amazon.CloudFormation.Model;
@@ -28,7 +24,6 @@ public class DeleteDeploymentCommand : CancellableAsyncCommand<DeleteDeploymentC
 
     private readonly IAWSClientFactory _awsClientFactory;
     private readonly IToolInteractiveService _interactiveService;
-    private readonly IAmazonCloudFormation _cloudFormationClient;
     private readonly IConsoleUtilities _consoleUtilities;
     private readonly ILocalUserSettingsEngine _localUserSettingsEngine;
     private readonly IAWSUtilities _awsUtilities;
@@ -51,7 +46,6 @@ public DeleteDeploymentCommand(
         _awsClientFactory = awsClientFactory;
         _interactiveService = interactiveService;
         _consoleUtilities = consoleUtilities;
-        _cloudFormationClient = _awsClientFactory.GetAWSClient<IAmazonCloudFormation>();
         _localUserSettingsEngine = localUserSettingsEngine;
         _awsUtilities = awsUtilities;
         _projectParserUtility = projectParserUtility;
@@ -123,10 +117,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, DeleteDeplo
 
         try
         {
-            await _cloudFormationClient.DeleteStackAsync(new DeleteStackRequest
-            {
-                StackName = settings.DeploymentName
-            });
+            await _awsResourceQueryer.DeleteStack(settings.DeploymentName);
 
             // Fire and forget the monitor
             // Monitor updates the stdout with current status of the CloudFormation stack
@@ -218,20 +209,17 @@ private async Task WaitForStackDelete(string stackName)
             {
                 await Task.Delay(waitTime);
 
-                var response = await _cloudFormationClient.DescribeStacksAsync(new DescribeStacksRequest
-                {
-                    StackName = stackName
-                });
+                var response = await _awsResourceQueryer.DescribeStacks(stackName);
 
-                stack = response.Stacks == null || response.Stacks.Count == 0 ? null : response.Stacks[0];
+                stack = response.Count == 0 ? null : response[0];
                 shouldRetry = false;
             }
-            catch (AmazonCloudFormationException exception) when (exception.ErrorCode.Equals("ValidationError") && exception.Message.Equals($"Stack with id {stackName} does not exist"))
+            catch (ResourceQueryException exception) when (exception.InnerException is AmazonCloudFormationException amazonCloudFormationException && amazonCloudFormationException.ErrorCode.Equals("ValidationError") && amazonCloudFormationException.Message.Equals($"Stack with id {stackName} does not exist"))
             {
                 _interactiveService.WriteDebugLine(exception.PrettyPrint());
                 shouldRetry = false;
             }
-            catch (AmazonCloudFormationException exception) when (exception.ErrorCode.Equals("Throttling"))
+            catch (ResourceQueryException exception) when (exception.InnerException is AmazonCloudFormationException amazonCloudFormationException && amazonCloudFormationException.ErrorCode.Equals("Throttling"))
             {
                 _interactiveService.WriteDebugLine(exception.PrettyPrint());
                 shouldRetry = true;

src/AWS.Deploy.CLI/ServerMode/Services/SessionAWSResourceQuery.cs

@@ -243,6 +243,16 @@ public async Task<Distribution> GetCloudFrontDistribution(string distributionId)
             return (await GetAndCache(async () => await _awsResourceQueryer.GetCloudFrontDistribution(distributionId), new object[] { distributionId }))!;
         }
 
+        public async Task<List<Stack>> DescribeStacks(string stackName)
+        {
+            return (await GetAndCache(async () => await _awsResourceQueryer.DescribeStacks(stackName), new object[] { stackName }))!;
+        }
+
+        public async Task<DeleteStackResponse> DeleteStack(string stackName)
+        {
+            return (await GetAndCache(async () => await _awsResourceQueryer.DeleteStack(stackName), new object[] { stackName }))!;
+        }
+
         /// <inheritdoc/>
         public async Task<Vpc?> GetDefaultVpc()
         {

src/AWS.Deploy.Common/Data/IAWSResourceQueryer.cs

@@ -36,6 +36,8 @@ public enum BeanstalkPlatformType { Linux, Windows }
     /// </remarks>
     public interface IAWSResourceQueryer
     {
+        Task<List<Stack>> DescribeStacks(string stackName);
+        Task<DeleteStackResponse> DeleteStack(string stackName);
         Task<Vpc?> GetDefaultVpc();
         Task<ResourceDescription> GetCloudControlApiResource(string type, string identifier);
         Task<List<StackEvent>> GetCloudFormationStackEvents(string stackName);

src/AWS.Deploy.Orchestration/Data/AWSResourceQueryer.cs

@@ -51,6 +51,34 @@ namespace AWS.Deploy.Orchestration.Data
 {
     public class AWSResourceQueryer(IAWSClientFactory awsClientFactory) : IAWSResourceQueryer
     {
+        public async Task<List<Stack>> DescribeStacks(string stackName)
+        {
+            var cfClient = awsClientFactory.GetAWSClient<IAmazonCloudFormation>();
+            var request = new DescribeStacksRequest
+            {
+                StackName = stackName
+            };
+
+            return await HandleException(async () => await cfClient.Paginators
+                    .DescribeStacks(request)
+                    .Stacks
+                    .ToListAsync(),
+                $"Error attempting to describe available CloudFormation stacks using stack name '{stackName}'");
+        }
+
+        public async Task<DeleteStackResponse> DeleteStack(string stackName)
+        {
+            var cfClient = awsClientFactory.GetAWSClient<IAmazonCloudFormation>();
+            var request = new DeleteStackRequest
+            {
+                StackName = stackName
+            };
+
+            return await HandleException(async () => await cfClient
+                    .DeleteStackAsync(request),
+                $"Error attempting to delete the CloudFormation stack '{stackName}'.");
+        }
+
         public async Task<ResourceDescription> GetCloudControlApiResource(string type, string identifier)
         {
             var cloudControlApiClient = awsClientFactory.GetAWSClient<IAmazonCloudControlApi>();

src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj

@@ -13,7 +13,7 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/aws/aws-dotnet-deploy</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj

@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/aws/aws-dotnet-deploy</PackageProjectUrl>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

test/AWS.Deploy.CLI.IntegrationTests/Utilities/TestToolAWSResourceQueryer.cs

@@ -69,6 +69,10 @@ public Task<PlatformSummary> GetLatestElasticBeanstalkPlatformArn(string? target
         public Task<List<SecurityGroup>> DescribeSecurityGroups(string? vpcID = null) => throw new NotImplementedException();
         public Task<string?> GetParameterStoreTextValue(string parameterName) => throw new NotImplementedException();
         public Task<ResourceDescription> GetCloudControlApiResource(string type, string identifier) => throw new NotImplementedException();
+        public Task<List<Stack>> DescribeStacks(string stackName) => throw new NotImplementedException();
+
+        public Task<DeleteStackResponse> DeleteStack(string stackName) => throw new NotImplementedException();
+
         public Task<Vpc?> GetDefaultVpc() => throw new NotImplementedException();
         public Task<List<ConfigurationSettingsDescription>> DescribeElasticBeanstalkConfigurationSettings(string applicationName, string environmentName) => throw new NotImplementedException();
     }

test/AWS.Deploy.CLI.UnitTests/Utilities/TestToolAWSResourceQueryer.cs

@@ -94,6 +94,10 @@ public Task<PlatformSummary> GetLatestElasticBeanstalkPlatformArn(string? target
         public Task<List<SecurityGroup>> DescribeSecurityGroups(string? vpcID = null) => throw new NotImplementedException();
         public Task<string?> GetParameterStoreTextValue(string parameterName) => throw new NotImplementedException();
         public Task<ResourceDescription> GetCloudControlApiResource(string type, string identifier) => throw new NotImplementedException();
+        public Task<List<Stack>> DescribeStacks(string stackName) => throw new NotImplementedException();
+
+        public Task<DeleteStackResponse> DeleteStack(string stackName) => throw new NotImplementedException();
+
         public Task<Vpc?> GetDefaultVpc() => throw new NotImplementedException();
         public Task<List<ConfigurationSettingsDescription>> DescribeElasticBeanstalkConfigurationSettings(string applicationName, string environmentName) => throw new NotImplementedException();
     }