Merge branch '14291-cdc-aws' refs #14291

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --combined lib/cloud/azure/azure_test.go
index 72832578dfa68ea022c75a6a6a69ef35018be15c,bd82a424f4032fe6995bf436adf1ccf82ef89a91..96bfb4fefbfd8c8c13c199a5621977776f762505
--- 1/lib/cloud/azure/azure_test.go
--- 2/lib/cloud/azure/azure_test.go
+++ b/lib/cloud/azure/azure_test.go
@@@ -43,6 -43,7 +43,7 @@@ import 
        "time"
  
        "git.curoverse.com/arvados.git/lib/cloud"
+       "git.curoverse.com/arvados.git/lib/dispatchcloud/test"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/config"
        "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-06-01/compute"
@@@ -67,8 -68,6 +68,6 @@@ var _ = check.Suite(&AzureInstanceSetSu
  
  type VirtualMachinesClientStub struct{}
  
- var testKey = []byte(`ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLQS1ExT2+WjA0d/hntEAyAtgeN1W2ik2QX8c2zO6HjlPHWXL92r07W0WMuDib40Pcevpi1BXeBWXA9ZB5KKMJB+ukaAu22KklnQuUmNvk6ZXnPKSkGxuCYvPQb08WhHf3p1VxiKfP3iauedBDM4x9/bkJohlBBQiFXzNUcQ+a6rKiMzmJN2gbL8ncyUzc+XQ5q4JndTwTGtOlzDiGOc9O4z5Dd76wtAVJneOuuNpwfFRVHThpJM6VThpCZOnl8APaceWXKeuwOuCae3COZMz++xQfxOfZ9Z8aIwo+TlQhsRaNfZ4Vjrop6ej8dtfZtgUFKfbXEOYaHrGrWGotFDTD example@example`)
- 
  func (*VirtualMachinesClientStub) createOrUpdate(ctx context.Context,
        resourceGroupName string,
        VMName string,
@@@ -105,16 -104,6 +104,16 @@@ func (*InterfacesClientStub) listComple
        return network.InterfaceListResultIterator{}, nil
  }
  
 +type BlobContainerStub struct{}
 +
 +func (*BlobContainerStub) GetBlobReference(name string) *storage.Blob {
 +      return nil
 +}
 +
 +func (*BlobContainerStub) ListBlobs(params storage.ListBlobsParameters) (storage.BlobListResponse, error) {
 +      return storage.BlobListResponse{}, nil
 +}
 +
  type testConfig struct {
        ImageIDForTestSuite string
        DriverParameters    json.RawMessage
@@@ -158,7 -147,6 +157,7 @@@ func GetInstanceSet() (cloud.InstanceSe
        ap.ctx, ap.stopFunc = context.WithCancel(context.Background())
        ap.vmClient = &VirtualMachinesClientStub{}
        ap.netClient = &InterfacesClientStub{}
 +      ap.blobcont = &BlobContainerStub{}
        return &ap, cloud.ImageID("blob"), cluster, nil
  }
  
@@@ -168,7 -156,7 +167,7 @@@ func (*AzureInstanceSetSuite) TestCreat
                c.Fatal("Error making provider", err)
        }
  
-       pk, _, _, _, err := ssh.ParseAuthorizedKey(testKey)
+       pk, _ := test.LoadTestKey(c, "../../dispatchcloud/test/sshkey_dispatch")
        c.Assert(err, check.IsNil)
  
        inst, err := ap.Create(cluster.InstanceTypes["tiny"],