the zone priority in params is higher than zone in config
This commit is contained in:
parent
29d7bdf768
commit
6b9920402b
|
@ -239,9 +239,11 @@ func (b *Builder) parseRequestURL() error {
|
||||||
b.parsedURL = endpoint + requestURI
|
b.parsedURL = endpoint + requestURI
|
||||||
|
|
||||||
if b.parsedParams != nil && b.operation.RequestMethod == "GET" {
|
if b.parsedParams != nil && b.operation.RequestMethod == "GET" {
|
||||||
zone := (*b.parsedProperties)["zone"]
|
if _, ok := (*b.parsedParams)["zone"]; !ok {
|
||||||
if zone != "" {
|
zone := (*b.parsedProperties)["zone"]
|
||||||
(*b.parsedParams)["zone"] = zone
|
if zone != "" {
|
||||||
|
(*b.parsedParams)["zone"] = zone
|
||||||
|
}
|
||||||
}
|
}
|
||||||
paramsParts := []string{}
|
paramsParts := []string{}
|
||||||
for key, value := range *b.parsedParams {
|
for key, value := range *b.parsedParams {
|
||||||
|
@ -260,9 +262,11 @@ func (b *Builder) parseRequestURL() error {
|
||||||
func (b *Builder) parseRequestForm() error {
|
func (b *Builder) parseRequestForm() error {
|
||||||
if b.parsedParams != nil && b.operation.RequestMethod == "POST" {
|
if b.parsedParams != nil && b.operation.RequestMethod == "POST" {
|
||||||
var values = make(url.Values)
|
var values = make(url.Values)
|
||||||
zone := (*b.parsedProperties)["zone"]
|
if _, ok := (*b.parsedParams)["zone"]; !ok {
|
||||||
if zone != "" {
|
zone := (*b.parsedProperties)["zone"]
|
||||||
(*b.parsedParams)["zone"] = zone
|
if zone != "" {
|
||||||
|
(*b.parsedParams)["zone"] = zone
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for key, value := range *b.parsedParams {
|
for key, value := range *b.parsedParams {
|
||||||
values.Set(key, value)
|
values.Set(key, value)
|
||||||
|
|
Loading…
Reference in New Issue