Skip to content

fix(task): use only env security group for task run #1884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Jan 27, 2021
Merged

fix(task): use only env security group for task run #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd7793e
fix(task): use only env security group for task run
iamhopaul123 Jan 27, 2021
1fb5fce
Address feedback
iamhopaul123 Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/pkg/task/env_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import (
const (
fmtErrPublicSubnetsFromEnv = "get public subnet IDs from environment %s: %w"
fmtErrSecurityGroupsFromEnv = "get security groups from environment %s: %w"

envSecurityGroupCFNLogicalIDTagKey = "aws:cloudformation:logical-id"
envSecurityGroupCFNLogicalIDTagValue = "EnvironmentSecurityGroup"
)

// Names for tag filters
Expand Down Expand Up @@ -60,7 +63,11 @@ func (r *EnvRunner) Run() ([]*Task, error) {
return nil, errNoSubnetFound
}

securityGroups, err := r.VPCGetter.SecurityGroups(filters...)
// Use only environment security group https://github.com/aws/copilot-cli/issues/1882.
securityGroups, err := r.VPCGetter.SecurityGroups(append(filters, ec2.Filter{
Name: fmt.Sprintf(ec2.TagFilterName, envSecurityGroupCFNLogicalIDTagKey),
Values: []string{envSecurityGroupCFNLogicalIDTagValue},
})...)
if err != nil {
return nil, fmt.Errorf(fmtErrSecurityGroupsFromEnv, r.Env, err)
}
Expand Down
20 changes: 12 additions & 8 deletions internal/pkg/task/env_runner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestEnvRunner_Run(t *testing.T) {
inApp := "my-app"
inEnv := "my-env"

filtersForVPCFromAppEnv := []ec2.Filter{
filtersForSubnetID := []ec2.Filter{
{
Name: tagFilterNameForEnv,
Values: []string{inEnv},
Expand All @@ -30,6 +30,10 @@ func TestEnvRunner_Run(t *testing.T) {
Values: []string{inApp},
},
}
filtersForSecurityGroup := append(filtersForSubnetID, ec2.Filter{
Name: "tag:aws:cloudformation:logical-id",
Values: []string{"EnvironmentSecurityGroup"},
})

MockClusterGetter := func(m *mocks.MockClusterGetter) {
m.EXPECT().ClusterARN(inApp, inEnv).Return("cluster-1", nil)
Expand Down Expand Up @@ -64,7 +68,7 @@ func TestEnvRunner_Run(t *testing.T) {
"failed to get subnets": {
MockClusterGetter: MockClusterGetter,
MockVPCGetter: func(m *mocks.MockVPCGetter) {
m.EXPECT().PublicSubnetIDs(filtersForVPCFromAppEnv).
m.EXPECT().PublicSubnetIDs(filtersForSubnetID).
Return(nil, errors.New("error getting subnets"))
m.EXPECT().SecurityGroups(gomock.Any()).AnyTimes()
},
Expand All @@ -74,7 +78,7 @@ func TestEnvRunner_Run(t *testing.T) {
"no subnet is found": {
MockClusterGetter: MockClusterGetter,
MockVPCGetter: func(m *mocks.MockVPCGetter) {
m.EXPECT().PublicSubnetIDs(filtersForVPCFromAppEnv).
m.EXPECT().PublicSubnetIDs(filtersForSubnetID).
Return([]string{}, nil)
m.EXPECT().SecurityGroups(gomock.Any()).AnyTimes()
},
Expand All @@ -85,7 +89,7 @@ func TestEnvRunner_Run(t *testing.T) {
MockClusterGetter: MockClusterGetter,
MockVPCGetter: func(m *mocks.MockVPCGetter) {
m.EXPECT().PublicSubnetIDs(gomock.Any()).Return([]string{"subnet-1"}, nil)
m.EXPECT().SecurityGroups(filtersForVPCFromAppEnv).
m.EXPECT().SecurityGroups(filtersForSecurityGroup).
Return(nil, errors.New("error getting security groups"))
},
mockStarter: mockStarterNotRun,
Expand All @@ -97,8 +101,8 @@ func TestEnvRunner_Run(t *testing.T) {

MockClusterGetter: MockClusterGetter,
MockVPCGetter: func(m *mocks.MockVPCGetter) {
m.EXPECT().PublicSubnetIDs(filtersForVPCFromAppEnv).Return([]string{"subnet-1", "subnet-2"}, nil)
m.EXPECT().SecurityGroups(filtersForVPCFromAppEnv).Return([]string{"sg-1", "sg-2"}, nil)
m.EXPECT().PublicSubnetIDs(filtersForSubnetID).Return([]string{"subnet-1", "subnet-2"}, nil)
m.EXPECT().SecurityGroups(filtersForSecurityGroup).Return([]string{"sg-1", "sg-2"}, nil)
},
mockStarter: func(m *mocks.MockRunner) {
m.EXPECT().RunTask(ecs.RunTaskInput{
Expand All @@ -122,8 +126,8 @@ func TestEnvRunner_Run(t *testing.T) {

MockClusterGetter: MockClusterGetter,
MockVPCGetter: func(m *mocks.MockVPCGetter) {
m.EXPECT().PublicSubnetIDs(filtersForVPCFromAppEnv).Return([]string{"subnet-1", "subnet-2"}, nil)
m.EXPECT().SecurityGroups(filtersForVPCFromAppEnv).Return([]string{"sg-1", "sg-2"}, nil)
m.EXPECT().PublicSubnetIDs(filtersForSubnetID).Return([]string{"subnet-1", "subnet-2"}, nil)
m.EXPECT().SecurityGroups(filtersForSecurityGroup).Return([]string{"sg-1", "sg-2"}, nil)
},
mockStarter: func(m *mocks.MockRunner) {
m.EXPECT().RunTask(ecs.RunTaskInput{
Expand Down