From 69ef4d5b24cdd89b1a44de5a6aec8a426a66b34f Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 11 Jan 2018 16:24:50 +0000 Subject: [PATCH 1/3] Upgrading to Azure/go-autorest v9.7.0 --- .../Azure/go-autorest/autorest/adal/token.go | 26 +++++++ .../Azure/go-autorest/autorest/azure/rp.go | 2 +- .../Azure/go-autorest/autorest/preparer.go | 24 +++++- .../Azure/go-autorest/autorest/utility.go | 25 ------ vendor/vendor.json | 76 +++++++++---------- 5 files changed, 85 insertions(+), 68 deletions(-) diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go index 52e6ed52e872..4eb0c1adf63a 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go @@ -460,7 +460,29 @@ func getMSIVMEndpoint(path string) (string, error) { } // NewServicePrincipalTokenFromMSI creates a ServicePrincipalToken via the MSI VM Extension. +// It will use the system assigned identity when creating the token. func NewServicePrincipalTokenFromMSI(msiEndpoint, resource string, callbacks ...TokenRefreshCallback) (*ServicePrincipalToken, error) { + return newServicePrincipalTokenFromMSI(msiEndpoint, resource, nil, callbacks...) +} + +// NewServicePrincipalTokenFromMSIWithUserAssignedID creates a ServicePrincipalToken via the MSI VM Extension. +// It will use the specified user assigned identity when creating the token. +func NewServicePrincipalTokenFromMSIWithUserAssignedID(msiEndpoint, resource string, userAssignedID string, callbacks ...TokenRefreshCallback) (*ServicePrincipalToken, error) { + return newServicePrincipalTokenFromMSI(msiEndpoint, resource, &userAssignedID, callbacks...) +} + +func newServicePrincipalTokenFromMSI(msiEndpoint, resource string, userAssignedID *string, callbacks ...TokenRefreshCallback) (*ServicePrincipalToken, error) { + if err := validateStringParam(msiEndpoint, "msiEndpoint"); err != nil { + return nil, err + } + if err := validateStringParam(resource, "resource"); err != nil { + return nil, err + } + if userAssignedID != nil { + if err := validateStringParam(*userAssignedID, "userAssignedID"); err != nil { + return nil, err + } + } // We set the oauth config token endpoint to be MSI's endpoint msiEndpointURL, err := url.Parse(msiEndpoint) if err != nil { @@ -482,6 +504,10 @@ func NewServicePrincipalTokenFromMSI(msiEndpoint, resource string, callbacks ... refreshCallbacks: callbacks, } + if userAssignedID != nil { + spt.clientID = *userAssignedID + } + return spt, nil } diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go b/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go index 2d9046949129..b6b95d6fdbcb 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go @@ -159,7 +159,7 @@ func register(client autorest.Client, originalReq *http.Request, re RequestError } req.Cancel = originalReq.Cancel - resp, err := autorest.SendWithSender(client.Sender, req, + resp, err := autorest.SendWithSender(client, req, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...), ) if err != nil { diff --git a/vendor/github.com/Azure/go-autorest/autorest/preparer.go b/vendor/github.com/Azure/go-autorest/autorest/preparer.go index 9178cbbe26ee..6d67bd7337b7 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/preparer.go +++ b/vendor/github.com/Azure/go-autorest/autorest/preparer.go @@ -27,8 +27,9 @@ import ( ) const ( - mimeTypeJSON = "application/json" - mimeTypeFormPost = "application/x-www-form-urlencoded" + mimeTypeJSON = "application/json" + mimeTypeOctetStream = "application/octet-stream" + mimeTypeFormPost = "application/x-www-form-urlencoded" headerAuthorization = "Authorization" headerContentType = "Content-Type" @@ -164,6 +165,11 @@ func AsJSON() PrepareDecorator { return AsContentType(mimeTypeJSON) } +// AsOctetStream returns a PrepareDecorator that adds the "application/octet-stream" Content-Type header. +func AsOctetStream() PrepareDecorator { + return AsContentType(mimeTypeOctetStream) +} + // WithMethod returns a PrepareDecorator that sets the HTTP method of the passed request. The // decorator does not validate that the passed method string is a known HTTP method. func WithMethod(method string) PrepareDecorator { @@ -237,6 +243,11 @@ func WithFormData(v url.Values) PrepareDecorator { r, err := p.Prepare(r) if err == nil { s := v.Encode() + + if r.Header == nil { + r.Header = make(http.Header) + } + r.Header.Set(http.CanonicalHeaderKey(headerContentType), mimeTypeFormPost) r.ContentLength = int64(len(s)) r.Body = ioutil.NopCloser(strings.NewReader(s)) } @@ -452,11 +463,16 @@ func WithQueryParameters(queryParameters map[string]interface{}) PrepareDecorato if r.URL == nil { return r, NewError("autorest", "WithQueryParameters", "Invoked with a nil URL") } + v := r.URL.Query() for key, value := range parameters { - v.Add(key, value) + d, err := url.QueryUnescape(value) + if err != nil { + return r, err + } + v.Add(key, d) } - r.URL.RawQuery = createQuery(v) + r.URL.RawQuery = v.Encode() } return r, err }) diff --git a/vendor/github.com/Azure/go-autorest/autorest/utility.go b/vendor/github.com/Azure/go-autorest/autorest/utility.go index 031a17f98890..afb3e4e161ba 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/utility.go +++ b/vendor/github.com/Azure/go-autorest/autorest/utility.go @@ -23,7 +23,6 @@ import ( "net/http" "net/url" "reflect" - "sort" "strings" "github.com/Azure/go-autorest/autorest/adal" @@ -195,30 +194,6 @@ func queryEscape(s string) string { return url.QueryEscape(s) } -// This method is same as Encode() method of "net/url" go package, -// except it does not encode the query parameters because they -// already come encoded. It formats values map in query format (bar=foo&a=b). -func createQuery(v url.Values) string { - var buf bytes.Buffer - keys := make([]string, 0, len(v)) - for k := range v { - keys = append(keys, k) - } - sort.Strings(keys) - for _, k := range keys { - vs := v[k] - prefix := url.QueryEscape(k) + "=" - for _, v := range vs { - if buf.Len() > 0 { - buf.WriteByte('&') - } - buf.WriteString(prefix) - buf.WriteString(v) - } - } - return buf.String() -} - // ChangeToGet turns the specified http.Request into a GET (it assumes it wasn't). // This is mainly useful for long-running operations that use the Azure-AsyncOperation // header, so we change the initial PUT into a GET to retrieve the final result. diff --git a/vendor/vendor.json b/vendor/vendor.json index d40aa14a65df..4f7084ef8725 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -259,67 +259,67 @@ "versionExact": "v11.2.2-beta" }, { - "checksumSHA1": "tmbv8hhVXheuJk0/b5f0az1hzB0=", - "comment": "v9.5.2", + "checksumSHA1": "RzIYmvG1ReOud+kafFsZTDIZSK0=", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { - "checksumSHA1": "GHaYEopkom2TYCTK1yJSbyVf/VE=", - "comment": "v9.5.2", + "checksumSHA1": "OxKbGGQUfsDtM4Fz4ysBpallhOE=", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest/adal", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { - "checksumSHA1": "fazJNSy32igO+x8x2wXupgNhu+c=", - "comment": "v9.5.2", + "checksumSHA1": "PwTnRhiCu8p2D1M2nsM0ADL4FM0=", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest/azure", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { "checksumSHA1": "+nXRwVB/JVEGe+oLsFhCmSkKPuI=", - "comment": "v9.5.2", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest/azure/cli", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { "checksumSHA1": "9nXCi9qQsYjxCeajJKWttxgEt0I=", - "comment": "v9.5.2", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest/date", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { "checksumSHA1": "SbBb2GcJNm5GjuPKGL2777QywR4=", - "comment": "v9.5.2", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest/to", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { "checksumSHA1": "HfqZyKllcHQDvTwgCaYL1jUPmW0=", - "comment": "v9.5.2", + "comment": "v9.7.0", "path": "github.com/Azure/go-autorest/autorest/validation", - "revision": "40e67ab508b948cd6ab4b4108ea42f3793ca19e3", - "revisionTime": "2017-12-12T18:03:12Z", - "version": "v9.5.2", - "versionExact": "v9.5.2" + "revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01", + "revisionTime": "2018-01-06T16:29:27Z", + "version": "v9.7.0", + "versionExact": "v9.7.0" }, { "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=", From 7a5174360ee057616c95df94b9ab2c5c77fe30df Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 11 Jan 2018 16:29:41 +0000 Subject: [PATCH 2/3] Upgrading to v12.2.0-beta of Azure/azure-sdk-for-go --- .../arm/appinsights/client.go | 2 + .../arm/appinsights/version.go | 4 +- .../arm/authorization/client.go | 2 + .../arm/authorization/version.go | 4 +- .../azure-sdk-for-go/arm/automation/client.go | 2 + .../arm/automation/version.go | 4 +- .../Azure/azure-sdk-for-go/arm/cdn/client.go | 2 + .../Azure/azure-sdk-for-go/arm/cdn/version.go | 4 +- .../azure-sdk-for-go/arm/compute/client.go | 2 + .../azure-sdk-for-go/arm/compute/version.go | 4 +- .../arm/containerinstance/client.go | 2 +- .../arm/containerinstance/version.go | 4 +- .../arm/containerregistry/client.go | 2 +- .../arm/containerregistry/version.go | 4 +- .../arm/containerservice/client.go | 2 +- .../arm/containerservice/version.go | 4 +- .../azure-sdk-for-go/arm/cosmos-db/client.go | 2 + .../azure-sdk-for-go/arm/cosmos-db/version.go | 4 +- .../Azure/azure-sdk-for-go/arm/disk/client.go | 2 + .../azure-sdk-for-go/arm/disk/version.go | 4 +- .../Azure/azure-sdk-for-go/arm/dns/client.go | 2 + .../Azure/azure-sdk-for-go/arm/dns/version.go | 4 +- .../azure-sdk-for-go/arm/eventgrid/client.go | 2 + .../azure-sdk-for-go/arm/eventgrid/version.go | 4 +- .../azure-sdk-for-go/arm/eventhub/client.go | 2 + .../azure-sdk-for-go/arm/eventhub/version.go | 4 +- .../azure-sdk-for-go/arm/graphrbac/client.go | 2 + .../azure-sdk-for-go/arm/graphrbac/version.go | 4 +- .../azure-sdk-for-go/arm/keyvault/client.go | 2 + .../azure-sdk-for-go/arm/keyvault/version.go | 4 +- .../azure-sdk-for-go/arm/mysql/client.go | 2 + .../azure-sdk-for-go/arm/mysql/version.go | 4 +- .../azure-sdk-for-go/arm/network/client.go | 2 + .../azure-sdk-for-go/arm/network/version.go | 4 +- .../arm/operationalinsights/client.go | 2 + .../arm/operationalinsights/version.go | 4 +- .../azure-sdk-for-go/arm/postgresql/client.go | 2 + .../arm/postgresql/version.go | 4 +- .../azure-sdk-for-go/arm/redis/client.go | 2 + .../azure-sdk-for-go/arm/redis/version.go | 4 +- .../arm/resources/locks/client.go | 2 + .../arm/resources/locks/version.go | 4 +- .../arm/resources/resources/client.go | 2 + .../arm/resources/resources/version.go | 4 +- .../arm/resources/subscriptions/client.go | 2 + .../arm/resources/subscriptions/version.go | 4 +- .../azure-sdk-for-go/arm/scheduler/client.go | 2 +- .../azure-sdk-for-go/arm/scheduler/version.go | 4 +- .../azure-sdk-for-go/arm/search/client.go | 2 + .../azure-sdk-for-go/arm/search/version.go | 4 +- .../azure-sdk-for-go/arm/servicebus/client.go | 2 + .../arm/servicebus/version.go | 4 +- .../Azure/azure-sdk-for-go/arm/sql/client.go | 2 + .../Azure/azure-sdk-for-go/arm/sql/version.go | 4 +- .../azure-sdk-for-go/arm/storage/client.go | 2 + .../azure-sdk-for-go/arm/storage/version.go | 4 +- .../arm/trafficmanager/client.go | 2 +- .../arm/trafficmanager/version.go | 4 +- .../Azure/azure-sdk-for-go/arm/web/client.go | 2 + .../Azure/azure-sdk-for-go/arm/web/version.go | 4 +- .../dataplane/keyvault/client.go | 2 + .../dataplane/keyvault/version.go | 4 +- .../Azure/azure-sdk-for-go/storage/README.md | 4 +- .../Azure/azure-sdk-for-go/storage/client.go | 106 ++++-- .../azure-sdk-for-go/storage/container.go | 6 - .../Azure/azure-sdk-for-go/storage/entity.go | 2 +- .../azure-sdk-for-go/storage/table_batch.go | 18 +- .../Azure/azure-sdk-for-go/storage/version.go | 2 +- vendor/vendor.json | 320 +++++++++--------- 69 files changed, 383 insertions(+), 261 deletions(-) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/client.go index 57277c329885..e6473e6c9904 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/client.go @@ -1,6 +1,8 @@ // Package appinsights implements the Azure ARM Appinsights service API version 2015-05-01. // // Composite Swagger for Application Insights Management Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights package appinsights // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/version.go index 761d5b148e94..3db2fac50156 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/appinsights/version.go @@ -19,10 +19,10 @@ package appinsights // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-appinsights/2015-05-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-appinsights/2015-05-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/client.go index 79e308c099b5..81728ff5d447 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/client.go @@ -4,6 +4,8 @@ // resources or resource groups. These operations enable you to manage role definitions and role assignments. A role // definition describes the set of actions that can be performed on resources. A role assignment grants access to Azure // Active Directory users. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization package authorization // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/version.go index 8b49e435e4da..6fa5bfdec5f4 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/authorization/version.go @@ -19,10 +19,10 @@ package authorization // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-authorization/2015-07-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-authorization/2015-07-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/client.go index 4628235a23e0..1f00888b54fd 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/client.go @@ -1,6 +1,8 @@ // Package automation implements the Azure ARM Automation service API version 2015-10-31. // // Automation Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation package automation // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/version.go index bffe077dca41..c7d2832f5c3e 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/automation/version.go @@ -19,10 +19,10 @@ package automation // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-automation/2015-10-31" + return "Azure-SDK-For-Go/v12.2.0-beta arm-automation/2015-10-31" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/client.go index 2270397616b2..08f2731e8220 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/client.go @@ -2,6 +2,8 @@ // // Use these APIs to manage Azure CDN resources through the Azure Resource Manager. You must make sure that requests // made to these resources are secure. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-04-02/cdn package cdn // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/version.go index 58be63b6ff36..2c8637c14c84 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/cdn/version.go @@ -19,10 +19,10 @@ package cdn // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-cdn/2017-04-02" + return "Azure-SDK-For-Go/v12.2.0-beta arm-cdn/2017-04-02" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/client.go index 98b1c0dad648..93a44f2f20ba 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/client.go @@ -1,6 +1,8 @@ // Package compute implements the Azure ARM Compute service API version . // // Compute Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-03-30/compute package compute // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/version.go index 0ce1840a7581..5f320a4525d6 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/compute/version.go @@ -19,10 +19,10 @@ package compute // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-compute/" + return "Azure-SDK-For-Go/v12.2.0-beta arm-compute/" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/client.go index 2cb55471a257..a95462f13ada 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/client.go @@ -1,6 +1,6 @@ // Package containerinstance implements the Azure ARM Containerinstance service API version 2017-08-01-preview. // -// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2017-08-01-preview/containerinstance package containerinstance // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/version.go index e8c5807ce4b4..9bdb158e1ba5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerinstance/version.go @@ -19,10 +19,10 @@ package containerinstance // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-containerinstance/2017-08-01-preview" + return "Azure-SDK-For-Go/v12.2.0-beta arm-containerinstance/2017-08-01-preview" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/client.go index b3eea6cb2f49..08485cae6140 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/client.go @@ -1,6 +1,6 @@ // Package containerregistry implements the Azure ARM Containerregistry service API version 2017-10-01. // -// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry package containerregistry // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/version.go index 64b4c2bbc18d..0752bf4889ce 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/version.go @@ -19,10 +19,10 @@ package containerregistry // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-containerregistry/2017-10-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-containerregistry/2017-10-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go index 8133d6e50f87..f4b4cae0ae1d 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go @@ -1,6 +1,6 @@ // Package containerservice implements the Azure ARM Containerservice service API version 2017-01-31. // -// Compute Client +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-01-31/containerservice package containerservice // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go index 6968ce807972..bb8e7fc85880 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go @@ -19,10 +19,10 @@ package containerservice // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-containerservice/2017-01-31" + return "Azure-SDK-For-Go/v12.2.0-beta arm-containerservice/2017-01-31" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/client.go index a5d9da5db555..a47e3b24f202 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/client.go @@ -1,6 +1,8 @@ // Package cosmosdb implements the Azure ARM Cosmosdb service API version 2015-04-08. // // Azure Cosmos DB Database Service Resource Provider REST API +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb package cosmosdb // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/version.go index 3638bdebba16..a8f91f242747 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/cosmos-db/version.go @@ -19,10 +19,10 @@ package cosmosdb // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-cosmosdb/2015-04-08" + return "Azure-SDK-For-Go/v12.2.0-beta arm-cosmosdb/2015-04-08" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/client.go index 8bab7acc1324..54634794d677 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/client.go @@ -2,6 +2,8 @@ // 2016-04-30-preview. // // The Disk Resource Provider Client. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2016-04-30-preview/compute package disk // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/version.go index 11c4a35ee9c3..df001e23a0ad 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/disk/version.go @@ -19,10 +19,10 @@ package disk // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v10.2.0-beta arm-disk/2016-04-30-preview" + return "Azure-SDK-For-Go/v12.2.0-beta arm-disk/2016-04-30-preview" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v10.2.0-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/client.go index 714b698b502c..cef4b579c5f4 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/client.go @@ -1,6 +1,8 @@ // Package dns implements the Azure ARM Dns service API version 2016-04-01. // // The DNS Management Client. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns package dns // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/version.go index d757f944a38f..1b01f6c89f4d 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/dns/version.go @@ -19,10 +19,10 @@ package dns // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-dns/2016-04-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-dns/2016-04-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/client.go index 82fa4657052e..cc9dec6f5b1c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/client.go @@ -1,6 +1,8 @@ // Package eventgrid implements the Azure ARM Eventgrid service API version 2017-09-15-preview. // // Azure EventGrid Management Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2017-09-15-preview/eventgrid package eventgrid // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/version.go index 1b11e9193f1f..fe19076f2bf9 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventgrid/version.go @@ -19,10 +19,10 @@ package eventgrid // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-eventgrid/2017-09-15-preview" + return "Azure-SDK-For-Go/v12.2.0-beta arm-eventgrid/2017-09-15-preview" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/client.go index a9ae459d99ed..39f955517a92 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/client.go @@ -1,6 +1,8 @@ // Package eventhub implements the Azure ARM Eventhub service API version 2017-04-01. // // Azure Event Hubs client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/event package eventhub // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/version.go index 3c81d51224a0..0ccde0916c0a 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/eventhub/version.go @@ -19,10 +19,10 @@ package eventhub // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-eventhub/2017-04-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-eventhub/2017-04-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/client.go index 627cc025426b..5b120178501f 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/client.go @@ -1,6 +1,8 @@ // Package graphrbac implements the Azure ARM Graphrbac service API version 1.6. // // The Graph RBAC Management Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac package graphrbac // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/version.go index 979851a48802..a3373a1079c3 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/graphrbac/version.go @@ -19,10 +19,10 @@ package graphrbac // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-graphrbac/1.6" + return "Azure-SDK-For-Go/v12.2.0-beta arm-graphrbac/1.6" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/client.go index 4cbb7dce641c..62261633b188 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/client.go @@ -1,6 +1,8 @@ // Package keyvault implements the Azure ARM Keyvault service API version 2016-10-01. // // The Azure management API provides a RESTful set of web services that interact with Azure Key Vault. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault package keyvault // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/version.go index 6b0efe68e0b2..3457232f091b 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/keyvault/version.go @@ -19,10 +19,10 @@ package keyvault // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-keyvault/2016-10-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-keyvault/2016-10-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/client.go index ac960b12e64b..49448b247852 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/client.go @@ -2,6 +2,8 @@ // // The Microsoft Azure management API provides create, read, update, and delete functionality for Azure MySQL resources // including servers, databases, firewall rules, log files and configurations. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-04-30-preview/mysql package mysql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/version.go index e5f9786ad092..a81251166434 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/mysql/version.go @@ -19,10 +19,10 @@ package mysql // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-mysql/2017-04-30-preview" + return "Azure-SDK-For-Go/v12.2.0-beta arm-mysql/2017-04-30-preview" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/network/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/network/client.go index 59fc2a569b33..ea0952c7ca9b 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/network/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/network/client.go @@ -1,6 +1,8 @@ // Package network implements the Azure ARM Network service API version . // // Network Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network package network // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/network/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/network/version.go index e4c3729cafb8..e7c7a27fc4b9 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/network/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/network/version.go @@ -19,10 +19,10 @@ package network // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-network/" + return "Azure-SDK-For-Go/v12.2.0-beta arm-network/" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/client.go index 7fc00380ff5f..b0c9ce4b0b14 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/client.go @@ -1,6 +1,8 @@ // Package operationalinsights implements the Azure ARM Operationalinsights service API version . // // Operational Insights Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights package operationalinsights // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/version.go index 6fd6bb626809..4016210ef423 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/operationalinsights/version.go @@ -19,10 +19,10 @@ package operationalinsights // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-operationalinsights/" + return "Azure-SDK-For-Go/v12.2.0-beta arm-operationalinsights/" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go index 5cdc9318f239..0ba8d5a085db 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/client.go @@ -2,6 +2,8 @@ // // The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL // resources including servers, databases, firewall rules, log files and configurations. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-04-30-preview/postgresql package postgresql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go index 4c48d9bafd0d..7701b7b45318 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/postgresql/version.go @@ -19,10 +19,10 @@ package postgresql // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-postgresql/2017-04-30-preview" + return "Azure-SDK-For-Go/v12.2.0-beta arm-postgresql/2017-04-30-preview" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/client.go index eca26b9b2227..d56c78f10e80 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/client.go @@ -1,6 +1,8 @@ // Package redis implements the Azure ARM Redis service API version 2016-04-01. // // REST API for Azure Redis Cache Service. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2016-04-01/redis package redis // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/version.go index 42da5cbdb724..860fa6f3b24c 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/redis/version.go @@ -19,10 +19,10 @@ package redis // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-redis/2016-04-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-redis/2016-04-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/client.go index 0b70ea01fc31..d4a34c5b225c 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/client.go @@ -1,6 +1,8 @@ // Package locks implements the Azure ARM Locks service API version 2016-09-01. // // Azure resources can be locked to prevent other users in your organization from deleting or modifying resources. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks package locks // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/version.go index 7341b8e160f6..81cf6aeae0d8 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/locks/version.go @@ -19,10 +19,10 @@ package locks // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-locks/2016-09-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-locks/2016-09-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/client.go index 348e0cf16b6e..82fef44541b0 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/client.go @@ -1,6 +1,8 @@ // Package resources implements the Azure ARM Resources service API version 2017-05-10. // // Provides operations for working with resources and resource groups. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources package resources // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/version.go index 2cd9235281be..f54379378a66 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/resources/version.go @@ -19,10 +19,10 @@ package resources // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-resources/2017-05-10" + return "Azure-SDK-For-Go/v12.2.0-beta arm-resources/2017-05-10" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/client.go index be46092b9d2c..09344eca913e 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/client.go @@ -3,6 +3,8 @@ // All resource groups and resources exist within subscriptions. These operation enable you get information about your // subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure AD) for your // organization. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions package subscriptions // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/version.go index e2fcaf5c4d3b..175d9aea9fe7 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions/version.go @@ -19,10 +19,10 @@ package subscriptions // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-subscriptions/2016-06-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-subscriptions/2016-06-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/client.go index 113dc5553051..ae4149904302 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/client.go @@ -1,6 +1,6 @@ // Package scheduler implements the Azure ARM Scheduler service API version 2016-03-01. // -// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/scheduler/2016-03-01/scheduler package scheduler // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/version.go index 468e2c34df29..cb791a6bc7de 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/scheduler/version.go @@ -19,10 +19,10 @@ package scheduler // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-scheduler/2016-03-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-scheduler/2016-03-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/search/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/search/client.go index dee6991e0cf3..9957e9fd4276 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/search/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/search/client.go @@ -1,6 +1,8 @@ // Package search implements the Azure ARM Search service API version 2015-08-19. // // Client that can be used to manage Azure Search services and API keys. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/search/2015-08-19/search package search // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/search/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/search/version.go index 4356a640ab5d..3608ddf51222 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/search/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/search/version.go @@ -19,10 +19,10 @@ package search // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-search/2015-08-19" + return "Azure-SDK-For-Go/v12.2.0-beta arm-search/2015-08-19" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/client.go index 9ea063a73dab..db17b7296d50 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/client.go @@ -1,6 +1,8 @@ // Package servicebus implements the Azure ARM Servicebus service API version 2017-04-01. // // Azure Service Bus client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus package servicebus // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/version.go index 281a3aa4eb55..704068ca1c3f 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/servicebus/version.go @@ -19,10 +19,10 @@ package servicebus // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-servicebus/2017-04-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-servicebus/2017-04-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/client.go index 5970ecf74064..5f1aafa02cfc 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/client.go @@ -2,6 +2,8 @@ // // The Azure SQL Database management API provides a RESTful set of web services that interact with Azure SQL Database // services to manage your databases. The API enables you to create, retrieve, update, and delete databases. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2017-03-01-preview/sql package sql // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/version.go index 891e71ac4a76..a05bbbe1113e 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/sql/version.go @@ -19,10 +19,10 @@ package sql // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-sql/" + return "Azure-SDK-For-Go/v12.2.0-beta arm-sql/" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/client.go index 133386ddbeb6..1c54682152d8 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/client.go @@ -1,6 +1,8 @@ // Package storage implements the Azure ARM Storage service API version 2017-06-01. // // The Azure Storage Management API. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-06-01/storage package storage // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/version.go index 5d5ab667115f..01d2030f232b 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/storage/version.go @@ -19,10 +19,10 @@ package storage // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-storage/2017-06-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-storage/2017-06-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/client.go index e588450d875d..89acda0d0de7 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/client.go @@ -1,6 +1,6 @@ // Package trafficmanager implements the Azure ARM Trafficmanager service API version . // -// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-09-01-preview/trafficmanager package trafficmanager // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/version.go index 6490949a511e..5086d7c0ff6f 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/version.go @@ -19,10 +19,10 @@ package trafficmanager // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-trafficmanager/" + return "Azure-SDK-For-Go/v12.2.0-beta arm-trafficmanager/" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/web/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/web/client.go index 5c52a2afb6c2..d86c32b57202 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/web/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/web/client.go @@ -1,6 +1,8 @@ // Package web implements the Azure ARM Web service API version . // // WebSite Management Client +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web package web // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/web/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/web/version.go index ad2b088d2c1c..aa1dcd66a6b8 100755 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/web/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/web/version.go @@ -19,10 +19,10 @@ package web // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-web/" + return "Azure-SDK-For-Go/v12.2.0-beta arm-web/" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/client.go b/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/client.go index 27b398c9efbf..31a35a9cfc48 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/client.go @@ -1,6 +1,8 @@ // Package keyvault implements the Azure ARM Keyvault service API version 2016-10-01. // // The key vault client performs cryptographic key operations and vault operations against the Key Vault service. +// +// Deprecated: Please instead use github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault package keyvault // Copyright (c) Microsoft and contributors. All rights reserved. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/version.go b/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/version.go index 6b0efe68e0b2..3457232f091b 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/dataplane/keyvault/version.go @@ -19,10 +19,10 @@ package keyvault // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/v11.1.1-beta arm-keyvault/2016-10-01" + return "Azure-SDK-For-Go/v12.2.0-beta arm-keyvault/2016-10-01" } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return "v11.1.1-beta" + return "v12.2.0-beta" } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md b/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md index 6dc348e02af2..85a0482d6ec6 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/README.md @@ -6,7 +6,7 @@ This package includes support for [Azure Storage Emulator](https://azure.microso # Getting Started - 1. Go get the SDK `go get -u github.com/Azure/azure-sdk-for=go/storage` + 1. Go get the SDK `go get -u github.com/Azure/azure-sdk-for-go/storage` 1. If you don't already have one, [create a Storage Account](https://docs.microsoft.com/en-us/azure/storage/storage-create-storage-account). - Take note of your Azure Storage Account Name and Azure Storage Account Key. They'll both be necessary for using this library. - This option is production ready, but can also be used for development. @@ -70,4 +70,4 @@ ok, err = queue2.Exists() c.Assert(err, chk.IsNil) c.Assert(ok, chk.Equals, true) } -``` \ No newline at end of file +``` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go index a9ae9d11fc3e..7d502306d81c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go @@ -75,6 +75,12 @@ const ( connectionStringAccountKey = "accountkey" connectionStringEndpointSuffix = "endpointsuffix" connectionStringEndpointProtocol = "defaultendpointsprotocol" + + connectionStringBlobEndpoint = "blobendpoint" + connectionStringFileEndpoint = "fileendpoint" + connectionStringQueueEndpoint = "queueendpoint" + connectionStringTableEndpoint = "tableendpoint" + connectionStringSAS = "sharedaccesssignature" ) var ( @@ -212,11 +218,8 @@ func (e UnexpectedStatusCodeError) Got() int { // NewClientFromConnectionString creates a Client from the connection string. func NewClientFromConnectionString(input string) (Client, error) { - var ( - accountName, accountKey, endpointSuffix string - useHTTPS = defaultUseHTTPS - ) - + // build a map of connection string key/value pairs + parts := map[string]string{} for _, pair := range strings.Split(input, ";") { if pair == "" { continue @@ -227,26 +230,39 @@ func NewClientFromConnectionString(input string) (Client, error) { return Client{}, fmt.Errorf("Invalid connection segment %q", pair) } - value := pair[equalDex+1:] - key := strings.ToLower(pair[:equalDex]) - switch key { - case connectionStringAccountName: - accountName = value - case connectionStringAccountKey: - accountKey = value - case connectionStringEndpointSuffix: - endpointSuffix = value - case connectionStringEndpointProtocol: - useHTTPS = value == "https" - default: - // ignored - } + value := strings.TrimSpace(pair[equalDex+1:]) + key := strings.TrimSpace(strings.ToLower(pair[:equalDex])) + parts[key] = value } - if accountName == StorageEmulatorAccountName { + // TODO: validate parameter sets? + + if parts[connectionStringAccountName] == StorageEmulatorAccountName { return NewEmulatorClient() } - return NewClient(accountName, accountKey, endpointSuffix, DefaultAPIVersion, useHTTPS) + + if parts[connectionStringSAS] != "" { + endpoint := "" + if parts[connectionStringBlobEndpoint] != "" { + endpoint = parts[connectionStringBlobEndpoint] + } else if parts[connectionStringFileEndpoint] != "" { + endpoint = parts[connectionStringFileEndpoint] + } else if parts[connectionStringQueueEndpoint] != "" { + endpoint = parts[connectionStringQueueEndpoint] + } else { + endpoint = parts[connectionStringTableEndpoint] + } + + return NewAccountSASClientFromEndpointToken(endpoint, parts[connectionStringSAS]) + } + + useHTTPS := defaultUseHTTPS + if parts[connectionStringEndpointProtocol] != "" { + useHTTPS = parts[connectionStringEndpointProtocol] == "https" + } + + return NewClient(parts[connectionStringAccountName], parts[connectionStringAccountKey], + parts[connectionStringEndpointSuffix], DefaultAPIVersion, useHTTPS) } // NewBasicClient constructs a Client with given storage service name and @@ -330,6 +346,47 @@ func NewAccountSASClient(account string, token url.Values, env azure.Environment return c } +// NewAccountSASClientFromEndpointToken constructs a client that uses accountSAS authorization +// for its operations using the specified endpoint and SAS token. +func NewAccountSASClientFromEndpointToken(endpoint string, sasToken string) (Client, error) { + u, err := url.Parse(endpoint) + if err != nil { + return Client{}, err + } + + token, err := url.ParseQuery(sasToken) + if err != nil { + return Client{}, err + } + + // the host name will look something like this + // - foo.blob.core.windows.net + // "foo" is the account name + // "core.windows.net" is the baseURL + + // find the first dot to get account name + i1 := strings.IndexByte(u.Host, '.') + if i1 < 0 { + return Client{}, fmt.Errorf("failed to find '.' in %s", u.Host) + } + + // now find the second dot to get the base URL + i2 := strings.IndexByte(u.Host[i1+1:], '.') + if i2 < 0 { + return Client{}, fmt.Errorf("failed to find '.' in %s", u.Host[i1+1:]) + } + + c := newSASClient() + c.accountSASToken = token + c.accountName = u.Host[:i1] + c.baseURL = u.Host[i1+i2+2:] + + // Get API version and protocol from token + c.apiVersion = token.Get("sv") + c.useHTTPS = token.Get("spr") == "https" + return c, nil +} + func newSASClient() Client { c := Client{ HTTPClient: http.DefaultClient, @@ -672,6 +729,13 @@ func (c Client) exec(verb, url string, headers map[string]string, body io.Reader req.Header[k] = append(req.Header[k], v) // Must bypass case munging present in `Add` by using map functions directly. See https://github.com/Azure/azure-sdk-for-go/issues/645 } + if c.isAccountSASClient() { + // append the SAS token to the query params + v := req.URL.Query() + v = mergeParams(v, c.accountSASToken) + req.URL.RawQuery = v.Encode() + } + resp, err := c.Sender.Send(&c, req) if err != nil { return nil, err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go index 9f23248836f3..38463bb67f0d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/container.go @@ -301,9 +301,6 @@ func (c *Container) Exists() (bool, error) { uri = newURI.String() } else { - if c.bsc.client.isAccountSASClient() { - q = mergeParams(q, c.bsc.client.accountSASToken) - } uri = c.bsc.client.getEndpoint(blobServiceName, c.buildPath(), q) } headers := c.bsc.client.getStandardHeaders() @@ -489,9 +486,6 @@ func (c *Container) ListBlobs(params ListBlobsParameters) (BlobListResponse, err newURI.RawQuery = q.Encode() uri = newURI.String() } else { - if c.bsc.client.isAccountSASClient() { - q = mergeParams(q, c.bsc.client.accountSASToken) - } uri = c.bsc.client.getEndpoint(blobServiceName, c.buildPath(), q) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go index 9668ea669494..4533d7d5edfc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/entity.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/satori/uuid" + "github.com/satori/go.uuid" ) // Annotating as secure for gas scanning diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go index 3f882417c65a..d1d75a2eb1a5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/table_batch.go @@ -26,7 +26,7 @@ import ( "sort" "strings" - "github.com/satori/uuid" + "github.com/marstr/guid" ) // Operation type. Insert, Delete, Replace etc. @@ -131,14 +131,26 @@ func (t *TableBatch) MergeEntity(entity *Entity) { // the changesets. // As per document https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/performing-entity-group-transactions func (t *TableBatch) ExecuteBatch() error { - changesetBoundary := fmt.Sprintf("changeset_%s", uuid.NewV1()) + + // Using `github.com/marstr/guid` is in response to issue #947 (https://github.com/Azure/azure-sdk-for-go/issues/947). + id, err := guid.NewGUIDs(guid.CreationStrategyVersion1) + if err != nil { + return err + } + + changesetBoundary := fmt.Sprintf("changeset_%s", id.String()) uri := t.Table.tsc.client.getEndpoint(tableServiceName, "$batch", nil) changesetBody, err := t.generateChangesetBody(changesetBoundary) if err != nil { return err } - boundary := fmt.Sprintf("batch_%s", uuid.NewV1()) + id, err = guid.NewGUIDs(guid.CreationStrategyVersion1) + if err != nil { + return err + } + + boundary := fmt.Sprintf("batch_%s", id.String()) body, err := generateBody(changesetBody, changesetBoundary, boundary) if err != nil { return err diff --git a/vendor/github.com/Azure/azure-sdk-for-go/storage/version.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/version.go index 1cd3e03d12a8..2ddf18e447f3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/storage/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/storage/version.go @@ -15,5 +15,5 @@ package storage // limitations under the License. var ( - sdkVersion = "10.0.2" + sdkVersion = "v12.2.0-beta" ) diff --git a/vendor/vendor.json b/vendor/vendor.json index 4f7084ef8725..1cd7f14fc81c 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,260 +3,260 @@ "ignore": "test github.com/hashicorp/terraform/backend", "package": [ { - "checksumSHA1": "cLJryrfFsQ0kxvT26jyrRASjqyE=", + "checksumSHA1": "6L+lfS4jjiDIT4vBffPkpmx2PI0=", "path": "github.com/Azure/azure-sdk-for-go/arm/appinsights", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "1TjThMsS9q9PFA1Ku6VpArJpwrc=", + "checksumSHA1": "IjNs00z0UNBU/yuPRYynmrgVGGs=", "path": "github.com/Azure/azure-sdk-for-go/arm/authorization", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "dLLvvMHpeu3J7VxCLRUQKDHZWX4=", + "checksumSHA1": "ntRFNTvyrAmlRlpQVLJpVBwhQms=", "path": "github.com/Azure/azure-sdk-for-go/arm/automation", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "Ne7TSUwMhG0j3gjU/xK+mpF8+iI=", + "checksumSHA1": "wgnU3Mmf/S8pUvERC4TRzoLLH5g=", "path": "github.com/Azure/azure-sdk-for-go/arm/cdn", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "sgst5KZzsaGRp3Q6Qg9+EFXzloo=", + "checksumSHA1": "ntK9uWj6tVf/jSFsQiGezSsr9dM=", "path": "github.com/Azure/azure-sdk-for-go/arm/compute", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "A1kAbUQOdO46tH0VVmib+++GxNc=", + "checksumSHA1": "IedxDiI9EV0mSaxf4eNtK92crZY=", "path": "github.com/Azure/azure-sdk-for-go/arm/containerinstance", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "rYa0VeazE13rwuRokLQ6NjK+PKk=", + "checksumSHA1": "qC39cfKej1D75HsDIySK3bcXUeg=", "path": "github.com/Azure/azure-sdk-for-go/arm/containerregistry", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "wt107iTLA62ppLn3KHWcCazDRhI=", + "checksumSHA1": "e/5MUSVCg252Ql+dQ4MUD/xdxCU=", "path": "github.com/Azure/azure-sdk-for-go/arm/containerservice", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "vuYaWbUWFk+uh7YR1uCpeoXD5lM=", + "checksumSHA1": "bZvdO5h22oZJFrnYK5jaSyDdFAQ=", "path": "github.com/Azure/azure-sdk-for-go/arm/cosmos-db", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "TZa+aR1MLk+nQVZaUWNPWCBHeBQ=", + "checksumSHA1": "IuOad6dkXLtlhfpz0uAXf2D/0BU=", "path": "github.com/Azure/azure-sdk-for-go/arm/disk", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "s6FLUuLGdNO9o3tLucJ92BWCGKM=", + "checksumSHA1": "IXreuQabmzmRhjA0cCHXulObl1c=", "path": "github.com/Azure/azure-sdk-for-go/arm/dns", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "aDYe656iEsKhC2MChDgin/bEOBo=", + "checksumSHA1": "+fxsSGqHe7t9+9sVbmBhyUeVmNU=", "path": "github.com/Azure/azure-sdk-for-go/arm/eventgrid", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "qVIgSktHgjRL+m6O3YR/C3QX94w=", + "checksumSHA1": "NiwGn7ohqvpC1UevRLxGbiqvWMw=", "path": "github.com/Azure/azure-sdk-for-go/arm/eventhub", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "InelJwKuAnbd6CGuCB6pNMhAXlI=", + "checksumSHA1": "ukh0GPROTDLuKagYzTAnOp0E5hk=", "path": "github.com/Azure/azure-sdk-for-go/arm/graphrbac", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "7lanQDNfujqC80Pmr+h0GQH00D4=", + "checksumSHA1": "MTOGJVzeFd1VxLpuz+JoJ/5r8lA=", "path": "github.com/Azure/azure-sdk-for-go/arm/keyvault", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "bb4XrZmhiQKz+tl2ycSykFCnyx4=", + "checksumSHA1": "aSAQM4LTlSAyWJTSMCJjBxUkmVI=", "path": "github.com/Azure/azure-sdk-for-go/arm/mysql", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "ogmv4nD4MyLgjk0eRughDtWvSZQ=", + "checksumSHA1": "PDMRG1zVjFxDESUXBwR74V+zVHs=", "path": "github.com/Azure/azure-sdk-for-go/arm/network", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "dV30DwwWfqE+HxqIrJDSQL6C6vU=", + "checksumSHA1": "k5+yVk1W5Vgt0kBB+iNsI8cEt0Y=", "path": "github.com/Azure/azure-sdk-for-go/arm/operationalinsights", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "8a0hsMvOcVsHLBIsLJurLL885eQ=", + "checksumSHA1": "1IZMTPTijWAzodsaa1Qsn7T/wj8=", "path": "github.com/Azure/azure-sdk-for-go/arm/postgresql", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "OMI3k1lMtyKXMwJKrAGE0pP5pdo=", + "checksumSHA1": "1vQZbJJLbYz+ocnsVsWmPrAfu4A=", "path": "github.com/Azure/azure-sdk-for-go/arm/redis", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "2A4jetKtPI0BebL2+2IfZyMHFuY=", + "checksumSHA1": "p1TxN/VU3M0OQ31Tdy993dAiHNw=", "path": "github.com/Azure/azure-sdk-for-go/arm/resources/locks", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "/c1STvJS8QAjYpbWC1taB8Jb6oY=", + "checksumSHA1": "TE0GnPTelRfFvMJakgRcaB2TxHg=", "path": "github.com/Azure/azure-sdk-for-go/arm/resources/resources", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "+37p6Yqa/A1CC0Y2P1fX+JTftmE=", + "checksumSHA1": "6Csnt2xO8qZ+4gmrEqlYMpn8vvc=", "path": "github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "iQ7v67Q37TOdd65RjezPdHkic+U=", + "checksumSHA1": "XSQZIQNppPwrrhrcXitEyDhGY5A=", "path": "github.com/Azure/azure-sdk-for-go/arm/scheduler", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "R0z0S9aDThvTeRWz9v07mvhZM0M=", + "checksumSHA1": "+Z62YwWMUMqYyBGIyBRi/EBCHeU=", "path": "github.com/Azure/azure-sdk-for-go/arm/search", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "w27ZgdEpmK5PMEYRoq0isCXDoP8=", + "checksumSHA1": "ic3iVn7qIYW1l0xKJ/0N9+wUMXs=", "path": "github.com/Azure/azure-sdk-for-go/arm/servicebus", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "8ayQzyFNFa5GHy/RgLvNY0cI8lw=", + "checksumSHA1": "whHT4jwkYhuqG/BQ7s1Hvf7WN9M=", "path": "github.com/Azure/azure-sdk-for-go/arm/sql", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "nXZ5ngUwVap9VKe+dGPNsAfN8ow=", + "checksumSHA1": "CmbTBUAZKv3EVjWu+xQCwzDniMQ=", "path": "github.com/Azure/azure-sdk-for-go/arm/storage", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "7uh2CPPBNaws4WnaUv9D2VQ7gb0=", + "checksumSHA1": "d9xZegy2040SulgLJliNEpE+k50=", "path": "github.com/Azure/azure-sdk-for-go/arm/trafficmanager", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "tGPwaWleaPVxYU/4G5wmKYyPhc0=", + "checksumSHA1": "jyn5xCr0BJgVJpZ35jAt1dIjrZ0=", "path": "github.com/Azure/azure-sdk-for-go/arm/web", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "hOnaPIkeDhBG2PFf+qAJe8Rgmh4=", + "checksumSHA1": "z/C9jsbI3ZO3u8lJRAPXN0ZX2r0=", "path": "github.com/Azure/azure-sdk-for-go/dataplane/keyvault", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { - "checksumSHA1": "YhsdEgNxWnYrqYtlBRbwI66DVgw=", + "checksumSHA1": "YDEw1uWzG+8V7KAaJfr4jKs1cM0=", "path": "github.com/Azure/azure-sdk-for-go/storage", - "revision": "7692b0cef22674113fcf71cc17ac3ccc1a7fef48", - "revisionTime": "2017-11-07T22:03:28Z", - "version": "v11.2.2-beta", - "versionExact": "v11.2.2-beta" + "revision": "eae258195456be76b2ec9ad2ee2ab63cdda365d9", + "revisionTime": "2018-01-09T21:59:56Z", + "version": "v12.2.0-beta", + "versionExact": "v12.2.0-beta" }, { "checksumSHA1": "RzIYmvG1ReOud+kafFsZTDIZSK0=", From b390f3a890fd4cb9e5b58899230c07fc2e2b96ac Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 11 Jan 2018 16:31:24 +0000 Subject: [PATCH 3/3] Vendoring github.com/marstr/guid --- vendor/github.com/marstr/guid/LICENSE.txt | 21 ++ vendor/github.com/marstr/guid/README.md | 27 ++ vendor/github.com/marstr/guid/guid.go | 301 ++++++++++++++++++++++ vendor/vendor.json | 6 + 4 files changed, 355 insertions(+) create mode 100644 vendor/github.com/marstr/guid/LICENSE.txt create mode 100644 vendor/github.com/marstr/guid/README.md create mode 100644 vendor/github.com/marstr/guid/guid.go diff --git a/vendor/github.com/marstr/guid/LICENSE.txt b/vendor/github.com/marstr/guid/LICENSE.txt new file mode 100644 index 000000000000..e18a0841a1c4 --- /dev/null +++ b/vendor/github.com/marstr/guid/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Martin Strobel + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/vendor/github.com/marstr/guid/README.md b/vendor/github.com/marstr/guid/README.md new file mode 100644 index 000000000000..355fad16d273 --- /dev/null +++ b/vendor/github.com/marstr/guid/README.md @@ -0,0 +1,27 @@ +[![Build Status](https://travis-ci.org/marstr/guid.svg?branch=master)](https://travis-ci.org/marstr/guid) +[![GoDoc](https://godoc.org/github.com/marstr/guid?status.svg)](https://godoc.org/github.com/marstr/guid) +[![Go Report Card](https://goreportcard.com/badge/github.com/marstr/guid)](https://goreportcard.com/report/github.com/marstr/guid) + +# Guid +Globally unique identifiers offer a quick means of generating non-colliding values across a distributed system. For this implemenation, [RFC 4122](http://ietf.org/rfc/rfc4122.txt) governs the desired behavior. + +## What's in a name? +You have likely already noticed that RFC and some implementations refer to these structures as UUIDs (Universally Unique Identifiers), where as this project is annotated as GUIDs (Globally Unique Identifiers). The name Guid was selected to make clear this project's ties to the [.NET struct Guid.](https://msdn.microsoft.com/en-us/library/system.guid(v=vs.110).aspx) The most obvious relationship is the desire to have the same format specifiers available in this library's Format and Parse methods as .NET would have in its ToString and Parse methods. + +# Installation +- Ensure you have the [Go Programming Language](https://golang.org/) installed on your system. +- Run the command: `go get -u github.com/marstr/guid` + +# Contribution +Contributions are welcome! Feel free to send Pull Requests. Continuous Integration will ensure that you have conformed to Go conventions. Please remember to add tests for your changes. + +# Versioning +This library will adhere to the +[Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html) specification. It may be worth noting this should allow for tools like [glide](https://glide.readthedocs.io/en/latest/) to pull in this library with ease. + +The Release Notes portion of this file will be updated to reflect the most recent major/minor updates, with the option to tag particular bug-fixes as well. Updates to the Release Notes for patches should be addative, where as major/minor updates should replace the previous version. If one desires to see the release notes for an older version, checkout that version of code and open this file. + +# Release Notes 1.1.* + +## v1.1.0 +Adding support for JSON marshaling and unmarshaling. diff --git a/vendor/github.com/marstr/guid/guid.go b/vendor/github.com/marstr/guid/guid.go new file mode 100644 index 000000000000..51b038b75cdc --- /dev/null +++ b/vendor/github.com/marstr/guid/guid.go @@ -0,0 +1,301 @@ +package guid + +import ( + "bytes" + "crypto/rand" + "errors" + "fmt" + "net" + "strings" + "sync" + "time" +) + +// GUID is a unique identifier designed to virtually guarantee non-conflict between values generated +// across a distributed system. +type GUID struct { + timeHighAndVersion uint16 + timeMid uint16 + timeLow uint32 + clockSeqHighAndReserved uint8 + clockSeqLow uint8 + node [6]byte +} + +// Format enumerates the values that are supported by Parse and Format +type Format string + +// These constants define the possible string formats available via this implementation of Guid. +const ( + FormatB Format = "B" // {00000000-0000-0000-0000-000000000000} + FormatD Format = "D" // 00000000-0000-0000-0000-000000000000 + FormatN Format = "N" // 00000000000000000000000000000000 + FormatP Format = "P" // (00000000-0000-0000-0000-000000000000) + FormatX Format = "X" // {0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}} + FormatDefault Format = FormatD +) + +// CreationStrategy enumerates the values that are supported for populating the bits of a new Guid. +type CreationStrategy string + +// These constants define the possible creation strategies available via this implementation of Guid. +const ( + CreationStrategyVersion1 CreationStrategy = "version1" + CreationStrategyVersion2 CreationStrategy = "version2" + CreationStrategyVersion3 CreationStrategy = "version3" + CreationStrategyVersion4 CreationStrategy = "version4" + CreationStrategyVersion5 CreationStrategy = "version5" +) + +var emptyGUID GUID + +// NewGUID generates and returns a new globally unique identifier +func NewGUID() GUID { + result, err := version4() + if err != nil { + panic(err) //Version 4 (pseudo-random GUID) doesn't use anything that could fail. + } + return result +} + +var knownStrategies = map[CreationStrategy]func() (GUID, error){ + CreationStrategyVersion1: version1, + CreationStrategyVersion4: version4, +} + +// NewGUIDs generates and returns a new globally unique identifier that conforms to the given strategy. +func NewGUIDs(strategy CreationStrategy) (GUID, error) { + if creator, present := knownStrategies[strategy]; present { + result, err := creator() + return result, err + } + return emptyGUID, errors.New("Unsupported CreationStrategy") +} + +// Empty returns a copy of the default and empty GUID. +func Empty() GUID { + return emptyGUID +} + +var knownFormats = map[Format]string{ + FormatN: "%08x%04x%04x%02x%02x%02x%02x%02x%02x%02x%02x", + FormatD: "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + FormatB: "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + FormatP: "(%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x)", + FormatX: "{0x%08x,0x%04x,0x%04x,{0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x}}", +} + +// MarshalJSON writes a GUID as a JSON string. +func (guid GUID) MarshalJSON() (marshaled []byte, err error) { + buf := bytes.Buffer{} + + _, err = buf.WriteRune('"') + buf.WriteString(guid.String()) + buf.WriteRune('"') + + marshaled = buf.Bytes() + return +} + +// Parse instantiates a GUID from a text representation of the same GUID. +// This is the inverse of function family String() +func Parse(value string) (GUID, error) { + var guid GUID + for _, fullFormat := range knownFormats { + parity, err := fmt.Sscanf( + value, + fullFormat, + &guid.timeLow, + &guid.timeMid, + &guid.timeHighAndVersion, + &guid.clockSeqHighAndReserved, + &guid.clockSeqLow, + &guid.node[0], + &guid.node[1], + &guid.node[2], + &guid.node[3], + &guid.node[4], + &guid.node[5]) + if parity == 11 && err == nil { + return guid, err + } + } + return emptyGUID, fmt.Errorf("\"%s\" is not in a recognized format", value) +} + +// String returns a text representation of a GUID in the default format. +func (guid GUID) String() string { + return guid.Stringf(FormatDefault) +} + +// Stringf returns a text representation of a GUID that conforms to the specified format. +// If an unrecognized format is provided, the empty string is returned. +func (guid GUID) Stringf(format Format) string { + if format == "" { + format = FormatDefault + } + fullFormat, present := knownFormats[format] + if !present { + return "" + } + return fmt.Sprintf( + fullFormat, + guid.timeLow, + guid.timeMid, + guid.timeHighAndVersion, + guid.clockSeqHighAndReserved, + guid.clockSeqLow, + guid.node[0], + guid.node[1], + guid.node[2], + guid.node[3], + guid.node[4], + guid.node[5]) +} + +// UnmarshalJSON parses a GUID from a JSON string token. +func (guid *GUID) UnmarshalJSON(marshaled []byte) (err error) { + if len(marshaled) < 2 { + err = errors.New("JSON GUID must be surrounded by quotes") + return + } + stripped := marshaled[1 : len(marshaled)-1] + *guid, err = Parse(string(stripped)) + return +} + +// Version reads a GUID to parse which mechanism of generating GUIDS was employed. +// Values returned here are documented in rfc4122.txt. +func (guid GUID) Version() uint { + return uint(guid.timeHighAndVersion >> 12) +} + +var unixToGregorianOffset = time.Date(1970, 01, 01, 0, 0, 00, 0, time.UTC).Sub(time.Date(1582, 10, 15, 0, 0, 0, 0, time.UTC)) + +// getRFC4122Time returns a 60-bit count of 100-nanosecond intervals since 00:00:00.00 October 15th, 1582 +func getRFC4122Time() int64 { + currentTime := time.Now().UTC().Add(unixToGregorianOffset).UnixNano() + currentTime /= 100 + return currentTime & 0x0FFFFFFFFFFFFFFF +} + +var clockSeqVal uint16 +var clockSeqKey sync.Mutex + +func getClockSequence() (uint16, error) { + clockSeqKey.Lock() + defer clockSeqKey.Unlock() + + if 0 == clockSeqVal { + var temp [2]byte + if parity, err := rand.Read(temp[:]); !(2 == parity && nil == err) { + return 0, err + } + clockSeqVal = uint16(temp[0])<<8 | uint16(temp[1]) + } + clockSeqVal++ + return clockSeqVal, nil +} + +func getMACAddress() (mac [6]byte, err error) { + var hostNICs []net.Interface + + hostNICs, err = net.Interfaces() + if err != nil { + return + } + + for _, nic := range hostNICs { + var parity int + + parity, err = fmt.Sscanf( + strings.ToLower(nic.HardwareAddr.String()), + "%02x:%02x:%02x:%02x:%02x:%02x", + &mac[0], + &mac[1], + &mac[2], + &mac[3], + &mac[4], + &mac[5]) + + if parity == len(mac) { + return + } + } + + err = fmt.Errorf("No suitable address found") + + return +} + +func version1() (result GUID, err error) { + var localMAC [6]byte + var clockSeq uint16 + + currentTime := getRFC4122Time() + + result.timeLow = uint32(currentTime) + result.timeMid = uint16(currentTime >> 32) + result.timeHighAndVersion = uint16(currentTime >> 48) + if err = result.setVersion(1); err != nil { + return emptyGUID, err + } + + if localMAC, err = getMACAddress(); nil != err { + if parity, err := rand.Read(localMAC[:]); !(len(localMAC) != parity && err == nil) { + return emptyGUID, err + } + localMAC[0] |= 0x1 + } + copy(result.node[:], localMAC[:]) + + if clockSeq, err = getClockSequence(); nil != err { + return emptyGUID, err + } + + result.clockSeqLow = uint8(clockSeq) + result.clockSeqHighAndReserved = uint8(clockSeq >> 8) + + result.setReservedBits() + + return +} + +func version4() (GUID, error) { + var retval GUID + var bits [10]byte + + if parity, err := rand.Read(bits[:]); !(len(bits) == parity && err == nil) { + return emptyGUID, err + } + retval.timeHighAndVersion |= uint16(bits[0]) | uint16(bits[1])<<8 + retval.timeMid |= uint16(bits[2]) | uint16(bits[3])<<8 + retval.timeLow |= uint32(bits[4]) | uint32(bits[5])<<8 | uint32(bits[6])<<16 | uint32(bits[7])<<24 + retval.clockSeqHighAndReserved = uint8(bits[8]) + retval.clockSeqLow = uint8(bits[9]) + + //Randomly set clock-sequence, reserved, and node + if written, err := rand.Read(retval.node[:]); !(nil == err && written == len(retval.node)) { + retval = emptyGUID + return retval, err + } + + if err := retval.setVersion(4); nil != err { + return emptyGUID, err + } + retval.setReservedBits() + + return retval, nil +} + +func (guid *GUID) setVersion(version uint16) error { + if version > 5 || version == 0 { + return fmt.Errorf("While setting GUID version, unsupported version: %d", version) + } + guid.timeHighAndVersion = (guid.timeHighAndVersion & 0x0fff) | version<<12 + return nil +} + +func (guid *GUID) setReservedBits() { + guid.clockSeqHighAndReserved = (guid.clockSeqHighAndReserved & 0x3f) | 0x80 +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 1cd7f14fc81c..81df23ee51e0 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -940,6 +940,12 @@ "revision": "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d", "revisionTime": "2016-08-03T19:07:31Z" }, + { + "checksumSHA1": "T9E+5mKBQ/BX4wlNxgaPfetxdeI=", + "path": "github.com/marstr/guid", + "revision": "8bdf7d1a087ccc975cf37dd6507da50698fd19ca", + "revisionTime": "2017-04-27T23:51:15Z" + }, { "checksumSHA1": "y/A5iuvwjytQE2CqVuphQRXR2nI=", "path": "github.com/mattn/go-isatty",