From a58061b8184aa24e61bb27a7007195602f40968c Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 19 Mar 2020 09:21:38 +0100 Subject: [PATCH] dependencies: updating to v0.10.0 of github.com/tombuildsstuff/giovanni --- go.mod | 2 +- go.sum | 2 ++ .../storage/2018-11-09/blob/containers/resource_id.go | 7 +++++++ .../giovanni/storage/2018-11-09/file/shares/resource_id.go | 7 +++++++ .../github.com/tombuildsstuff/giovanni/version/version.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2e0512e56bf4..32568bf7168f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/satori/go.uuid v1.2.0 github.com/satori/uuid v0.0.0-20160927100844-b061729afc07 github.com/terraform-providers/terraform-provider-azuread v0.8.0 - github.com/tombuildsstuff/giovanni v0.9.0 + github.com/tombuildsstuff/giovanni v0.10.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 golang.org/x/net v0.0.0-20191009170851-d66e71096ffb gopkg.in/yaml.v2 v2.2.2 diff --git a/go.sum b/go.sum index 9ef690951fd0..85c2aa171a46 100644 --- a/go.sum +++ b/go.sum @@ -212,6 +212,8 @@ github.com/terraform-providers/terraform-provider-azuread v0.8.0 h1:ZcF5f+F3tFBK github.com/terraform-providers/terraform-provider-azuread v0.8.0/go.mod h1:7RxccROJFJZmxJpmbRTHA+mn6U/s7UnVeEbOHLX6CQU= github.com/tombuildsstuff/giovanni v0.9.0 h1:N1hvKYEZbuji8c8QyFJlEsgrTckcAyx3ccwxR2IPf/8= github.com/tombuildsstuff/giovanni v0.9.0/go.mod h1:WwPhFP2+WnhJzvPYDnsyBab2wOIksMX6xm+Tg+jVvKw= +github.com/tombuildsstuff/giovanni v0.10.0 h1:XqZBPVD2hETa30FFdMz/zVfnidMnUrIMMmKIH7hWnWA= +github.com/tombuildsstuff/giovanni v0.10.0/go.mod h1:WwPhFP2+WnhJzvPYDnsyBab2wOIksMX6xm+Tg+jVvKw= github.com/tombuildsstuff/go-autorest v14.0.1-0.20200317095413-f2d2d0252c3c+incompatible h1:H+ytGDYKp8E7Mb0GBK3LMaJd9O2lUo2Cmb4sTMHM3N8= github.com/tombuildsstuff/go-autorest v14.0.1-0.20200317095413-f2d2d0252c3c+incompatible/go.mod h1:OVwh0+NZeL2RTqclVEX+p20Qys7Ihpd52PD0eqFDXtY= github.com/tombuildsstuff/go-autorest/autorest v0.10.1-0.20200317095413-f2d2d0252c3c h1:9KiivLYWWeGGT2jzfB5T5Tj/gsSWf1KgbDwD9H7rrWM= diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers/resource_id.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers/resource_id.go index 651dd84aed55..d35674a7868d 100644 --- a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers/resource_id.go +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers/resource_id.go @@ -15,6 +15,13 @@ func (client Client) GetResourceID(accountName, containerName string) string { return fmt.Sprintf("%s/%s", domain, containerName) } +// GetResourceManagerResourceID returns the Resource Manager specific +// ResourceID for a specific Storage Container +func (client Client) GetResourceManagerResourceID(subscriptionID, resourceGroup, accountName, containerName string) string { + fmtStr := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Storage/storageAccounts/%s/blobServices/default/containers/%s" + return fmt.Sprintf(fmtStr, subscriptionID, resourceGroup, accountName, containerName) +} + type ResourceID struct { AccountName string ContainerName string diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/file/shares/resource_id.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/file/shares/resource_id.go index b6a83442abd2..c51d399ca062 100644 --- a/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/file/shares/resource_id.go +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2018-11-09/file/shares/resource_id.go @@ -15,6 +15,13 @@ func (client Client) GetResourceID(accountName, shareName string) string { return fmt.Sprintf("%s/%s", domain, shareName) } +// GetResourceManagerResourceID returns the Resource Manager specific +// ResourceID for a specific Storage Share +func (client Client) GetResourceManagerResourceID(subscriptionID, resourceGroup, accountName, shareName string) string { + fmtStr := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Storage/storageAccounts/%s/fileServices/default/shares/%s" + return fmt.Sprintf(fmtStr, subscriptionID, resourceGroup, accountName, shareName) +} + type ResourceID struct { AccountName string ShareName string diff --git a/vendor/github.com/tombuildsstuff/giovanni/version/version.go b/vendor/github.com/tombuildsstuff/giovanni/version/version.go index 217931d120c2..629cab9c09b3 100644 --- a/vendor/github.com/tombuildsstuff/giovanni/version/version.go +++ b/vendor/github.com/tombuildsstuff/giovanni/version/version.go @@ -1,3 +1,3 @@ package version -const Number = "v0.9.0" +const Number = "v0.10.0" diff --git a/vendor/modules.txt b/vendor/modules.txt index 294505a0f8cf..a7eccb4bf87c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -332,7 +332,7 @@ github.com/terraform-providers/terraform-provider-azuread/azuread/helpers/slices github.com/terraform-providers/terraform-provider-azuread/azuread/helpers/tf github.com/terraform-providers/terraform-provider-azuread/azuread/helpers/validate github.com/terraform-providers/terraform-provider-azuread/version -# github.com/tombuildsstuff/giovanni v0.9.0 +# github.com/tombuildsstuff/giovanni v0.10.0 github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/accounts github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers