ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/azurerm: Bump SDK version of jen20/riviera (#9740) 

Fixes #9400

Also fixes an issue with the nightly acceptance tests that @pmcatominey
has fixed in the SDK
This commit is contained in:
Paul Stack 2016-10-31 11:57:53 +00:00 committed by GitHub
parent 51ff5cba38
commit bcd4e73d18
7 changed files with 106 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/github.com/jen20/riviera/azure/client.go generated vendored
View File

@ -4,14 +4,14 @@ import (
"io/ioutil"
"log"
"github.com/hashicorp/go-retryablehttp"
"net/http"
"github.com/hashicorp/go-retryablehttp"
)
type Client struct {
logger *log.Logger
BaseURL string
subscriptionID string
tokenRequester *tokenRequester
@ -27,7 +27,6 @@ func NewClient(creds *AzureResourceManagerCredentials) (*Client, error) {
tr := newTokenRequester(httpClient, creds.ClientID, creds.ClientSecret, creds.TenantID)
return &Client{
BaseURL: "https://management.azure.com",
subscriptionID: creds.SubscriptionID,
httpClient: httpClient,
tokenRequester: tr,

27
vendor/github.com/jen20/riviera/azure/endpoints.go generated vendored Normal file
View File

@ -0,0 +1,27 @@
package azure
import "strings"
type Endpoints struct {
resourceManagerEndpointUrl string
activeDirectoryEndpointUrl string
}
func GetEndpoints(location string) Endpoints {
var e Endpoints
location = strings.Replace(strings.ToLower(location), " ", "", -1)
switch location {
case GermanyCentral, GermanyEast:
e = Endpoints{"https://management.microsoftazure.de", "https://login.microsoftonline.de"}
case ChinaEast, ChinaNorth:
e = Endpoints{"https://management.chinacloudapi.cn", "https://login.chinacloudapi.cn"}
case USGovIowa, USGovVirginia:
e = Endpoints{"https://management.usgovcloudapi.net", "https://login.microsoftonline.com"}
default:
e = Endpoints{"https://management.azure.com", "https://login.microsoftonline.com"}
}
return e
}

9
vendor/github.com/jen20/riviera/azure/locations.go generated vendored
View File

@ -18,9 +18,16 @@ const (
JapanWest = "japanwest"
BrazilSouth = "brazilsouth"
AustraliaEast = "australiaeast"
Australia = "australia"
AustraliaSouthEast = "australiasoutheast"
CentralIndia = "centralindia"
SouthIndia = "southindia"
WestIndia = "westindia"
ChinaEast = "chinaeast"
ChinaNorth = "chinanorth"
UKSouth = "uksouth"
UKWest = "ukwest"
CanadaCentral = "canadacentral"
CanadaEast = "canadaeast"
GermanyCentral = "germanycentral"
GermanyEast = "germanyeast"
)

10
vendor/github.com/jen20/riviera/azure/request.go generated vendored
View File

@ -75,7 +75,8 @@ func (request *Request) pollForAsynchronousResponse(acceptedResponse *http.Respo
return nil, err
}
err = request.client.tokenRequester.addAuthorizationToRequest(req)
location := reflect.Indirect(reflect.ValueOf(request.Command)).FieldByName("Location").Interface().(string)
err = request.client.tokenRequester.addAuthorizationToRequest(req, location)
if err != nil {
return nil, err
}
@ -115,10 +116,11 @@ func defaultARMRequestSerialize(body interface{}) (io.ReadSeeker, error) {
func (request *Request) Execute() (*Response, error) {
apiInfo := request.Command.APIInfo()
location := reflect.Indirect(reflect.ValueOf(request.Command)).FieldByName("Location").Interface().(string)
var urlString string
// Base URL should already be validated by now so Parse is safe without error handling
urlObj, _ := url.Parse(request.client.BaseURL)
urlObj, _ := url.Parse(GetEndpoints(location).resourceManagerEndpointUrl)
// Determine whether to use the URLPathFunc or the URI explicitly set in the request
if request.URI == nil {
@ -164,7 +166,7 @@ func (request *Request) Execute() (*Response, error) {
req.Header.Add("Content-Type", "application/json")
}
err = request.client.tokenRequester.addAuthorizationToRequest(req)
err = request.client.tokenRequester.addAuthorizationToRequest(req, location)
if err != nil {
return nil, err
}

15
vendor/github.com/jen20/riviera/azure/token.go generated vendored
View File

@ -43,8 +43,8 @@ func newTokenRequester(client *retryablehttp.Client, clientID, clientSecret, ten
// addAuthorizationToRequest adds an Authorization header to an http.Request, having ensured
// that the token is sufficiently fresh. This may invoke network calls, so should not be
// relied on to return quickly.
func (tr *tokenRequester) addAuthorizationToRequest(request *retryablehttp.Request) error {
token, err := tr.getUsableToken()
func (tr *tokenRequester) addAuthorizationToRequest(request *retryablehttp.Request, location string) error {
token, err := tr.getUsableToken(location)
if err != nil {
return fmt.Errorf("Error obtaining authorization token: %s", err)
}
@ -53,7 +53,7 @@ func (tr *tokenRequester) addAuthorizationToRequest(request *retryablehttp.Reque
return nil
}
func (tr *tokenRequester) getUsableToken() (*token, error) {
func (tr *tokenRequester) getUsableToken(location string) (*token, error) {
tr.l.Lock()
defer tr.l.Unlock()
@ -61,7 +61,7 @@ func (tr *tokenRequester) getUsableToken() (*token, error) {
return tr.currentToken, nil
}
newToken, err := tr.refreshToken()
newToken, err := tr.refreshToken(location)
if err != nil {
return nil, fmt.Errorf("Error refreshing token: %s", err)
}
@ -70,14 +70,15 @@ func (tr *tokenRequester) getUsableToken() (*token, error) {
return newToken, nil
}
func (tr *tokenRequester) refreshToken() (*token, error) {
oauthURL := fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/%s?api-version=1.0", tr.tenantID, "token")
func (tr *tokenRequester) refreshToken(location string) (*token, error) {
endpoints := GetEndpoints(location)
oauthURL := fmt.Sprintf("%s/%s/oauth2/%s?api-version=1.0", endpoints.activeDirectoryEndpointUrl, tr.tenantID, "token")
v := url.Values{}
v.Set("client_id", tr.clientID)
v.Set("client_secret", tr.clientSecret)
v.Set("grant_type", "client_credentials")
v.Set("resource", "https://management.azure.com/")
v.Set("resource", endpoints.resourceManagerEndpointUrl)
var newToken token
response, err := tr.httpClient.PostForm(oauthURL, v)

2
vendor/github.com/jen20/riviera/sql/get_database.go generated vendored
View File

@ -6,7 +6,7 @@ type GetDatabaseResponse struct {
ID *string `mapstructure:"id"`
Name *string `mapstructure:"name"`
Location *string `mapstructure:"location"`
Tags *map[string]string `mapstructure:"tags"`
Tags *map[string]*string `mapstructure:"tags"`
Kind *string `mapstructure:"kind"`
DatabaseID *string `mapstructure:"databaseId"`
DatabaseName *string `mapstructure:"databaseName"`

24
vendor/vendor.json vendored
View File

@ -1451,34 +1451,34 @@
"revisionTime": "2016-09-29T21:48:42Z"
},
{
"checksumSHA1": "oPpOfZn11Ef6DWOoETxSW9Venzs=",
"checksumSHA1": "dQ9OpoeiMUPiSgRPCC5Ekj3uNu8=",
"path": "github.com/jen20/riviera/azure",
"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-30T14:11:29Z"
"revision": "f6cb638392f1df73c2385b8c5c4f6dcba421eeaf",
"revisionTime": "2016-10-31T11:27:19Z"
},
{
"checksumSHA1": "ncdT+1PFEF5ly0niXuQc9/pKzT0=",
"path": "github.com/jen20/riviera/dns",
"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-30T14:11:29Z"
"revision": "f6cb638392f1df73c2385b8c5c4f6dcba421eeaf",
"revisionTime": "2016-10-31T11:27:19Z"
},
{
"checksumSHA1": "zVXx6ha3bt0N4ukRbRHXjSl91S4=",
"path": "github.com/jen20/riviera/search",
"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-30T14:11:29Z"
"revision": "f6cb638392f1df73c2385b8c5c4f6dcba421eeaf",
"revisionTime": "2016-10-31T11:27:19Z"
},
{
"checksumSHA1": "KfquDaeBPGchw92QnojlJFsJKgk=",
"checksumSHA1": "mD+brnqSfkLheYdGzTUqUi6VWgw=",
"path": "github.com/jen20/riviera/sql",
"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-30T14:11:29Z"
"revision": "f6cb638392f1df73c2385b8c5c4f6dcba421eeaf",
"revisionTime": "2016-10-31T11:27:19Z"
},
{
"checksumSHA1": "nKUCquNpJ9ifHgkXoT4K3Xar6R8=",
"path": "github.com/jen20/riviera/storage",
"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
"revisionTime": "2016-06-30T14:11:29Z"
"revision": "f6cb638392f1df73c2385b8c5c4f6dcba421eeaf",
"revisionTime": "2016-10-31T11:27:19Z"
},
{
"comment": "0.2.2-2-gc01cf91",