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

Merge pull request #5634 from yousong/bugfix/yousong-multicloud-proxyfunc

Browse Source 
cloudcommon: proxysetting: make it infra resource
This commit is contained in:
Zexi Li
2020-04-01 10:24:13 +08:00
committed by GitHub
parent a7a18b74e5 b22e77b1f4
commit edd328d4ac
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/cloudcommon/proxy/proxy.go
+8 -2
View File
@@ -25,14 +25,20 @@ const (
)
type ProxySettingCreateInput struct {
apis.VirtualResourceCreateInput
apis.InfrasResourceBaseCreateInput
HttpProxy string
HttpsProxy string
NoProxy string
}
type ProxySettingUpdateInput ProxySettingCreateInput
type ProxySettingUpdateInput struct {
apis.InfrasResourceBaseUpdateInput
HttpProxy string
HttpsProxy string
NoProxy string
}
// String implements ISerializable interface
func (ps *SProxySetting) String() string {
pkg/cloudcommon/db/proxy/proxysetting.go
+21 -6
View File
@@ -33,14 +33,14 @@ import (
)
type SProxySettingManager struct {
db.SStandaloneResourceBaseManager
db.SInfrasResourceBaseManager
}
var ProxySettingManager *SProxySettingManager
func init() {
ProxySettingManager = &SProxySettingManager{
SStandaloneResourceBaseManager: db.NewStandaloneResourceBaseManager(
SInfrasResourceBaseManager: db.NewInfrasResourceBaseManager(
SProxySetting{},
"proxysettings_tbl",
"proxysetting",
@@ -51,7 +51,7 @@ func init() {
}
type SProxySetting struct {
db.SStandaloneResourceBase
db.SInfrasResourceBase
HTTPProxy string `create:"admin_optional" list:"admin" update:"admin"`
HTTPSProxy string `create:"admin_optional" list:"admin" update:"admin"`
@@ -59,14 +59,29 @@ type SProxySetting struct {
}
func (man *SProxySettingManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data proxyapi.ProxySettingCreateInput) (proxyapi.ProxySettingCreateInput, error) {
return data, nil
var err error
data.InfrasResourceBaseCreateInput, err = man.SInfrasResourceBaseManager.ValidateCreateData(
ctx,
userCred,
ownerId,
query,
data.InfrasResourceBaseCreateInput,
)
return data, err
}
func (ps *SProxySetting) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data proxyapi.ProxySettingUpdateInput) (proxyapi.ProxySettingUpdateInput, error) {
if ps.Id == proxyapi.ProxySettingId_DIRECT {
return data, httperrors.NewConflictError("DIRECT setting cannot be changed")
}
return data, nil
var err error
data.InfrasResourceBaseUpdateInput, err = ps.SInfrasResourceBase.ValidateUpdateData(
ctx,
userCred,
query,
data.InfrasResourceBaseUpdateInput,
)
return data, err
}
func (ps *SProxySetting) HttpTransportProxyFunc() httputils.TransportProxyFunc {
@@ -95,7 +110,7 @@ func (ps *SProxySetting) ValidateDeleteCondition(ctx context.Context) error {
ps.Id, n, man.KeywordPlural())
}
}
return nil
return ps.SInfrasResourceBase.ValidateDeleteCondition(ctx)
}
func (man *SProxySettingManager) InitializeData() error {