Skip to content

Commit 78ef090

Browse files
authored
PS command displays private IPs (aws#323)
* PS command displays private IP if the container instance doesn't have a public IP.
1 parent 85c61a4 commit 78ef090

2 files changed

Lines changed: 50 additions & 18 deletions

File tree

‎ecs-cli/modules/cli/compose/entity/entity_helper.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ func Info(entity ProjectEntity, filterLocal bool) (project.InfoSet, error) {
8181
if err != nil {
8282
return nil, err
8383
}
84-
allInfo := composecontainer.ConvertContainersToInfoSet(containers)
85-
return allInfo, nil
84+
return composecontainer.ConvertContainersToInfoSet(containers), nil
8685
}
8786

8887
// collectContainers gets all the desiredStatus=RUNNING and STOPPED tasks with EC2 IP Addresses
@@ -188,6 +187,9 @@ func getContainersForTasks(entity ProjectEntity, ecsTasks []*ecs.Task) ([]compos
188187
var ec2IPAddress string
189188
if ec2ID != "" && ec2Instances[ec2ID] != nil {
190189
ec2IPAddress = aws.StringValue(ec2Instances[ec2ID].PublicIpAddress)
190+
if ec2IPAddress == "" {
191+
ec2IPAddress = aws.StringValue(ec2Instances[ec2ID].PrivateIpAddress)
192+
}
191193
}
192194
for _, container := range ecsTask.Containers {
193195
result = append(result, composecontainer.NewContainer(ecsTask, ec2IPAddress, container))

‎ecs-cli/modules/cli/compose/entity/entity_test.go‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,49 @@ func TestGetContainersForTasks(t *testing.T) {
4343
ContainerInstanceArn: aws.String(containerInstanceArn),
4444
},
4545
}
46-
containerInstancesMap := make(map[string]string)
47-
containerInstancesMap[containerInstanceArn] = ec2InstanceID
46+
containerInstances := make(map[string]string)
47+
containerInstances[containerInstanceArn] = ec2InstanceID
4848

49-
ec2InstancesMap := make(map[string]*ec2.Instance)
50-
ec2InstancesMap[ec2InstanceID] = ec2Instance
49+
ec2Instances := make(map[string]*ec2.Instance)
50+
ec2Instances[ec2InstanceID] = ec2Instance
5151

52-
mockProjectEntity := setupMocks(t, []*string{aws.String(containerInstanceArn)}, containerInstancesMap,
53-
[]*string{aws.String(ec2InstanceID)}, ec2InstancesMap)
52+
mockProjectEntity := setupMocks(t, []*string{aws.String(containerInstanceArn)}, containerInstances,
53+
[]*string{aws.String(ec2InstanceID)}, ec2Instances)
5454

5555
containers, err := getContainersForTasks(mockProjectEntity, ecsTasks)
5656
assert.NoError(t, err, "Unexpected error when calling getContainersForTasks")
57-
assert.Len(t, containers, 1, "Expects to have 1 containers")
58-
assert.Equal(t, containers[0].Ec2IPAddress, aws.StringValue(ec2Instance.PublicIpAddress), "Expects PublicIpAddress to match")
57+
assert.Len(t, containers, 1, "Expected to have 1 container")
58+
assert.Equal(t, aws.StringValue(ec2Instance.PublicIpAddress), containers[0].Ec2IPAddress, "Expects PublicIpAddress to match")
59+
}
60+
61+
func TestGetContainersForTasksPrivateIP(t *testing.T) {
62+
containerInstanceArn := "containerInstanceArn"
63+
ec2InstanceID := "ec2InstanceId"
64+
ec2Instance := &ec2.Instance{PrivateIpAddress: aws.String("privateIpAddress")}
65+
66+
ecsTasks := []*ecs.Task{
67+
&ecs.Task{
68+
Containers: []*ecs.Container{
69+
&ecs.Container{
70+
Name: aws.String("containerName"),
71+
},
72+
},
73+
ContainerInstanceArn: aws.String(containerInstanceArn),
74+
},
75+
}
76+
containerInstances := make(map[string]string)
77+
containerInstances[containerInstanceArn] = ec2InstanceID
78+
79+
ec2Instances := make(map[string]*ec2.Instance)
80+
ec2Instances[ec2InstanceID] = ec2Instance
81+
82+
mockProjectEntity := setupMocks(t, []*string{aws.String(containerInstanceArn)}, containerInstances,
83+
[]*string{aws.String(ec2InstanceID)}, ec2Instances)
84+
85+
containers, err := getContainersForTasks(mockProjectEntity, ecsTasks)
86+
assert.NoError(t, err, "Unexpected error when calling getContainersForTasks")
87+
assert.Len(t, containers, 1, "Expected to have 1 container")
88+
assert.Equal(t, aws.StringValue(ec2Instance.PrivateIpAddress), containers[0].Ec2IPAddress, "Expects PublicIpAddress to match")
5989
}
6090

6191
func TestGetContainersForTasksWithoutEc2InstanceID(t *testing.T) {
@@ -72,14 +102,14 @@ func TestGetContainersForTasksWithoutEc2InstanceID(t *testing.T) {
72102
ContainerInstanceArn: aws.String(containerInstanceArn),
73103
},
74104
}
75-
containerInstancesMap := make(map[string]string)
76-
containerInstancesMap[containerInstanceArn] = ec2InstanceID
105+
containerInstances := make(map[string]string)
106+
containerInstances[containerInstanceArn] = ec2InstanceID
77107

78108
// No ec2InstanceID is found
79-
ec2InstancesMap := make(map[string]*ec2.Instance)
109+
ec2Instances := make(map[string]*ec2.Instance)
80110

81-
projectEntity := setupMocks(t, []*string{aws.String(containerInstanceArn)}, containerInstancesMap,
82-
[]*string{aws.String(ec2InstanceID)}, ec2InstancesMap)
111+
projectEntity := setupMocks(t, []*string{aws.String(containerInstanceArn)}, containerInstances,
112+
[]*string{aws.String(ec2InstanceID)}, ec2Instances)
83113

84114
containers, err := getContainersForTasks(projectEntity, ecsTasks)
85115
assert.NoError(t, err, "Unexpected error when calling getContainersForTasks")
@@ -101,8 +131,8 @@ func TestGetContainersForTasksErrorCases(t *testing.T) {
101131
ContainerInstanceArn: aws.String(containerInstanceArn),
102132
},
103133
}
104-
containerInstancesMap := make(map[string]string)
105-
containerInstancesMap[containerInstanceArn] = ec2InstanceID
134+
containerInstances := make(map[string]string)
135+
containerInstances[containerInstanceArn] = ec2InstanceID
106136

107137
mockEc2, mockEcs, mockProjectEntity := setupTest(t)
108138
mockContext := &context.Context{
@@ -121,7 +151,7 @@ func TestGetContainersForTasksErrorCases(t *testing.T) {
121151
// DescribeInstances failed
122152
gomock.InOrder(
123153
mockProjectEntity.EXPECT().Context().Return(mockContext),
124-
mockEcs.EXPECT().GetEC2InstanceIDs(gomock.Any()).Return(containerInstancesMap, nil),
154+
mockEcs.EXPECT().GetEC2InstanceIDs(gomock.Any()).Return(containerInstances, nil),
125155
mockProjectEntity.EXPECT().Context().Return(mockContext),
126156
mockEc2.EXPECT().DescribeInstances(gomock.Any()).Return(nil, errors.New("something wrong")),
127157
)

0 commit comments

Comments
 (0)