Merge pull request #1450 from ioito/hotfix/qx-listener-rule

fix(aws): lb listener rule

Author: ioito

pkg/multicloud/aws/loadbalancercert.go

@@ -38,11 +38,11 @@ type SElbCertificate struct {
 	cert   *x509.Certificate
 
 	Path                  string    `json:"Path"`
-	ServerCertificateName string    `json:"ServerCertificateName"`
-	ServerCertificateID   string    `json:"ServerCertificateId"`
-	Arn                   string    `json:"Arn"`
-	UploadDate            time.Time `json:"UploadDate"`
-	Expiration            time.Time `json:"Expiration"`
+	ServerCertificateName string    `xml:"ServerCertificateName"`
+	ServerCertificateID   string    `xml:"ServerCertificateId"`
+	Arn                   string    `xml:"Arn"`
+	UploadDate            time.Time `xml:"UploadDate"`
+	Expiration            time.Time `xml:"Expiration"`
 	PublicKey             string
 }
 

pkg/multicloud/aws/loadbalancerlistener.go

@@ -42,22 +42,22 @@ type SElbListener struct {
 	lb    *SElb
 	group *SElbBackendGroup
 
-	Port            int             `json:"Port"`
-	Protocol        string          `json:"Protocol"`
+	Port            int             `xml:"Port"`
+	Protocol        string          `xml:"Protocol"`
 	DefaultActions  []DefaultAction `xml:"DefaultActions>member"`
-	SSLPolicy       string          `json:"SslPolicy"`
-	Certificates    []Certificate   `json:"Certificates"`
-	LoadBalancerArn string          `json:"LoadBalancerArn"`
-	ListenerArn     string          `json:"ListenerArn"`
+	SSLPolicy       string          `xml:"SslPolicy"`
+	Certificates    []Certificate   `xml:"Certificates>member"`
+	LoadBalancerArn string          `xml:"LoadBalancerArn"`
+	ListenerArn     string          `xml:"ListenerArn"`
 }
 
 type Certificate struct {
-	CertificateArn string `json:"CertificateArn"`
+	CertificateArn string `xml:"CertificateArn"`
 }
 
 type DefaultAction struct {
-	TargetGroupArn string `json:"TargetGroupArn"`
-	Type           string `json:"Type"`
+	TargetGroupArn string `xml:"TargetGroupArn"`
+	Type           string `xml:"Type"`
 }
 
 func (self *SElbListener) GetId() string {
@@ -379,7 +379,7 @@ func (self *SElbListener) CreateILoadBalancerListenerRule(rule *cloudprovider.SL
 }
 
 func (self *SElbListener) GetILoadBalancerListenerRuleById(ruleId string) (cloudprovider.ICloudLoadbalancerListenerRule, error) {
-	rule, err := self.lb.region.GetElbListenerRule(ruleId)
+	rule, err := self.lb.region.GetElbListenerRule(self.ListenerArn, ruleId)
 	if err != nil {
 		return nil, errors.Wrap(err, "GetElbListenerRule")
 	}
@@ -389,19 +389,13 @@ func (self *SElbListener) GetILoadBalancerListenerRuleById(ruleId string) (cloud
 
 func (self *SElbListener) GetILoadbalancerListenerRules() ([]cloudprovider.ICloudLoadbalancerListenerRule, error) {
 	ret := []cloudprovider.ICloudLoadbalancerListenerRule{}
-	marker := ""
-	for {
-		part, marker, err := self.lb.region.GetElbListenerRules(self.ListenerArn, "", marker)
-		if err != nil {
-			return nil, err
-		}
-		for i := range part {
-			part[i].listener = self
-			ret = append(ret, &part[i])
-		}
-		if len(marker) == 0 || len(part) == 0 {
-			break
-		}
+	rules, err := self.lb.region.GetElbListenerRules(self.ListenerArn, "")
+	if err != nil {
+		return nil, err
+	}
+	for i := range rules {
+		rules[i].listener = self
+		ret = append(ret, &rules[i])
 	}
 	return ret, nil
 }
@@ -603,36 +597,45 @@ func (self *SRegion) CreateElbListener(lbId string, opts *cloudprovider.SLoadbal
 	return nil, errors.Wrapf(cloudprovider.ErrNotFound, "after created")
 }
 
-func (self *SRegion) GetElbListenerRules(listenerId string, ruleId, marker string) ([]SElbListenerRule, string, error) {
+func (self *SRegion) GetElbListenerRules(listenerId string, ruleId string) ([]SElbListenerRule, error) {
 	params := map[string]string{}
 	if len(listenerId) > 0 {
 		params["ListenerArn"] = listenerId
 	}
 	if len(ruleId) > 0 {
 		params["RuleArns.member.1"] = ruleId
 	}
-	if len(marker) > 0 {
-		params["Marker"] = marker
-	}
-	ret := &SElbListenerRules{}
-	err := self.elbRequest("DescribeRules", params, ret)
-	if err != nil {
-		return nil, "", errors.Wrapf(err, "DescribeRules")
+
+	ret := []SElbListenerRule{}
+	for {
+		part := struct {
+			Rules      []SElbListenerRule `xml:"Rules>member"`
+			NextMarker string
+		}{}
+		err := self.elbRequest("DescribeRules", params, &part)
+		if err != nil {
+			return nil, errors.Wrapf(err, "DescribeRules")
+		}
+		ret = append(ret, part.Rules...)
+		if len(part.NextMarker) == 0 || len(part.Rules) == 0 {
+			break
+		}
+		params["Marker"] = part.NextMarker
 	}
-	return ret.Rules, ret.NextMarker, nil
+	return ret, nil
 }
 
-func (self *SRegion) GetElbListenerRule(id string) (*SElbListenerRule, error) {
-	rules, _, err := self.GetElbListenerRules("", id, "")
+func (self *SRegion) GetElbListenerRule(lisId, ruleId string) (*SElbListenerRule, error) {
+	rules, err := self.GetElbListenerRules(lisId, ruleId)
 	if err != nil {
 		return nil, errors.Wrapf(err, "GetElbListenerRules")
 	}
 	for i := range rules {
-		if rules[i].RuleArn == id {
+		if rules[i].RuleArn == ruleId {
 			return &rules[i], nil
 		}
 	}
-	return nil, errors.Wrapf(cloudprovider.ErrNotFound, id)
+	return nil, errors.Wrapf(cloudprovider.ErrNotFound, ruleId)
 }
 
 func (self *SRegion) DeleteElbListener(id string) error {

pkg/multicloud/aws/loadbalancerlistenerrule.go

@@ -40,45 +40,45 @@ type SElbListenerRule struct {
 	listener *SElbListener
 	region   *SRegion
 
-	Priority      string      `json:"Priority"`
-	IsDefaultRule bool        `json:"IsDefault"`
-	Actions       []Action    `json:"Actions"`
-	RuleArn       string      `json:"RuleArn"`
-	Conditions    []Condition `json:"Conditions"`
+	Priority      string      `xml:"Priority"`
+	IsDefaultRule bool        `xml:"IsDefault"`
+	Actions       []Action    `xml:"Actions>member"`
+	RuleArn       string      `xml:"RuleArn"`
+	Conditions    []Condition `xml:"Conditions>member"`
 }
 
 type Action struct {
-	TargetGroupArn string `json:"TargetGroupArn"`
-	Type           string `json:"Type"`
+	TargetGroupArn string `xml:"TargetGroupArn"`
+	Type           string `xml:"Type"`
 }
 
 type Condition struct {
-	Field                   string             `json:"field"`
-	HTTPRequestMethodConfig *Config            `json:"httpRequestMethodConfig,omitempty"`
-	Values                  []string           `json:"values"`
-	SourceIPConfig          *Config            `json:"sourceIpConfig,omitempty"`
-	QueryStringConfig       *QueryStringConfig `json:"queryStringConfig,omitempty"`
-	HTTPHeaderConfig        *HTTPHeaderConfig  `json:"httpHeaderConfig,omitempty"`
-	PathPatternConfig       *Config            `json:"pathPatternConfig,omitempty"`
-	HostHeaderConfig        *Config            `json:"hostHeaderConfig,omitempty"`
+	Field                   string             `xml:"Field"`
+	HTTPRequestMethodConfig *Config            `xml:"HttpRequestMethodConfig"`
+	Values                  []string           `xml:"Values>member"`
+	SourceIPConfig          *Config            `xml:"SourceIpConfig"`
+	QueryStringConfig       *QueryStringConfig `xml:"QueryStringConfig"`
+	HTTPHeaderConfig        *HTTPHeaderConfig  `xml:"HttpHeaderConfig"`
+	PathPatternConfig       *Config            `xml:"PathPatternConfig"`
+	HostHeaderConfig        *Config            `xml:"HostHeaderConfig"`
 }
 
 type HTTPHeaderConfig struct {
-	HTTPHeaderName string   `json:"HttpHeaderName"`
-	Values         []string `json:"values"`
+	HTTPHeaderName string   `xml:"HttpHeaderName"`
+	Values         []string `xml:"Values>member"`
 }
 
 type Config struct {
-	Values []string `json:"values"`
+	Values []string `xml:"Values>member"`
 }
 
 type QueryStringConfig struct {
-	Values []Query `json:"values"`
+	Values []Query `xml:"Values>member"`
 }
 
 type Query struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
+	Key   string `xml:"key"`
+	Value string `xml:"value"`
 }
 
 func (self *SElbListenerRule) GetId() string {
@@ -99,7 +99,7 @@ func (self *SElbListenerRule) GetStatus() string {
 }
 
 func (self *SElbListenerRule) Refresh() error {
-	rule, err := self.region.GetElbListenerRule(self.RuleArn)
+	rule, err := self.region.GetElbListenerRule(self.listener.ListenerArn, self.RuleArn)
 	if err != nil {
 		return err
 	}

pkg/multicloud/aws/shell/lb.go

@@ -115,4 +115,18 @@ func init() {
 		return nil
 	})
 
+	type LbListenerRuleListOptions struct {
+		ListenerId string
+		RuleId     string
+	}
+
+	shellutils.R(&LbListenerRuleListOptions{}, "lb-listener-rule-list", "List loadbalancer listener rules", func(cli *aws.SRegion, args *LbListenerRuleListOptions) error {
+		rules, err := cli.GetElbListenerRules(args.ListenerId, args.RuleId)
+		if err != nil {
+			return err
+		}
+		printList(rules, 0, 0, 0, nil)
+		return nil
+	})
+
 }