mcclient: lb: allow empty string as arg for --redirect-{scheme,host,p…

…ath}
yunionio · Jun 19, 2020 · 0038848 · 0038848
1 parent 3fe10a7
commit 0038848
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/pkg/mcclient/options/loadbalancerlistenerrules.go b/pkg/mcclient/options/loadbalancerlistenerrules.go
@@ -26,9 +26,9 @@ type LoadbalancerListenerRuleCreateOptions struct {
 
 	Redirect       *string `choices:"off|raw"`
 	RedirectCode   *int    `choices:"301|302|307"`
-	RedirectScheme *string `choices:"http|https"`
-	RedirectHost   *string
-	RedirectPath   *string
+	RedirectScheme *string `json:",allowempty" choices:"http|https|"`
+	RedirectHost   *string `json:",allowempty"`
+	RedirectPath   *string `json:",allowempty"`
 }
 
 type LoadbalancerListenerRuleListOptions struct {
@@ -41,9 +41,9 @@ type LoadbalancerListenerRuleListOptions struct {
 
 	Redirect       *string `choices:"off|raw"`
 	RedirectCode   *int    `choices:"301|302|307"`
-	RedirectScheme *string `choices:"http|https"`
-	RedirectHost   *string
-	RedirectPath   *string
+	RedirectScheme *string `choices:"http|https|" json:",allowempty"`
+	RedirectHost   *string `json:",allowempty"`
+	RedirectPath   *string `json:",allowempty"`
 }
 
 type LoadbalancerListenerRuleUpdateOptions struct {
@@ -57,9 +57,9 @@ type LoadbalancerListenerRuleUpdateOptions struct {
 
 	Redirect       *string `choices:"off|raw"`
 	RedirectCode   *int    `choices:"301|302|307"`
-	RedirectScheme *string `choices:"http|https"`
-	RedirectHost   *string
-	RedirectPath   *string
+	RedirectScheme *string `choices:"http|https|" json:",allowempty"`
+	RedirectHost   *string `json:",allowempty"`
+	RedirectPath   *string `json:",allowempty"`
 }
 
 type LoadbalancerListenerRuleGetOptions struct {

diff --git a/pkg/mcclient/options/loadbalancerlisteners.go b/pkg/mcclient/options/loadbalancerlisteners.go
@@ -70,9 +70,9 @@ type LoadbalancerListenerCreateOptions struct {
 
 	Redirect       *string `choices:"off|raw"`
 	RedirectCode   *int    `choices:"301|302|307"`
-	RedirectScheme *string `choices:"http|https"`
-	RedirectHost   *string
-	RedirectPath   *string
+	RedirectScheme *string `choices:"http|https|" json:",allowempty"`
+	RedirectHost   *string `json:",allowempty"`
+	RedirectPath   *string `json:",allowempty"`
 }
 
 type LoadbalancerListenerListOptions struct {
@@ -128,9 +128,9 @@ type LoadbalancerListenerListOptions struct {
 
 	Redirect       *string `choices:"off|raw"`
 	RedirectCode   *int    `choices:"301|302|307"`
-	RedirectScheme *string `choices:"http|https"`
-	RedirectHost   *string
-	RedirectPath   *string
+	RedirectScheme *string `choices:"http|https|" json:",allowempty"`
+	RedirectHost   *string `json:",allowempty"`
+	RedirectPath   *string `json:",allowempty"`
 }
 
 type LoadbalancerListenerUpdateOptions struct {
@@ -184,9 +184,9 @@ type LoadbalancerListenerUpdateOptions struct {
 
 	Redirect       *string `choices:"off|raw"`
 	RedirectCode   *int    `choices:"301|302|307"`
-	RedirectScheme *string `choices:"http|https"`
-	RedirectHost   *string
-	RedirectPath   *string
+	RedirectScheme *string `choices:"http|https|" json:",allowempty"`
+	RedirectHost   *string `json:",allowempty"`
+	RedirectPath   *string `json:",allowempty"`
 }
 
 type LoadbalancerListenerGetOptions struct {