Automated cherry pick of #20338: fix(region): vendor update for waf info sync

go.mod

@@ -88,7 +88,7 @@ require (
 	k8s.io/client-go v0.19.3
 	k8s.io/cluster-bootstrap v0.19.3
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240521070416-7668541b2a63
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240522122302-b27cdcdc15cb
 	yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
 	yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
 	yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91

go.sum

@@ -1208,8 +1208,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240521070416-7668541b2a63 h1:j0GXmbJsm6C+ByDNIv1bITMlSkuGHJ53BvdZcWS3ww4=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240521070416-7668541b2a63/go.mod h1:quoJjGTJ2PjAY0+3YeN5JuN136whECKmfkJQwIsXKjM=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240522122302-b27cdcdc15cb h1:f8Qlj4PPHTm8ffZX44Ua69v5/eJhR5rJFQl3/LyuCLw=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240522122302-b27cdcdc15cb/go.mod h1:quoJjGTJ2PjAY0+3YeN5JuN136whECKmfkJQwIsXKjM=
 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

pkg/compute/models/waf_instances.go

@@ -76,6 +76,9 @@ type SWafInstance struct {
 	SourceIps       []string `width:"512" charset:"utf8" nullable:"true" list:"user" update:"admin"`
 	HttpPorts       []int    `width:"64" charset:"utf8" nullable:"true" list:"user" update:"admin"`
 	HttpsPorts      []int    `width:"64" charset:"utf8" nullable:"true" list:"user" update:"admin"`
+
+	UpstreamScheme string `width:"32" charset:"utf8" nullable:"true" list:"user" update:"admin"`
+	UpstreamPort   int    `nullable:"true" list:"user" update:"admin"`
 }
 
 func (manager *SWafInstanceManager) GetContextManagers() [][]db.IModelManager {
@@ -441,10 +444,13 @@ func (self *SWafInstance) SyncWithCloudWafInstance(ctx context.Context, userCred
 		self.DefaultAction = ext.GetDefaultAction()
 		self.Status = ext.GetStatus()
 		self.IsAccessProduct = ext.GetIsAccessProduct()
+		self.Type = ext.GetWafType()
 		self.HttpsPorts = ext.GetHttpsPorts()
 		self.HttpPorts = ext.GetHttpPorts()
 		self.Cname = ext.GetCname()
 		self.SourceIps = ext.GetSourceIps()
+		self.UpstreamScheme = ext.GetUpstreamScheme()
+		self.UpstreamPort = ext.GetUpstreamPort()
 		self.AccessHeaders = ext.GetAccessHeaders()
 		return nil
 	})
@@ -474,6 +480,8 @@ func (self *SCloudregion) newFromCloudWafInstance(ctx context.Context, userCred
 	waf.HttpsPorts = ext.GetHttpsPorts()
 	waf.HttpPorts = ext.GetHttpPorts()
 	waf.Cname = ext.GetCname()
+	waf.UpstreamScheme = ext.GetUpstreamScheme()
+	waf.UpstreamPort = ext.GetUpstreamPort()
 	waf.SourceIps = ext.GetSourceIps()
 	waf.AccessHeaders = ext.GetAccessHeaders()
 	var err = func() error {

vendor/modules.txt

@@ -1479,7 +1479,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240521070416-7668541b2a63
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240522122302-b27cdcdc15cb
 ## explicit; go 1.18
 yunion.io/x/cloudmux/pkg/apis
 yunion.io/x/cloudmux/pkg/apis/billing