Show progress bar when downloading Docker images (#292)

Author: mrnugget

cmd/src/campaigns_common.go

@@ -164,6 +164,18 @@ func campaignsExecute(ctx context.Context, out *output.Output, svc *campaigns.Se
 	}
 	campaignsCompletePending(pending, "Resolving namespace")
 
+	imageProgress := out.Progress([]output.ProgressBar{{
+		Label: "Preparing container images",
+		Max:   float64(len(campaignSpec.Steps)),
+	}}, nil)
+	err = svc.SetDockerImages(ctx, campaignSpec, func(step int) {
+		imageProgress.SetValue(0, float64(step))
+	})
+	if err != nil {
+		return "", "", err
+	}
+	imageProgress.Complete()
+
 	var progress output.Progress
 	specs, err := svc.ExecuteCampaignSpec(ctx, executor, campaignSpec, func(statuses []*campaigns.TaskStatus) {
 		if progress == nil {

internal/campaigns/service.go

@@ -151,19 +151,23 @@ func (svc *Service) NewExecutor(opts ExecutorOpts, update ExecutorUpdateCallback
 	return newExecutor(opts, svc.client, update)
 }
 
-func (svc *Service) ExecuteCampaignSpec(ctx context.Context, x Executor, spec *CampaignSpec, progress func([]*TaskStatus)) ([]*ChangesetSpec, error) {
-	repos, err := svc.ResolveRepositories(ctx, spec)
-	if err != nil {
-		return nil, errors.Wrap(err, "resolving repositories")
-	}
-
-	// TODO: status logging
+func (svc *Service) SetDockerImages(ctx context.Context, spec *CampaignSpec, progress func(i int)) error {
 	for i, step := range spec.Steps {
 		image, err := getDockerImageContentDigest(ctx, step.Container)
 		if err != nil {
-			return nil, errors.Wrapf(err, "step %d", i+1)
+			return err
 		}
 		spec.Steps[i].image = image
+		progress(i + 1)
+	}
+
+	return nil
+}
+
+func (svc *Service) ExecuteCampaignSpec(ctx context.Context, x Executor, spec *CampaignSpec, progress func([]*TaskStatus)) ([]*ChangesetSpec, error) {
+	repos, err := svc.ResolveRepositories(ctx, spec)
+	if err != nil {
+		return nil, errors.Wrap(err, "resolving repositories")
 	}
 
 	statuses := make([]*TaskStatus, 0, len(repos))