From 042fb66ad8c5e2a51482f21ca405540dfc18a3fe Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Fri, 10 Jul 2020 14:41:13 +0200
Subject: [PATCH] =?UTF-8?q?Better=20progress=20display:=20=E2=80=9CGroup?=
 =?UTF-8?q?=20xxx=E2=80=9D=20for=20container=20group=20creation,=20then=20?=
 =?UTF-8?q?separate=20lines=20for=20containers.=20For=20single=20container?=
 =?UTF-8?q?s,=20there=20was=20a=20single=20mixed=20line=20now=20that=20the?=
 =?UTF-8?q?=20group=20and=20the=20container=20have=20the=20same=20name.=20?=
 =?UTF-8?q?```=20=20$=20./bin/docker=20--context=20acitest=20run=20nginx?=
 =?UTF-8?q?=20[+]=20Running=202/2=20=E2=A0=BF=20Group=20strange-bartik=20?=
 =?UTF-8?q?=20Created=20=20=20=20=20=20=20=20=204.2s=20=E2=A0=BF=20strange?=
 =?UTF-8?q?-bartik=20=20=20=20=20=20=20=20Done=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2020.6s=20strange-bartik=20``?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 azure/aci.go     | 5 +++--
 azure/backend.go | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/azure/aci.go b/azure/aci.go
index 74f4bf4cf..d488b0edb 100644
--- a/azure/aci.go
+++ b/azure/aci.go
@@ -71,8 +71,9 @@ func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContex
 	if err != nil {
 		return errors.Wrapf(err, "cannot get container group client")
 	}
+	groupDisplay := "Group " + *groupDefinition.Name
 	w.Event(progress.Event{
-		ID:         *groupDefinition.Name,
+		ID:         groupDisplay,
 		Status:     progress.Working,
 		StatusText: "Waiting",
 	})
@@ -88,7 +89,7 @@ func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContex
 	}
 
 	w.Event(progress.Event{
-		ID:         *groupDefinition.Name,
+		ID:         groupDisplay,
 		Status:     progress.Done,
 		StatusText: "Created",
 	})
diff --git a/azure/backend.go b/azure/backend.go
index 2888285d1..858bdc08b 100644
--- a/azure/backend.go
+++ b/azure/backend.go
@@ -132,7 +132,7 @@ func (cs *aciContainerService) List(ctx context.Context, _ bool) ([]containers.C
 
 		if _, ok := group.Tags[singleContainerTag]; ok {
 			if group.Containers == nil || len(*group.Containers) < 1 {
-				return []containers.Container{}, fmt.Errorf("found no containers in ACI container group %s", *containerGroup.Name)
+				return []containers.Container{}, fmt.Errorf("no containers found in ACI container group %s", *containerGroup.Name)
 			}
 			container := (*group.Containers)[0]
 			c := getContainer(*containerGroup.Name, group.IPAddress, container)