[merge] pull request #1137

convox · Aug 25, 2016 · 643449e · 643449e
2 parents b810b74 + f3bb8a5
commit 643449e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/api/models/process.go b/api/models/process.go
@@ -150,7 +150,10 @@ func ListProcesses(app string) ([]*Process, error) {
 	}
 
 	ires, err := EC2().DescribeInstances(&ec2.DescribeInstancesInput{
-		InstanceIds: instanceIds,
+		Filters: []*ec2.Filter{
+			&ec2.Filter{Name: aws.String("instance-id"), Values: instanceIds},
+		},
+		MaxResults: aws.Int64(1000),
 	})
 
 	if err != nil {

diff --git a/ci/install.sh b/ci/install.sh
@@ -11,4 +11,4 @@ convox install | tee $CIRCLE_ARTIFACTS/convox-installer.log
 
 grep -v "Created Unknown" $CIRCLE_ARTIFACTS/convox-installer.log
 
-convox logs --app $STACK_NAME > $CIRCLE_ARTIFACTS/convox.log &
+convox instances
diff --git a/ci/report.sh b/ci/report.sh
@@ -6,6 +6,8 @@ export CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM:-0}
 export STACK_NAME=convox-${CIRCLE_BUILD_NUM}
 export $($(dirname $0)/region.sh ${CIRCLE_NODE_INDEX})
 
+convox logs --app $STACK_NAME --follow=false --since=24h > $CIRCLE_ARTIFACTS/convox.log
+
 # Save App ECS Artifacts
 aws ecs list-clusters | tee $CIRCLE_ARTIFACTS/list-clusters.json
 aws ecs describe-clusters --clusters $(jq -r '.clusterArns[]' $CIRCLE_ARTIFACTS/list-clusters.json) | tee $CIRCLE_ARTIFACTS/describe-clusters.json

diff --git a/provider/aws/instances.go b/provider/aws/instances.go
@@ -21,8 +21,10 @@ func (p *AWSProvider) InstanceList() (structs.Instances, error) {
 	}
 
 	ec2Res, err := p.ec2().DescribeInstances(&ec2.DescribeInstancesInput{
-		InstanceIds: instanceIds,
-		MaxResults:  aws.Int64(1000),
+		Filters: []*ec2.Filter{
+			&ec2.Filter{Name: aws.String("instance-id"), Values: instanceIds},
+		},
+		MaxResults: aws.Int64(1000),
 	})
 	if err != nil {
 		return nil, err

diff --git a/provider/aws/instances_test.go b/provider/aws/instances_test.go
@@ -92,7 +92,7 @@ func describeContainerInstancesResponse() string {
 
 func describeInstancesCycle() awsutil.Cycle {
 	return awsutil.Cycle{
-		awsutil.Request{"/", "", `Action=DescribeInstances&InstanceId.1=i-4a5513f4&InstanceId.2=i-3963798e&InstanceId.3=i-c6a72b76&MaxResults=1000&Version=2015-10-01`},
+		awsutil.Request{"/", "", `Action=DescribeInstances&Filter.1.Name=instance-id&Filter.1.Value.1=i-4a5513f4&Filter.1.Value.2=i-3963798e&Filter.1.Value.3=i-c6a72b76&MaxResults=1000&Version=2015-10-01`},
 		awsutil.Response{200, describeInstancesResponse()},
 	}
 }

diff --git a/test/aws_cycles.go b/test/aws_cycles.go
@@ -111,7 +111,7 @@ func DescribeConvoxStackCycle(stackName string) awsutil.Cycle {
 
 func DescribeInstancesCycle() awsutil.Cycle {
 	return awsutil.Cycle{
-		awsutil.Request{"/", "", `Action=DescribeInstances&InstanceId.1=i-4a5513f4&InstanceId.2=i-3963798e&InstanceId.3=i-c6a72b76&Version=2015-10-01`},
+		awsutil.Request{"/", "", `Action=DescribeInstances&Filter.1.Name=instance-id&Filter.1.Value.1=i-4a5513f4&Filter.1.Value.2=i-3963798e&Filter.1.Value.3=i-c6a72b76&MaxResults=1000&Version=2015-10-01`},
 		awsutil.Response{200, describeInstancesResponse()},
 	}
 }