Skip to content

Commit 2af4b3a

Browse files
authored
Merge pull request #22 from gruntwork-io/pull-request-21
#21 test fix
2 parents 347d030 + 9b5200e commit 2af4b3a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Dockerfile.ubuntu16.04.bats

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ RUN apt-get install -y software-properties-common && \
1111
DEBIAN_FRONTEND=noninteractive apt-get update && \
1212
apt-get install -y bats
1313

14+
# Upgrade pip
15+
RUN pip install -U pip
16+
1417
# Install AWS CLI
1518
RUN pip install awscli --upgrade --user
1619

1720
# Install moto: https://github.com/spulec/moto
18-
RUN pip install flask moto moto[server]
21+
RUN pip install flask moto moto[server] networkx==2.2
1922

2023
# Install tools we'll need to create a mock EC2 metadata server
2124
RUN apt-get install -y net-tools iptables

modules/bash-commons/src/aws.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ function aws_get_eni_private_ip {
190190
eni_id="$(aws_get_eni_id "$network_interfaces_output" "$eni_device_index")"
191191
log_info "Looking up private IP address for ENI $eni_id"
192192

193-
public_ip=$(echo "$network_interfaces_output" | jq -j ".NetworkInterfaces[] | select(.NetworkInterfaceId == \"$eni_id\").PrivateIpAddresses[0].PrivateIpAddress")
193+
private_ip=$(echo "$network_interfaces_output" | jq -j ".NetworkInterfaces[] | select(.NetworkInterfaceId == \"$eni_id\").PrivateIpAddresses[0].PrivateIpAddress")
194194

195-
echo "$public_ip"
195+
echo "$private_ip"
196196
}
197197

198198
# Return the private IP Address of the ENI attached to the given EC2 Instance

0 commit comments

Comments
 (0)