Merge pull request #3 from swartzrock/nil-checks

apparently ContainerInstanceArn is an optional value for ECS tasks
swartzrock · Dec 15, 2020 · 1091670 · 1091670
2 parents 067d744 + 992a0fb
commit 1091670
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmd/pages/instancespage.go b/cmd/pages/instancespage.go
@@ -99,7 +99,7 @@ func renderInstancesTable(tableInfo *ui.TableInfo, ecsData *ecsview.ClusterData)
 		if taskCount != "0" {
 			tasks := make([]string, 0)
 			for _, task := range ecsData.Tasks {
-				if *task.ContainerInstanceArn == *instance.ContainerInstanceArn {
+				if task.ContainerInstanceArn != nil && *task.ContainerInstanceArn == *instance.ContainerInstanceArn {
 					tasks = append(tasks, aws.ShortenTaskDefArn(task.TaskDefinitionArn))
 				}
 			}

diff --git a/cmd/pages/taskspage.go b/cmd/pages/taskspage.go
@@ -81,14 +81,17 @@ func renderTasksPage(tableInfo *ui.TableInfo, ecsData *ecsview.ClusterData) {
 			taskImages = strings.Join(images, ",")
 		}
 
-		// utils.TakeRight
+		ec2InstanceId := "n/a"
+		if task.ContainerInstanceArn != nil {
+			ec2InstanceId = arnToEc2InstanceIdMap[*task.ContainerInstanceArn]
+		}
 
 		return []string{
 			aws.ShortenTaskDefArn(task.TaskDefinitionArn),
 			taskImages,
 			status,
 			utils.FormatLocalDateTimeAmPmZone(*task.CreatedAt),
-			arnToEc2InstanceIdMap[*task.ContainerInstanceArn],
+			ec2InstanceId,
 			utils.TakeRight(utils.RemoveAllRegex(`.*/`, *task.TaskArn), 8),
 			utils.I64ToString(*task.Version),
 		}