Additional validation on Describe Container Instances

aws · Feb 13, 2019 · 1a8f128 · 1a8f128
1 parent 6053543
commit 1a8f128
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ecs-cli/modules/cli/attributechecker/attribute_checker_app.go b/ecs-cli/modules/cli/attributechecker/attribute_checker_app.go
@@ -113,7 +113,7 @@ func describeContainerInstancesAttributeMap(context *cli.Context, ecsClient ecsc
 
 	descrContainerInstancesAttributes, err := ecsClient.GetAttributesFromDescribeContainerInstances(containerInstanceIdentifiers)
 	if err != nil {
-		return nil, errors.Wrapf(err, fmt.Sprintf("Failed to Describe Container Instances, please check region/containerInstance values"))
+		return nil, errors.Wrapf(err, fmt.Sprintf("Failed to Describe Container Instances, please check region/containerInstance/cluster values"))
 	}
 	return descrContainerInstancesAttributes, err
 }

diff --git a/ecs-cli/modules/clients/aws/ecs/client.go b/ecs-cli/modules/clients/aws/ecs/client.go
@@ -412,6 +412,9 @@ func (c *ecsClient) GetAttributesFromDescribeContainerInstances(containerInstanc
 		if err != nil {
 			return nil, err
 		}
+		if len(descrContainerInstances.Failures) != 0 {
+			return nil, fmt.Errorf("Failures %v", descrContainerInstances.Failures)
+		}
 		for _, containerInstance := range descrContainerInstances.ContainerInstances {
 			var containerInstanceAttributeNames []*string
 			for _, containerInstanceattributenames := range containerInstance.Attributes {