From df00cdbd04d80f3a6bc1e4feffb5416934f189be Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 13 Apr 2020 13:00:11 +0800 Subject: [PATCH] update vendor --- cmd/climc/shell/proxysettings.go | 20 -------------------- pkg/apis/cloudcommon/proxy/proxy.go | 5 +---- pkg/cloudcommon/db/proxy/proxysetting.go | 6 +++--- pkg/compute/models/cloudaccounts.go | 6 +++--- pkg/mcclient/options/cloudaccounts.go | 4 ++-- pkg/mcclient/options/proxysettings.go | 10 ---------- 6 files changed, 9 insertions(+), 42 deletions(-) diff --git a/cmd/climc/shell/proxysettings.go b/cmd/climc/shell/proxysettings.go index 88c6cf25f5..dbee6aefc3 100644 --- a/cmd/climc/shell/proxysettings.go +++ b/cmd/climc/shell/proxysettings.go @@ -15,8 +15,6 @@ package shell import ( - "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/mcclient/options" @@ -80,22 +78,4 @@ func init() { printObject(proxysetting) return nil }) - R(&options.ProxySettingPublicOptions{}, "proxysetting-public", "Make proxysetting public", func(s *mcclient.ClientSession, opts *options.ProxySettingPublicOptions) error { - params := jsonutils.Marshal(opts) - result, err := modules.ProxySettings.PerformAction(s, opts.ID, "public", params) - if err != nil { - return err - } - printObject(result) - return nil - }) - R(&options.ProxySettingPrivateOptions{}, "proxysetting-private", "Make proxysetting private", func(s *mcclient.ClientSession, opts *options.ProxySettingPrivateOptions) error { - params := jsonutils.Marshal(opts) - result, err := modules.ProxySettings.PerformAction(s, opts.ID, "private", params) - if err != nil { - return err - } - printObject(result) - return nil - }) } diff --git a/pkg/apis/cloudcommon/proxy/proxy.go b/pkg/apis/cloudcommon/proxy/proxy.go index c29875d7a4..e26844bfcc 100644 --- a/pkg/apis/cloudcommon/proxy/proxy.go +++ b/pkg/apis/cloudcommon/proxy/proxy.go @@ -42,10 +42,7 @@ func (ps *SProxySetting) IsZero() bool { type ProxySettingResourceInput struct { // 代理配置 - ProxySetting string `json:"proxy_setting"` - // Deprecated - // swagger:ignore - ProxySettingId string `json:"proxy_setting_id" deprecated-by:"proxy_setting"` + ProxySettingId string `json:"proxy_setting_id"` } type ProxySettingTestInput struct { diff --git a/pkg/cloudcommon/db/proxy/proxysetting.go b/pkg/cloudcommon/db/proxy/proxysetting.go index 632ee4cfda..d33a7f2476 100644 --- a/pkg/cloudcommon/db/proxy/proxysetting.go +++ b/pkg/cloudcommon/db/proxy/proxysetting.go @@ -206,14 +206,14 @@ func RegisterReferrer(man db.IModelManager) { } func ValidateProxySettingResourceInput(userCred mcclient.TokenCredential, input proxyapi.ProxySettingResourceInput) (*SProxySetting, proxyapi.ProxySettingResourceInput, error) { - m, err := ProxySettingManager.FetchByIdOrName(userCred, input.ProxySetting) + m, err := ProxySettingManager.FetchByIdOrName(userCred, input.ProxySettingId) if err != nil { if errors.Cause(err) == sql.ErrNoRows { - return nil, input, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", ProxySettingManager.Keyword(), input.ProxySetting) + return nil, input, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", ProxySettingManager.Keyword(), input.ProxySettingId) } else { return nil, input, errors.Wrapf(err, "ProxySettingManager.FetchByIdOrName") } } - input.ProxySetting = m.GetId() + input.ProxySettingId = m.GetId() return m.(*SProxySetting), input, nil } diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 44c6b44af8..e0e177e95b 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -401,13 +401,13 @@ func (manager *SCloudaccountManager) ValidateCreateData(ctx context.Context, use var proxyFunc httputils.TransportProxyFunc { - if input.ProxySetting == "" { - input.ProxySetting = proxyapi.ProxySettingId_DIRECT + if input.ProxySettingId == "" { + input.ProxySettingId = proxyapi.ProxySettingId_DIRECT } var proxySetting *proxy.SProxySetting proxySetting, input.ProxySettingResourceInput, err = proxy.ValidateProxySettingResourceInput(userCred, input.ProxySettingResourceInput) if err != nil { - return input, httperrors.NewInputParameterError("fetch proxysetting %s: %s", input.ProxySetting, err) + return input, httperrors.NewInputParameterError("ValidateProxySettingResourceInput %s", err) } proxyFunc = proxySetting.HttpTransportProxyFunc() } diff --git a/pkg/mcclient/options/cloudaccounts.go b/pkg/mcclient/options/cloudaccounts.go index 32106a2a53..10e00ff056 100644 --- a/pkg/mcclient/options/cloudaccounts.go +++ b/pkg/mcclient/options/cloudaccounts.go @@ -84,7 +84,7 @@ type SCloudAccountCreateBaseOptions struct { ProjectDomain string `help:"domain for this account"` - ProxySetting string `help:"proxy setting id or name" json:"proxy_setting"` + ProxySettingId string `help:"proxy setting id or name" json:"proxy_setting_id"` } type SVMwareCloudAccountCreateOptions struct { @@ -231,7 +231,7 @@ type SCloudAccountUpdateBaseOptions struct { SyncIntervalSeconds int `help:"auto synchornize interval in seconds"` AutoCreateProject *bool `help:"automatically create local project for new remote project"` - ProxySetting string `help:"proxy setting name or id" json:"proxy_setting"` + ProxySettingId string `help:"proxy setting name or id" json:"proxy_setting_id"` Desc string `help:"Description" json:"description" token:"desc"` } diff --git a/pkg/mcclient/options/proxysettings.go b/pkg/mcclient/options/proxysettings.go index aff1019ada..22a98ac920 100644 --- a/pkg/mcclient/options/proxysettings.go +++ b/pkg/mcclient/options/proxysettings.go @@ -46,13 +46,3 @@ type ProxySettingTestOptions struct { type ProxySettingListOptions struct { BaseListOptions } - -type ProxySettingPublicOptions struct { - ProxySettingGetOptions - Scope string `json:"scope" help:"share scope" choices:"domain|system"` - SharedDomain []string `json:"share"` -} - -type ProxySettingPrivateOptions struct { - ProxySettingGetOptions -}