Fix events and dash commands to work with review apps

app/app.go

@@ -299,14 +299,17 @@ func (a *App) ReviewAppSettings() (*Settings, error) {
 	return &i.Settings, nil
 }
 
-// TaskDefinition gets the Task Definition for a specific task type
-func (a *App) TaskDefinition(name string) (*ecs.TaskDefinition, []*ecs.Tag, error) {
-	var family string
+// ServiceName gets the name of a service for the app taking into account review apps
+func (a *App) ServiceName(service string) string {
 	if a.IsReviewApp() {
-		family = fmt.Sprintf("%s-pr%s-%s", a.Name, *a.ReviewApp, name)
-	} else {
-		family = fmt.Sprintf("%s-%s", a.Name, name)
+		return fmt.Sprintf("%s-pr%s-%s", a.Name, *a.ReviewApp, service)
 	}
+	return fmt.Sprintf("%s-%s", a.Name, service)
+}
+
+// TaskDefinition gets the Task Definition for a specific task type
+func (a *App) TaskDefinition(name string) (*ecs.TaskDefinition, []*ecs.Tag, error) {
+	family := a.ServiceName(name)
 	ecsSvc := ecs.New(a.Session)
 	// verify task exists
 	task, err := ecsSvc.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{
@@ -843,7 +846,7 @@ func (a *App) GetECSEvents(service string) ([]*ecs.ServiceEvent, error) {
 	logrus.WithFields(logrus.Fields{"service": service}).Debug("fetching service events")
 	serviceStatus, err := ecsSvc.DescribeServices(&ecs.DescribeServicesInput{
 		Cluster:  &a.Settings.Cluster.ARN,
-		Services: aws.StringSlice([]string{fmt.Sprintf("%s-%s", a.Name, service)}),
+		Services: aws.StringSlice([]string{a.ServiceName(service)}),
 	})
 	if err != nil {
 		return nil, err

cmd/events.go

@@ -43,9 +43,11 @@ var eventsCmd = &cobra.Command{
 		checkErr(err)
 		events, err := a.GetECSEvents(args[0])
 		checkErr(err)
-		waitForSteadyState := cmd.Flag("wait-for-steady").Value.String() == "true"
 		ui.Spinner.Stop()
-		fmt.Println("⏳", aurora.Blue(fmt.Sprintf("waiting for `%s` service to reach a steady state...", args[0])))
+		waitForSteadyState := cmd.Flag("wait-for-steady").Value.String() == "true"
+		if waitForSteadyState {
+			fmt.Println("⏳", aurora.Blue(fmt.Sprintf("waiting for `%s` service to reach a steady state...", args[0])))
+		}
 		for _, event := range events {
 			// when waiting for steady, only show the last minute of events to start
 			if !waitForSteadyState || event.CreatedAt.After(time.Now().Add(-time.Minute)) {

metrics/metrics.go

@@ -111,7 +111,7 @@ func (m *ServiceUtilizationMetrics) MetricDataQueries() []*cloudwatch.MetricData
 						},
 						{
 							Name:  aws.String("ServiceName"),
-							Value: aws.String(fmt.Sprintf("%s-%s", m.App.Name, m.Service)),
+							Value: aws.String(m.GetApp().ServiceName(m.Service)),
 						},
 					},
 				},
@@ -132,7 +132,7 @@ func (m *ServiceUtilizationMetrics) MetricDataQueries() []*cloudwatch.MetricData
 						},
 						{
 							Name:  aws.String("ServiceName"),
-							Value: aws.String(fmt.Sprintf("%s-%s", m.App.Name, m.Service)),
+							Value: aws.String(m.GetApp().ServiceName(m.Service)),
 						},
 					},
 				},