Add expected string for target group HTTP monitoring (#127)

ans-group · Oct 13, 2022 · e54ef1e · e54ef1e
1 parent 7b3e3bc
commit e54ef1e
Showing 1 changed file with 49 additions and 45 deletions.
diff --git a/pkg/service/loadbalancer/request.go b/pkg/service/loadbalancer/request.go
@@ -41,55 +41,59 @@ type PatchTargetRequest struct {
 
 // CreateTargetGroupRequest represents a request to create a target group
 type CreateTargetGroupRequest struct {
-	ClusterID            int                      `json:"cluster_id"`
-	Name                 string                   `json:"name"`
-	Balance              TargetGroupBalance       `json:"balance"`
-	Mode                 Mode                     `json:"mode"`
-	Close                bool                     `json:"close"`
-	Sticky               bool                     `json:"sticky"`
-	CookieOpts           string                   `json:"cookie_opts,omitempty"`
-	Source               string                   `json:"source,omitempty"`
-	TimeoutsConnect      int                      `json:"timeouts_connect,omitempty"`
-	TimeoutsServer       int                      `json:"timeouts_server,omitempty"`
-	CustomOptions        string                   `json:"custom_options,omitempty"`
-	MonitorURL           string                   `json:"monitor_url,omitempty"`
-	MonitorMethod        TargetGroupMonitorMethod `json:"monitor_method,omitempty"`
-	MonitorHost          string                   `json:"monitor_host,omitempty"`
-	MonitorHTTPVersion   string                   `json:"monitor_http_version,omitempty"`
-	MonitorExpect        string                   `json:"monitor_expect,omitempty"`
-	MonitorTCPMonitoring bool                     `json:"monitor_tcp_monitoring"`
-	CheckPort            int                      `json:"check_port,omitempty"`
-	SendProxy            bool                     `json:"send_proxy"`
-	SendProxyV2          bool                     `json:"send_proxy_v2"`
-	SSL                  bool                     `json:"ssl"`
-	SSLVerify            bool                     `json:"ssl_verify"`
-	SNI                  bool                     `json:"sni"`
+	ClusterID                int                      `json:"cluster_id"`
+	Name                     string                   `json:"name"`
+	Balance                  TargetGroupBalance       `json:"balance"`
+	Mode                     Mode                     `json:"mode"`
+	Close                    bool                     `json:"close"`
+	Sticky                   bool                     `json:"sticky"`
+	CookieOpts               string                   `json:"cookie_opts,omitempty"`
+	Source                   string                   `json:"source,omitempty"`
+	TimeoutsConnect          int                      `json:"timeouts_connect,omitempty"`
+	TimeoutsServer           int                      `json:"timeouts_server,omitempty"`
+	CustomOptions            string                   `json:"custom_options,omitempty"`
+	MonitorURL               string                   `json:"monitor_url,omitempty"`
+	MonitorMethod            TargetGroupMonitorMethod `json:"monitor_method,omitempty"`
+	MonitorHost              string                   `json:"monitor_host,omitempty"`
+	MonitorHTTPVersion       string                   `json:"monitor_http_version,omitempty"`
+	MonitorExpect            string                   `json:"monitor_expect,omitempty"`
+	MonitorTCPMonitoring     bool                     `json:"monitor_tcp_monitoring"`
+	MonitorExpectString      string                   `json:"monitor_expect_string,omitempty"`
+	MonitorExpectStringRegex bool                     `json:"monitor_expect_string_regex"`
+	CheckPort                int                      `json:"check_port,omitempty"`
+	SendProxy                bool                     `json:"send_proxy"`
+	SendProxyV2              bool                     `json:"send_proxy_v2"`
+	SSL                      bool                     `json:"ssl"`
+	SSLVerify                bool                     `json:"ssl_verify"`
+	SNI                      bool                     `json:"sni"`
 }
 
 // PatchTargetGroupRequest represents a request to patch a target group
 type PatchTargetGroupRequest struct {
-	Name                 string                   `json:"name,omitempty"`
-	Balance              TargetGroupBalance       `json:"balance,omitempty"`
-	Mode                 Mode                     `json:"mode,omitempty"`
-	Close                *bool                    `json:"close,omitempty"`
-	Sticky               *bool                    `json:"sticky,omitempty"`
-	CookieOpts           string                   `json:"cookie_opts,omitempty"`
-	Source               string                   `json:"source,omitempty"`
-	TimeoutsConnect      int                      `json:"timeouts_connect,omitempty"`
-	TimeoutsServer       int                      `json:"timeouts_server,omitempty"`
-	CustomOptions        string                   `json:"custom_options,omitempty"`
-	MonitorURL           string                   `json:"monitor_url,omitempty"`
-	MonitorMethod        TargetGroupMonitorMethod `json:"monitor_method,omitempty"`
-	MonitorHost          string                   `json:"monitor_host,omitempty"`
-	MonitorHTTPVersion   string                   `json:"monitor_http_version,omitempty"`
-	MonitorExpect        string                   `json:"monitor_expect,omitempty"`
-	MonitorTCPMonitoring *bool                    `json:"monitor_tcp_monitoring,omitempty"`
-	CheckPort            int                      `json:"check_port,omitempty"`
-	SendProxy            *bool                    `json:"send_proxy,omitempty"`
-	SendProxyV2          *bool                    `json:"send_proxy_v2,omitempty"`
-	SSL                  *bool                    `json:"ssl,omitempty"`
-	SSLVerify            *bool                    `json:"ssl_verify,omitempty"`
-	SNI                  *bool                    `json:"sni,omitempty"`
+	Name                     string                   `json:"name,omitempty"`
+	Balance                  TargetGroupBalance       `json:"balance,omitempty"`
+	Mode                     Mode                     `json:"mode,omitempty"`
+	Close                    *bool                    `json:"close,omitempty"`
+	Sticky                   *bool                    `json:"sticky,omitempty"`
+	CookieOpts               string                   `json:"cookie_opts,omitempty"`
+	Source                   string                   `json:"source,omitempty"`
+	TimeoutsConnect          int                      `json:"timeouts_connect,omitempty"`
+	TimeoutsServer           int                      `json:"timeouts_server,omitempty"`
+	CustomOptions            string                   `json:"custom_options,omitempty"`
+	MonitorURL               string                   `json:"monitor_url,omitempty"`
+	MonitorMethod            TargetGroupMonitorMethod `json:"monitor_method,omitempty"`
+	MonitorHost              string                   `json:"monitor_host,omitempty"`
+	MonitorHTTPVersion       string                   `json:"monitor_http_version,omitempty"`
+	MonitorExpect            string                   `json:"monitor_expect,omitempty"`
+	MonitorTCPMonitoring     *bool                    `json:"monitor_tcp_monitoring,omitempty"`
+	MonitorExpectString      string                   `json:"monitor_expect_string,omitempty"`
+	MonitorExpectStringRegex *bool                    `json:"monitor_expect_string_regex,omitempty"`
+	CheckPort                int                      `json:"check_port,omitempty"`
+	SendProxy                *bool                    `json:"send_proxy,omitempty"`
+	SendProxyV2              *bool                    `json:"send_proxy_v2,omitempty"`
+	SSL                      *bool                    `json:"ssl,omitempty"`
+	SSLVerify                *bool                    `json:"ssl_verify,omitempty"`
+	SNI                      *bool                    `json:"sni,omitempty"`
 }
 
 // CreateVIPRequest represents a request to create a target group