chore: add --env-var-override and --port-override flags to local run

internal/pkg/aws/secretsmanager/secretsmanager.go

@@ -5,24 +5,23 @@
 package secretsmanager
 
 import (
+	"context"
 	"fmt"
 	"time"
 
+	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/session"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
 )
 
-// Namespace represents the AWS Secrets Manager service namespace.
-const Namespace = "secretsmanager"
-
 type api interface {
 	CreateSecret(*secretsmanager.CreateSecretInput) (*secretsmanager.CreateSecretOutput, error)
 	DeleteSecret(*secretsmanager.DeleteSecretInput) (*secretsmanager.DeleteSecretOutput, error)
-	DescribeSecret(input *secretsmanager.DescribeSecretInput) (*secretsmanager.DescribeSecretOutput, error)
-	GetSecretValue(input *secretsmanager.GetSecretValueInput) (*secretsmanager.GetSecretValueOutput, error)
+	DescribeSecret(*secretsmanager.DescribeSecretInput) (*secretsmanager.DescribeSecretOutput, error)
+	GetSecretValueWithContext(context.Context, *secretsmanager.GetSecretValueInput, ...request.Option) (*secretsmanager.GetSecretValueOutput, error)
 }
 
 // SecretsManager wraps the AWS SecretManager client.
@@ -120,8 +119,8 @@ func (s *SecretsManager) DescribeSecret(secretName string) (*DescribeSecretOutpu
 
 // GetSecretValue retrieves the value of a secret from AWS Secrets Manager.
 // It takes the name of the secret as input and returns the corresponding value as a string.
-func (s *SecretsManager) GetSecretValue(name string) (string, error) {
-	resp, err := s.secretsManager.GetSecretValue(&secretsmanager.GetSecretValueInput{
+func (s *SecretsManager) GetSecretValue(ctx context.Context, name string) (string, error) {
+	resp, err := s.secretsManager.GetSecretValueWithContext(ctx, &secretsmanager.GetSecretValueInput{
 		SecretId: aws.String(name),
 	})
 	if err != nil {

internal/pkg/aws/secretsmanager/secretsmanager_test.go

@@ -5,17 +5,17 @@
 package secretsmanager
 
 import (
+	"context"
 	"errors"
 	"fmt"
-	"github.com/aws/aws-sdk-go/service/secretsmanager"
 	"testing"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/secretsmanager"
 	"github.com/aws/copilot-cli/internal/pkg/aws/secretsmanager/mocks"
 	"github.com/golang/mock/gomock"
-
 	"github.com/stretchr/testify/require"
 )
 
@@ -251,3 +251,54 @@ func TestSecretsManager_DescribeSecret(t *testing.T) {
 		})
 	}
 }
+
+func TestSecretsManager_GetSecretValue(t *testing.T) {
+	tests := map[string]struct {
+		secretName string
+		setupMock  func(m *mocks.Mockapi)
+
+		want      string
+		wantError string
+	}{
+		"error": {
+			secretName: "asdf",
+			setupMock: func(m *mocks.Mockapi) {
+				m.EXPECT().GetSecretValueWithContext(gomock.Any(), &secretsmanager.GetSecretValueInput{
+					SecretId: aws.String("asdf"),
+				}).Return(nil, errors.New("some error"))
+			},
+			wantError: `get secret "asdf" from secrets manager: some error`,
+		},
+		"success": {
+			secretName: "asdf",
+			setupMock: func(m *mocks.Mockapi) {
+				m.EXPECT().GetSecretValueWithContext(gomock.Any(), &secretsmanager.GetSecretValueInput{
+					SecretId: aws.String("asdf"),
+				}).Return(&secretsmanager.GetSecretValueOutput{
+					SecretString: aws.String("hi"),
+				}, nil)
+			},
+			want: "hi",
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
+
+			api := mocks.NewMockapi(ctrl)
+			tc.setupMock(api)
+
+			sm := SecretsManager{
+				secretsManager: api,
+			}
+
+			got, err := sm.GetSecretValue(context.Background(), tc.secretName)
+			if tc.wantError != "" {
+				require.EqualError(t, err, tc.wantError)
+			}
+			require.Equal(t, tc.want, got)
+		})
+	}
+}

internal/pkg/aws/ssm/ssm.go

@@ -5,24 +5,23 @@
 package ssm
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"sort"
 
 	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ssm"
 )
 
-// Namespace represents the AWS Systems Manager(SSM) service namespace.
-const Namespace = "ssm"
-
 type api interface {
-	PutParameter(input *ssm.PutParameterInput) (*ssm.PutParameterOutput, error)
-	AddTagsToResource(input *ssm.AddTagsToResourceInput) (*ssm.AddTagsToResourceOutput, error)
-	GetParameter(input *ssm.GetParameterInput) (*ssm.GetParameterOutput, error)
+	PutParameter(*ssm.PutParameterInput) (*ssm.PutParameterOutput, error)
+	AddTagsToResource(*ssm.AddTagsToResourceInput) (*ssm.AddTagsToResourceOutput, error)
+	GetParameterWithContext(context.Context, *ssm.GetParameterInput, ...request.Option) (*ssm.GetParameterOutput, error)
 }
 
 // SSM wraps an AWS SSM client.
@@ -67,8 +66,8 @@ func (s *SSM) PutSecret(in PutSecretInput) (*PutSecretOutput, error) {
 
 // GetSecretValue retrieves the value of a parameter from AWS Systems Manager Parameter Store.
 // It takes the name of the parameter as input and returns the corresponding value as a string.
-func (s *SSM) GetSecretValue(name string) (string, error) {
-	resp, err := s.client.GetParameter(&ssm.GetParameterInput{
+func (s *SSM) GetSecretValue(ctx context.Context, name string) (string, error) {
+	resp, err := s.client.GetParameterWithContext(ctx, &ssm.GetParameterInput{
 		Name:           aws.String(name),
 		WithDecryption: aws.Bool(true),
 	})

internal/pkg/aws/ssm/ssm_test.go

@@ -4,21 +4,18 @@
 package ssm
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/aws/awserr"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/aws/copilot-cli/internal/pkg/deploy"
-
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/ssm"
 	"github.com/aws/copilot-cli/internal/pkg/aws/ssm/mocks"
-
+	"github.com/aws/copilot-cli/internal/pkg/deploy"
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/require"
 )
 
 func TestSSM_PutSecret(t *testing.T) {
@@ -361,3 +358,58 @@ func TestSSM_PutSecret(t *testing.T) {
 		})
 	}
 }
+
+func TestSSM_GetSecretValue(t *testing.T) {
+	tests := map[string]struct {
+		secretName string
+		setupMock  func(m *mocks.Mockapi)
+
+		want      string
+		wantError string
+	}{
+		"error": {
+			secretName: "asdf",
+			setupMock: func(m *mocks.Mockapi) {
+				m.EXPECT().GetParameterWithContext(gomock.Any(), &ssm.GetParameterInput{
+					Name:           aws.String("asdf"),
+					WithDecryption: aws.Bool(true),
+				}).Return(nil, errors.New("some error"))
+			},
+			wantError: `get parameter "asdf" from SSM: some error`,
+		},
+		"success": {
+			secretName: "asdf",
+			setupMock: func(m *mocks.Mockapi) {
+				m.EXPECT().GetParameterWithContext(gomock.Any(), &ssm.GetParameterInput{
+					Name:           aws.String("asdf"),
+					WithDecryption: aws.Bool(true),
+				}).Return(&ssm.GetParameterOutput{
+					Parameter: &ssm.Parameter{
+						Value: aws.String("hi"),
+					},
+				}, nil)
+			},
+			want: "hi",
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
+
+			api := mocks.NewMockapi(ctrl)
+			tc.setupMock(api)
+
+			ssm := SSM{
+				client: api,
+			}
+
+			got, err := ssm.GetSecretValue(context.Background(), tc.secretName)
+			if tc.wantError != "" {
+				require.EqualError(t, err, tc.wantError)
+			}
+			require.Equal(t, tc.want, got)
+		})
+	}
+}