X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d87ae37bbc00cbb6fffb47ade3ec824b501b3df..2d046b9d2f27779f1e74e951fd7108dd88ba57c3:/lib/dispatchcloud/driver.go?ds=inline

diff --git a/lib/dispatchcloud/driver.go b/lib/dispatchcloud/driver.go
index 49437e3187..f2a6c92630 100644
--- a/lib/dispatchcloud/driver.go
+++ b/lib/dispatchcloud/driver.go
@@ -8,15 +8,18 @@ import (
 	"fmt"
 	"time"
 
-	"git.curoverse.com/arvados.git/lib/cloud"
-	"git.curoverse.com/arvados.git/lib/cloud/azure"
-	"git.curoverse.com/arvados.git/lib/cloud/ec2"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/lib/cloud"
+	"git.arvados.org/arvados.git/lib/cloud/azure"
+	"git.arvados.org/arvados.git/lib/cloud/ec2"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh"
 )
 
+// Map of available cloud drivers.
+// Clusters.*.Containers.CloudVMs.Driver configuration values
+// correspond to keys in this map.
 var Drivers = map[string]cloud.Driver{
 	"azure": azure.Driver,
 	"ec2":   ec2.Driver,
@@ -150,7 +153,11 @@ func (is instrumentedInstanceSet) Create(it arvados.InstanceType, image cloud.Im
 func (is instrumentedInstanceSet) Instances(tags cloud.InstanceTags) ([]cloud.Instance, error) {
 	instances, err := is.InstanceSet.Instances(tags)
 	is.cv.WithLabelValues("List", boolLabelValue(err != nil)).Inc()
-	return instances, err
+	var instrumented []cloud.Instance
+	for _, i := range instances {
+		instrumented = append(instrumented, instrumentedInstance{i, is.cv})
+	}
+	return instrumented, err
 }
 
 type instrumentedInstance struct {