Abstract AWS SDK types from deployer layer

- Add ExecuteChangeSetByID method to CloudFormationOperations interface
- Implement abstraction in DefaultCloudFormationOperations
- Remove direct AWS SDK dependencies from AWSDeployer
- Update deployer to use abstracted ExecuteChangeSetByID method
- Remove unnecessary awsinternal import alias
- Add comprehensive tests for new abstraction
- Update all test mocks to support new interface method

This change improves separation of concerns by ensuring the deployer
layer only interacts with internal abstractions rather than AWS SDK
types directly.

Author: orien

internal/aws/client_test.go

@@ -107,6 +107,10 @@ func (m *MockCloudFormationClient) ExecuteChangeSet(ctx context.Context, params
 	return nil, nil
 }
 
+func (m *MockCloudFormationClient) ExecuteChangeSetByID(ctx context.Context, changeSetID string) error {
+	return nil
+}
+
 func (m *MockCloudFormationClient) DeleteChangeSet(ctx context.Context, params *cloudformation.DeleteChangeSetInput, optFns ...func(*cloudformation.Options)) (*cloudformation.DeleteChangeSetOutput, error) {
 	return nil, nil
 }

internal/aws/cloudformation.go

@@ -441,6 +441,20 @@ func (cf *DefaultCloudFormationOperations) ExecuteChangeSet(ctx context.Context,
 	return cf.client.ExecuteChangeSet(ctx, params, optFns...)
 }
 
+// ExecuteChangeSetByID executes a CloudFormation changeset by ID, abstracting AWS SDK details
+func (cf *DefaultCloudFormationOperations) ExecuteChangeSetByID(ctx context.Context, changeSetID string) error {
+	executeInput := &cloudformation.ExecuteChangeSetInput{
+		ChangeSetName: aws.String(changeSetID),
+	}
+
+	_, err := cf.client.ExecuteChangeSet(ctx, executeInput)
+	if err != nil {
+		return fmt.Errorf("failed to execute changeset %s: %w", changeSetID, err)
+	}
+
+	return nil
+}
+
 // DeleteChangeSet deletes a CloudFormation changeset
 func (cf *DefaultCloudFormationOperations) DeleteChangeSet(ctx context.Context, params *cloudformation.DeleteChangeSetInput, optFns ...func(*cloudformation.Options)) (*cloudformation.DeleteChangeSetOutput, error) {
 	return cf.client.DeleteChangeSet(ctx, params, optFns...)

internal/aws/cloudformation_test.go

@@ -540,3 +540,47 @@ func TestDefaultCloudFormationOperations_ExecuteChangeSet_Error(t *testing.T) {
 	assert.Equal(t, expectedError, err)
 	mockClient.AssertExpectations(t)
 }
+
+func TestDefaultCloudFormationOperations_ExecuteChangeSetByID_Success(t *testing.T) {
+	mockClient := &MockCloudFormationClientForDeployTest{}
+	cfOps := NewCloudFormationOperationsWithClient(mockClient)
+	ctx := context.Background()
+
+	changeSetID := "arn:aws:cloudformation:us-east-1:123456789012:changeSet/test-changeset/test-stack"
+
+	executeInput := &cloudformation.ExecuteChangeSetInput{
+		ChangeSetName: aws.String(changeSetID),
+	}
+
+	expectedOutput := &cloudformation.ExecuteChangeSetOutput{}
+
+	mockClient.On("ExecuteChangeSet", ctx, executeInput).Return(expectedOutput, nil)
+
+	err := cfOps.ExecuteChangeSetByID(ctx, changeSetID)
+
+	require.NoError(t, err)
+	mockClient.AssertExpectations(t)
+}
+
+func TestDefaultCloudFormationOperations_ExecuteChangeSetByID_Error(t *testing.T) {
+	mockClient := &MockCloudFormationClientForDeployTest{}
+	cfOps := NewCloudFormationOperationsWithClient(mockClient)
+	ctx := context.Background()
+
+	changeSetID := "arn:aws:cloudformation:us-east-1:123456789012:changeSet/test-changeset/test-stack"
+
+	executeInput := &cloudformation.ExecuteChangeSetInput{
+		ChangeSetName: aws.String(changeSetID),
+	}
+
+	expectedError := errors.New("changeset execution failed")
+
+	mockClient.On("ExecuteChangeSet", ctx, executeInput).Return((*cloudformation.ExecuteChangeSetOutput)(nil), expectedError)
+
+	err := cfOps.ExecuteChangeSetByID(ctx, changeSetID)
+
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "failed to execute changeset")
+	assert.Contains(t, err.Error(), "changeset execution failed")
+	mockClient.AssertExpectations(t)
+}

internal/aws/interfaces.go

@@ -55,6 +55,7 @@ type CloudFormationOperations interface {
 	DescribeStack(ctx context.Context, stackName string) (*StackInfo, error)
 	CreateChangeSet(ctx context.Context, params *cloudformation.CreateChangeSetInput, optFns ...func(*cloudformation.Options)) (*cloudformation.CreateChangeSetOutput, error)
 	ExecuteChangeSet(ctx context.Context, params *cloudformation.ExecuteChangeSetInput, optFns ...func(*cloudformation.Options)) (*cloudformation.ExecuteChangeSetOutput, error)
+	ExecuteChangeSetByID(ctx context.Context, changeSetID string) error
 	DeleteChangeSet(ctx context.Context, params *cloudformation.DeleteChangeSetInput, optFns ...func(*cloudformation.Options)) (*cloudformation.DeleteChangeSetOutput, error)
 	DescribeChangeSet(ctx context.Context, params *cloudformation.DescribeChangeSetInput, optFns ...func(*cloudformation.Options)) (*cloudformation.DescribeChangeSetOutput, error)
 	DescribeStackEvents(ctx context.Context, stackName string) ([]StackEvent, error)

internal/deploy/deployer.go

@@ -9,9 +9,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/cloudformation"
-	awsinternal "github.com/orien/stackaroo/internal/aws"
+	"github.com/orien/stackaroo/internal/aws"
 	"github.com/orien/stackaroo/internal/diff"
 	"github.com/orien/stackaroo/internal/model"
 	"github.com/orien/stackaroo/internal/prompt"
@@ -25,19 +23,19 @@ type Deployer interface {
 
 // AWSDeployer implements Deployer using AWS CloudFormation
 type AWSDeployer struct {
-	awsClient awsinternal.Client
+	awsClient aws.Client
 }
 
 // NewAWSDeployer creates a new AWSDeployer
-func NewAWSDeployer(awsClient awsinternal.Client) *AWSDeployer {
+func NewAWSDeployer(awsClient aws.Client) *AWSDeployer {
 	return &AWSDeployer{
 		awsClient: awsClient,
 	}
 }
 
 // NewDefaultDeployer creates a deployer with default AWS configuration
 func NewDefaultDeployer(ctx context.Context) (*AWSDeployer, error) {
-	client, err := awsinternal.NewDefaultClient(ctx, awsinternal.Config{})
+	client, err := aws.NewDefaultClient(ctx, aws.Config{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create AWS client: %w", err)
 	}
@@ -70,9 +68,9 @@ func (d *AWSDeployer) deployNewStack(ctx context.Context, stack *model.Stack) er
 	fmt.Printf("=== Creating new stack %s ===\n", stack.Name)
 
 	// Convert parameters to AWS format
-	awsParams := make([]awsinternal.Parameter, 0, len(stack.Parameters))
+	awsParams := make([]aws.Parameter, 0, len(stack.Parameters))
 	for key, value := range stack.Parameters {
-		awsParams = append(awsParams, awsinternal.Parameter{
+		awsParams = append(awsParams, aws.Parameter{
 			Key:   key,
 			Value: value,
 		})
@@ -85,7 +83,7 @@ func (d *AWSDeployer) deployNewStack(ctx context.Context, stack *model.Stack) er
 	}
 
 	// Set up event callback for user feedback
-	eventCallback := func(event awsinternal.StackEvent) {
+	eventCallback := func(event aws.StackEvent) {
 		timestamp := event.Timestamp.Format("2006-01-02 15:04:05")
 		fmt.Printf("[%s] %-20s %-40s %s %s\n",
 			timestamp,
@@ -96,7 +94,7 @@ func (d *AWSDeployer) deployNewStack(ctx context.Context, stack *model.Stack) er
 		)
 	}
 
-	deployInput := awsinternal.DeployStackInput{
+	deployInput := aws.DeployStackInput{
 		StackName:    stack.Name,
 		TemplateBody: stack.TemplateBody,
 		Parameters:   awsParams,
@@ -174,18 +172,15 @@ func (d *AWSDeployer) deployWithChangeSet(ctx context.Context, stack *model.Stac
 	// Execute the changeset
 	fmt.Printf("=== Deploying stack %s ===\n", stack.Name)
 
-	executeInput := &cloudformation.ExecuteChangeSetInput{
-		ChangeSetName: aws.String(changeSetInfo.ChangeSetID),
-	}
-	_, err = cfnOps.ExecuteChangeSet(ctx, executeInput)
+	err = cfnOps.ExecuteChangeSetByID(ctx, changeSetInfo.ChangeSetID)
 	if err != nil {
 		// Clean up changeset on failure
 		_ = changeSetMgr.DeleteChangeSet(ctx, changeSetInfo.ChangeSetID)
 		return fmt.Errorf("failed to execute changeset: %w", err)
 	}
 
 	// Wait for deployment to complete with progress updates
-	eventCallback := func(event awsinternal.StackEvent) {
+	eventCallback := func(event aws.StackEvent) {
 		timestamp := event.Timestamp.Format("2006-01-02 15:04:05")
 		fmt.Printf("[%s] %-20s %-40s %s %s\n",
 			timestamp,

internal/deploy/deployer_test.go

@@ -118,6 +118,12 @@ func (m *MockCloudFormationOperations) ExecuteChangeSet(ctx context.Context, par
 	return args.Get(0).(*cloudformation.ExecuteChangeSetOutput), args.Error(1)
 }
 
+// ExecuteChangeSetByID executes a changeset by ID (abstracted method)
+func (m *MockCloudFormationOperations) ExecuteChangeSetByID(ctx context.Context, changeSetID string) error {
+	args := m.Called(ctx, changeSetID)
+	return args.Error(0)
+}
+
 func (m *MockCloudFormationOperations) DescribeStackEvents(ctx context.Context, stackName string) ([]awsinternal.StackEvent, error) {
 	args := m.Called(ctx, stackName)
 	return args.Get(0).([]awsinternal.StackEvent), args.Error(1)
@@ -413,8 +419,8 @@ func TestAWSDeployer_DeployStack_WithChanges(t *testing.T) {
 	}
 	mockCfnOps.On("DescribeChangeSet", mock.Anything, mock.AnythingOfType("*cloudformation.DescribeChangeSetInput")).Return(describeOutput, nil).Times(2)
 
-	// Mock execute changeset
-	mockCfnOps.On("ExecuteChangeSet", mock.Anything, mock.AnythingOfType("*cloudformation.ExecuteChangeSetInput")).Return(&cloudformation.ExecuteChangeSetOutput{}, nil)
+	// Mock execute changeset using abstracted method
+	mockCfnOps.On("ExecuteChangeSetByID", mock.Anything, "test-changeset-id").Return(nil)
 
 	// Mock wait for stack operation
 	mockCfnOps.On("WaitForStackOperation", mock.Anything, "test-stack", mock.AnythingOfType("func(aws.StackEvent)")).Return(nil)

internal/diff/changeset_test.go

@@ -44,6 +44,11 @@ func (m *MockChangeSetClient) ExecuteChangeSet(ctx context.Context, params *clou
 	return args.Get(0).(*cloudformation.ExecuteChangeSetOutput), args.Error(1)
 }
 
+func (m *MockChangeSetClient) ExecuteChangeSetByID(ctx context.Context, changeSetID string) error {
+	args := m.Called(ctx, changeSetID)
+	return args.Error(0)
+}
+
 // Additional methods to satisfy CloudFormationOperations
 
 func (m *MockChangeSetClient) DeployStack(ctx context.Context, input aws.DeployStackInput) error {

internal/diff/differ_test.go

@@ -94,6 +94,11 @@ func (m *MockCloudFormationClient) ExecuteChangeSet(ctx context.Context, params
 	return args.Get(0).(*cloudformation.ExecuteChangeSetOutput), args.Error(1)
 }
 
+func (m *MockCloudFormationClient) ExecuteChangeSetByID(ctx context.Context, changeSetID string) error {
+	args := m.Called(ctx, changeSetID)
+	return args.Error(0)
+}
+
 func (m *MockCloudFormationClient) DescribeStackEvents(ctx context.Context, stackName string) ([]aws.StackEvent, error) {
 	args := m.Called(ctx, stackName)
 	return args.Get(0).([]aws.StackEvent), args.Error(1)