opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update for waf info sync (#20340)

Browse Source
This commit is contained in:
屈轩
2024-05-22 20:37:50 +08:00
committed by GitHub
parent 78a18320d1
commit f5cf42a511
11 changed files with 120 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+8
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go
Generated Vendored
+2
View File
@@ -1487,6 +1487,8 @@ type ICloudWafInstance interface {
GetHttpsPorts() []int
GetCname() string
GetSourceIps() []string
GetUpstreamScheme() string
GetUpstreamPort() int
Delete() error
}
vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waf.go
Generated Vendored
+3
View File
@@ -37,6 +37,9 @@ var (
WafTypeDefault = TWafType("Default")
WafTypeAppGateway = TWafType("AppGateway")
WafTypeSaaS = TWafType("SaaS")
WafTypeLoadbalancer = TWafType("Loadbalancer")
WafStatementTypeByteMatch = TWafStatementType("ByteMatch")
WafStatementTypeGeoMatch = TWafStatementType("GeoMatch")
WafStatementTypeIPSet = TWafStatementType("IPSet")
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/waf_domain.go
Generated Vendored
+9 -1
View File
@@ -32,7 +32,7 @@ type SWafDomain struct {
insId string
name string
Httptouserip int `json:"HttpToUserIp"`
HttpToUserIp int `json:"HttpToUserIp"`
HttpPort []int `json:"HttpPort"`
IsAccessProduct int `json:"IsAccessProduct"`
Resourcegroupid string `json:"ResourceGroupId"`
@@ -150,6 +150,14 @@ func (self *SWafDomain) GetStatus() string {
return api.WAF_STATUS_AVAILABLE
}
func (self *SWafDomain) GetUpstreamPort() int {
return 0
}
func (self *SWafDomain) GetUpstreamScheme() string {
return ""
}
func (self *SWafDomain) GetWafType() cloudprovider.TWafType {
return cloudprovider.WafTypeDefault
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/waf_v2_domains.go
Generated Vendored
+8
View File
@@ -105,6 +105,14 @@ func (self *SWafDomainV2) GetCname() string {
return self.Cname
}
func (self *SWafDomainV2) GetUpstreamPort() int {
return 0
}
func (self *SWafDomainV2) GetUpstreamScheme() string {
return ""
}
func (self *SWafDomainV2) GetSourceIps() []string {
ret := []string{}
for _, backend := range self.Redirect.Backends {
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/waf.go
Generated Vendored
+8
View File
@@ -84,6 +84,14 @@ func (self *SWebAcl) GetCname() string {
return ""
}
func (self *SWebAcl) GetUpstreamScheme() string {
return ""
}
func (self *SWebAcl) GetUpstreamPort() int {
return 0
}
func (self *SWebAcl) GetSourceIps() []string {
return []string{}
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/waf.go
Generated Vendored
+8
View File
@@ -462,6 +462,14 @@ func (self *SAppGatewayWaf) GetCname() string {
return ""
}
func (self *SAppGatewayWaf) GetUpstreamScheme() string {
return ""
}
func (self *SAppGatewayWaf) GetUpstreamPort() int {
return 0
}
func (self *SAppGatewayWaf) GetSourceIps() []string {
return []string{}
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go
Generated Vendored
+70 -26
View File
@@ -22,6 +22,7 @@ import (
"yunion.io/x/cloudmux/pkg/cloudprovider"
"yunion.io/x/cloudmux/pkg/multicloud"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
)
type SWafInstance struct {
@@ -29,31 +30,33 @@ type SWafInstance struct {
QcloudTags
region *SRegion
AccessStatus string
AlbType string
ApiStatus int
AppId string
BotStatus string
CCList []string
CdcClusters string
CloudType string
ClsStatus string
Cname string
IsCdn *int
CreateTime time.Time
Domain string
DomainId string
Edition string
Engine int
FlowMode int
InstanceId string
InstanceName string
Ipv6Status int
Level int
Mode int
IpHeaders *[]string
Note string
Ports []struct {
AccessStatus string
AlbType string
ApiStatus int
AppId string
BotStatus string
CCList []string
CdcClusters string
CloudType string
ClsStatus string
Cname string
IsCdn *int
CreateTime time.Time
Domain string
DomainId string
Edition string
Engine int
FlowMode int
InstanceId string
InstanceName string
UpstreamScheme *string
HttpsUpstreamPort *int
Ipv6Status int
Level int
Mode int
IpHeaders *[]string
Note string
Ports []struct {
NginxServerId string
Port int
Protocol string
@@ -83,7 +86,14 @@ func (self *SWafInstance) GetId() string {
}
func (self *SWafInstance) GetWafType() cloudprovider.TWafType {
return cloudprovider.WafTypeDefault
switch self.Edition {
case "sparta-waf":
return cloudprovider.WafTypeSaaS
case "clb-waf", "cdc-clb-waf":
return cloudprovider.WafTypeLoadbalancer
default:
return cloudprovider.TWafType(self.Edition)
}
}
func (self *SWafInstance) GetCreatedAt() time.Time {
@@ -182,6 +192,26 @@ func (self *SWafInstance) Delete() error {
return cloudprovider.ErrNotImplemented
}
func (self *SWafInstance) GetUpstreamScheme() string {
if self.UpstreamScheme == nil {
self.Refresh()
}
if self.UpstreamScheme != nil {
return *self.UpstreamScheme
}
return ""
}
func (self *SWafInstance) GetUpstreamPort() int {
if self.HttpsUpstreamPort == nil {
self.Refresh()
}
if self.HttpsUpstreamPort != nil {
return *self.HttpsUpstreamPort
}
return 0
}
func (self *SRegion) GetWafInstances() ([]SWafInstance, error) {
params := map[string]string{
"Limit": "1000",
@@ -222,6 +252,20 @@ func (self *SRegion) GetICloudWafInstances() ([]cloudprovider.ICloudWafInstance,
return ret, nil
}
func (self *SRegion) GetICloudWafInstanceById(id string) (cloudprovider.ICloudWafInstance, error) {
wafs, err := self.GetWafInstances()
if err != nil {
return nil, err
}
for i := range wafs {
wafs[i].region = self
if wafs[i].GetGlobalId() == id {
return &wafs[i], nil
}
}
return nil, errors.Wrapf(cloudprovider.ErrNotFound, id)
}
func (self *SRegion) GetWafInstance(domain, domainId, instanceId string) (*SWafInstance, error) {
params := map[string]string{
"Domain": domain,