Merge pull request #1308 from snyk/update-azure-deps

Update Azure dependencies

go.mod

@@ -5,15 +5,15 @@ go 1.16
 require (
 	cloud.google.com/go/asset v0.1.0
 	cloud.google.com/go/storage v1.10.0
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0
-	github.com/Azure/azure-sdk-for-go/sdk/containerregistry/armcontainerregistry v0.2.0
-	github.com/Azure/azure-sdk-for-go/sdk/network/armnetwork v0.3.0
-	github.com/Azure/azure-sdk-for-go/sdk/postgresql/armpostgresql v0.2.0
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v0.1.0
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v0.1.0
-	github.com/Azure/azure-sdk-for-go/sdk/resources/armresources v0.3.0
-	github.com/Azure/azure-sdk-for-go/sdk/storage/armstorage v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/postgresql/armpostgresql v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v0.2.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v0.2.0
 	github.com/Azure/go-autorest/autorest v0.11.3
 	github.com/aws/aws-sdk-go v1.38.68
 	github.com/bmatcuk/doublestar/v4 v4.0.1

go.sum

@@ -48,32 +48,31 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v57.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v57.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v57.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v58.0.0+incompatible h1:Cw16jiP4dI+CK761aq44ol4RV5dUiIIXky1+EKpoiVM=
-github.com/Azure/azure-sdk-for-go v58.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0 h1:lhSJz9RMbJcTgxifR1hUNJnn6CNYtbgEDtQV22/9RBA=
+github.com/Azure/azure-sdk-for-go v59.0.0+incompatible h1:I1ULJqny1qQhUBFy11yDXHhW3pLvbhwV0PTn7mjp9V0=
+github.com/Azure/azure-sdk-for-go v59.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.10.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0 h1:OYa9vmRX2XC5GXRAzeggG12sF/z5D9Ahtdm9EJ00WN4=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0 h1:KQgdWmEOmaJKxaUUZwHAYh12t+b+ZJf8q3friycK1kA=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0/go.mod h1:ZPW/Z0kLCTdDZaDbYTetxc9Cxl/2lNqxYHYNOF2bti0=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
-github.com/Azure/azure-sdk-for-go/sdk/containerregistry/armcontainerregistry v0.2.0 h1:+m3oFDUMWB/WsZiKj4dAcRSJ1muXAxgsDAXcZHYf0pk=
-github.com/Azure/azure-sdk-for-go/sdk/containerregistry/armcontainerregistry v0.2.0/go.mod h1:NLX6U3EAoo6ZyZeCeBK9r6rwcUrj63yRKWeyzzTsKDg=
-github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0 h1:v9p9TfTbf7AwNb5NYQt7hI41IfPoLFiFkLtb+bmGjT0=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0 h1:VBvHGLJbaY0+c66NZHdS9cgjHVYSH6DDa0XJMyrblsI=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0/go.mod h1:GJzjM4SR9T0KyX5gKCVyz1ytD8FeWeUPCwtFCt1AyfE=
 github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
-github.com/Azure/azure-sdk-for-go/sdk/network/armnetwork v0.3.0 h1:3ICM5L/XRaknp4DUNqdcNtiOzs6Mc3VKeyQp81+JS2Y=
-github.com/Azure/azure-sdk-for-go/sdk/network/armnetwork v0.3.0/go.mod h1:YSO+0IW+22kuLybFl2GAYaTDh1VWxNid83hqY/DkpGQ=
-github.com/Azure/azure-sdk-for-go/sdk/postgresql/armpostgresql v0.2.0 h1:EZ1NQo84rR8CmjynKcKXdTsRa1Th+Lc1HGn91eiSvOg=
-github.com/Azure/azure-sdk-for-go/sdk/postgresql/armpostgresql v0.2.0/go.mod h1:sbAG2tkFoaiR112qwra1mWRtY82eu+5R1fq2/tylwmE=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v0.1.0 h1:4l29w21L0FDUs7P9u79Uf+qrOzP9pCr+fZ9S2MJqyoc=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v0.1.0/go.mod h1:F+cuKUGdmO75mkaZjeDE99f9AyZ2BU5CTJAkH+V/QfM=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v0.1.0 h1:UORx/HjbzVZKVYHxkLPxct99ASG3jGhGotwK0el/Jdk=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v0.1.0/go.mod h1:J1kqqAcDlSkUsBEubT3lQzq73nVwQdHxcsdnttwu2i0=
-github.com/Azure/azure-sdk-for-go/sdk/resources/armresources v0.3.0 h1:I1cONUC2nKiGU3JXm2jRB4+QIs06lGqkplVpwy4ie9o=
-github.com/Azure/azure-sdk-for-go/sdk/resources/armresources v0.3.0/go.mod h1:LdmyxRi5+2XPnbuv0X9c6ymGle+UkoNvqsBvG+oG53M=
-github.com/Azure/azure-sdk-for-go/sdk/storage/armstorage v0.2.0 h1:LOq4ZG6rMgTAZTyGbYHyxL1EVfZdngpUDRY/KvBToMs=
-github.com/Azure/azure-sdk-for-go/sdk/storage/armstorage v0.2.0/go.mod h1:mIFJgQ93RCQPBsN2jBDzDOfwJpLacGwXIxmirNQMiq4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.1 h1:BUYIbDf/mMZ8945v3QkG3OuqGVyS4Iek0AOLwdRAYoc=
+github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v0.2.0 h1:BHTEy92f31e5CRnjn35IjRCQagwmPzfpomInzX1m7Jw=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v0.2.0/go.mod h1:gqSH+t+W3CJGVmabhRgUav5l9jBv5VkMmpmboVtYqoI=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v0.2.0 h1:zwWanmIYlLi/xrWWmEziISG+/hb2DVFgwc/0J/cijYk=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v0.2.0/go.mod h1:nFJEiraPCmdn0tKe4BW988/6P6CYHhlYXTYFAe1Lygw=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v0.2.0 h1:CyjRCNWYbJ5auOsvNvqikFagdigTjEO3TP7+OZc20fk=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v0.2.0/go.mod h1:4h3E+JM3CxvgkL6OSJ0ac60aC1OH7nDVozji5bkyhJw=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/postgresql/armpostgresql v0.2.0 h1:Vv19nEh1EmNxCdGQqlZyw894ELzOpkn8vhopYXFuWoY=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/postgresql/armpostgresql v0.2.0/go.mod h1:83YIXMettj3oKIpF9ZXSegEwDCqdjsCZgBoQIQslQUc=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v0.2.0 h1:CNib9McHOQLbZHvQKX/JVcEGSQcmk/8BsN+VpvUcmCA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v0.2.0/go.mod h1:hXSmxO57VDkrEamlKEX5tC8z+AEySZ3cSbIRpn7Dpqo=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v0.2.0 h1:SdyLrG1OreJ3X8CoPgQnKU847+61sJ9TVfvtrdjX6rI=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v0.2.0/go.mod h1:aSuRFfpDntiZkIh+XmoL9EV4FS4ViptLBwFRytECG/8=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v0.2.0 h1:CGIYpRDCMotOj1a/1OZOPAwKq0xFKV+/8lHo9GB6Lw4=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v0.2.0/go.mod h1:6OekxBFJ2ICBhqajYGgX4dY58H9x3J5FXikPo43nKYI=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.3 h1:fyYnmYujkIXUgv88D9/Wo2ybE4Zwd/TmQd5sSI5u2Ws=
@@ -205,6 +204,7 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -921,6 +921,7 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=

pkg/remote/azurerm/init.go

@@ -37,17 +37,17 @@ func Init(
 	if err != nil {
 		return err
 	}
-	con := arm.NewDefaultConnection(cred, nil)
+	clientOptions := &arm.ClientOptions{}
 
 	c := cache.New(100)
 
-	storageAccountRepo := repository.NewStorageRepository(con, providerConfig, c)
-	networkRepo := repository.NewNetworkRepository(con, providerConfig, c)
-	resourcesRepo := repository.NewResourcesRepository(con, providerConfig, c)
-	containerRegistryRepo := repository.NewContainerRegistryRepository(con, providerConfig, c)
-	postgresqlRepo := repository.NewPostgresqlRepository(con, providerConfig, c)
-	privateDNSRepo := repository.NewPrivateDNSRepository(con, providerConfig, c)
-	computeRepo := repository.NewComputeRepository(con, providerConfig, c)
+	storageAccountRepo := repository.NewStorageRepository(cred, clientOptions, providerConfig, c)
+	networkRepo := repository.NewNetworkRepository(cred, clientOptions, providerConfig, c)
+	resourcesRepo := repository.NewResourcesRepository(cred, clientOptions, providerConfig, c)
+	containerRegistryRepo := repository.NewContainerRegistryRepository(cred, clientOptions, providerConfig, c)
+	postgresqlRepo := repository.NewPostgresqlRepository(cred, clientOptions, providerConfig, c)
+	privateDNSRepo := repository.NewPrivateDNSRepository(cred, clientOptions, providerConfig, c)
+	computeRepo := repository.NewComputeRepository(cred, clientOptions, providerConfig, c)
 
 	providerLibrary.AddProvider(terraform.AZURE, provider)
 	deserializer := resource.NewDeserializer(factory)

pkg/remote/azurerm/repository/compute.go

@@ -3,6 +3,7 @@ package repository
 import (
 	"context"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
 	"github.com/snyk/driftctl/pkg/remote/azurerm/common"
@@ -54,10 +55,10 @@ type computeRepository struct {
 	cache              cache.Cache
 }
 
-func NewComputeRepository(con *arm.Connection, config common.AzureProviderConfig, cache cache.Cache) *computeRepository {
+func NewComputeRepository(cred azcore.TokenCredential, options *arm.ClientOptions, config common.AzureProviderConfig, cache cache.Cache) *computeRepository {
 	return &computeRepository{
-		&imagesClientImpl{armcompute.NewImagesClient(con, config.SubscriptionID)},
-		&sshPublicKeyClientImpl{armcompute.NewSSHPublicKeysClient(con, config.SubscriptionID)},
+		&imagesClientImpl{armcompute.NewImagesClient(config.SubscriptionID, cred, options)},
+		&sshPublicKeyClientImpl{armcompute.NewSSHPublicKeysClient(config.SubscriptionID, cred, options)},
 		cache,
 	}
 }

pkg/remote/azurerm/repository/containerregistry.go

@@ -3,8 +3,9 @@ package repository
 import (
 	"context"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
-	"github.com/Azure/azure-sdk-for-go/sdk/containerregistry/armcontainerregistry"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry"
 	"github.com/snyk/driftctl/pkg/remote/azurerm/common"
 	"github.com/snyk/driftctl/pkg/remote/cache"
 )
@@ -35,9 +36,9 @@ type containerRegistryRepository struct {
 	cache          cache.Cache
 }
 
-func NewContainerRegistryRepository(con *arm.Connection, config common.AzureProviderConfig, cache cache.Cache) *containerRegistryRepository {
+func NewContainerRegistryRepository(cred azcore.TokenCredential, options *arm.ClientOptions, config common.AzureProviderConfig, cache cache.Cache) *containerRegistryRepository {
 	return &containerRegistryRepository{
-		&registryClientImpl{client: armcontainerregistry.NewRegistriesClient(con, config.SubscriptionID)},
+		&registryClientImpl{client: armcontainerregistry.NewRegistriesClient(config.SubscriptionID, cred, options)},
 		cache,
 	}
 }

pkg/remote/azurerm/repository/containerregistry_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
-	"github.com/Azure/azure-sdk-for-go/sdk/containerregistry/armcontainerregistry"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry"
 	"github.com/pkg/errors"
 	"github.com/snyk/driftctl/pkg/remote/cache"
 	"github.com/stretchr/testify/assert"