Merge pull request #1363 from ioito/hotfix/qx-code-fmt

fix: fmt code

Author: ioito

pkg/cloudprovider/cdn.go

@@ -68,12 +68,12 @@ type CdnCreateOptions struct {
 // +onecloud:model-api-gen
 type SCdnOrigins []SCdnOrigin
 
-func (self SCdnOrigins) IsZero() bool {
-	return len(self) == 0
+func (origins SCdnOrigins) IsZero() bool {
+	return len(origins) == 0
 }
 
-func (self SCdnOrigins) String() string {
-	return jsonutils.Marshal(self).String()
+func (origins SCdnOrigins) String() string {
+	return jsonutils.Marshal(origins).String()
 }
 
 // 是否忽略参数
@@ -102,12 +102,12 @@ type CacheKeyRuleQueryString struct {
 	Value   string
 }
 
-func (self SCDNCacheKeys) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNCacheKeys{})
+func (keys SCDNCacheKeys) IsZero() bool {
+	return jsonutils.Marshal(keys) == jsonutils.Marshal(&SCDNCacheKeys{})
 }
 
-func (self SCDNCacheKeys) String() string {
-	return jsonutils.Marshal(self).String()
+func (keys SCDNCacheKeys) String() string {
+	return jsonutils.Marshal(keys).String()
 }
 
 // 是否分片回源
@@ -123,12 +123,12 @@ type SRangeOriginPullRule struct {
 	RulePaths []string
 }
 
-func (self SCDNRangeOriginPull) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNRangeOriginPull{})
+func (pull SCDNRangeOriginPull) IsZero() bool {
+	return jsonutils.Marshal(pull) == jsonutils.Marshal(&SCDNRangeOriginPull{})
 }
 
-func (self SCDNRangeOriginPull) String() string {
-	return jsonutils.Marshal(self).String()
+func (pull SCDNRangeOriginPull) String() string {
+	return jsonutils.Marshal(pull).String()
 }
 
 type CacheRule struct {
@@ -181,12 +181,12 @@ type RuleCacheConfig struct {
 	}
 }
 
-func (self SCDNCache) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNCache{})
+func (cache SCDNCache) IsZero() bool {
+	return jsonutils.Marshal(cache) == jsonutils.Marshal(&SCDNCache{})
 }
 
-func (self SCDNCache) String() string {
-	return jsonutils.Marshal(self).String()
+func (cache SCDNCache) String() string {
+	return jsonutils.Marshal(cache).String()
 }
 
 // +onecloud:model-api-gen
@@ -197,12 +197,12 @@ type SCDNHttps struct {
 	Http2 *bool
 }
 
-func (self SCDNHttps) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNHttps{})
+func (https SCDNHttps) IsZero() bool {
+	return jsonutils.Marshal(https) == jsonutils.Marshal(&SCDNHttps{})
 }
 
-func (self SCDNHttps) String() string {
-	return jsonutils.Marshal(self).String()
+func (https SCDNHttps) String() string {
+	return jsonutils.Marshal(https).String()
 }
 
 // +onecloud:model-api-gen
@@ -214,12 +214,12 @@ type SCDNForceRedirect struct {
 	RedirectType string
 }
 
-func (self SCDNForceRedirect) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNForceRedirect{})
+func (redirect SCDNForceRedirect) IsZero() bool {
+	return jsonutils.Marshal(redirect) == jsonutils.Marshal(&SCDNForceRedirect{})
 }
 
-func (self SCDNForceRedirect) String() string {
-	return jsonutils.Marshal(self).String()
+func (redirect SCDNForceRedirect) String() string {
+	return jsonutils.Marshal(redirect).String()
 }
 
 type RefererRule struct {
@@ -243,12 +243,12 @@ type SCDNReferer struct {
 	RefererRules []RefererRule
 }
 
-func (self SCDNReferer) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNReferer{})
+func (referer SCDNReferer) IsZero() bool {
+	return jsonutils.Marshal(referer) == jsonutils.Marshal(&SCDNReferer{})
 }
 
-func (self SCDNReferer) String() string {
-	return jsonutils.Marshal(self).String()
+func (referer SCDNReferer) String() string {
+	return jsonutils.Marshal(referer).String()
 }
 
 type SMaxAgeRule struct {
@@ -265,12 +265,12 @@ type SCDNMaxAge struct {
 	MaxAgeRules []SMaxAgeRule
 }
 
-func (self SCDNMaxAge) IsZero() bool {
-	return jsonutils.Marshal(self) == jsonutils.Marshal(&SCDNMaxAge{})
+func (maxAge SCDNMaxAge) IsZero() bool {
+	return jsonutils.Marshal(maxAge) == jsonutils.Marshal(&SCDNMaxAge{})
 }
 
-func (self SCDNMaxAge) String() string {
-	return jsonutils.Marshal(self).String()
+func (maxAge SCDNMaxAge) String() string {
+	return jsonutils.Marshal(maxAge).String()
 }
 
 type CacheClearOptions struct {

pkg/cloudprovider/cloudprovider.go

@@ -427,7 +427,7 @@ func GetProviderFactory(provider string) (ICloudProviderFactory, error) {
 	if ok {
 		return factory, nil
 	}
-	return nil, fmt.Errorf("No such provider %s", provider)
+	return nil, fmt.Errorf("no such provider %s", provider)
 }
 
 func GetRegistedProviderIds() []string {
@@ -475,183 +475,183 @@ type SBaseProvider struct {
 	factory ICloudProviderFactory
 }
 
-func (provider *SBaseProvider) GetFactory() ICloudProviderFactory {
-	return provider.factory
+func (base *SBaseProvider) GetFactory() ICloudProviderFactory {
+	return base.factory
 }
 
-func (self *SBaseProvider) GetOnPremiseIRegion() (ICloudRegion, error) {
+func (base *SBaseProvider) GetOnPremiseIRegion() (ICloudRegion, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetIamLoginUrl() string {
+func (base *SBaseProvider) GetIamLoginUrl() string {
 	return ""
 }
 
-func (self *SBaseProvider) IsClouduserSupportPassword() bool {
+func (base *SBaseProvider) IsClouduserSupportPassword() bool {
 	return true
 }
 
-func (self *SBaseProvider) GetICloudusers() ([]IClouduser, error) {
+func (base *SBaseProvider) GetICloudusers() ([]IClouduser, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudgroups() ([]ICloudgroup, error) {
+func (base *SBaseProvider) GetICloudgroups() ([]ICloudgroup, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudgroupByName(name string) (ICloudgroup, error) {
+func (base *SBaseProvider) GetICloudgroupByName(name string) (ICloudgroup, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) CreateICloudgroup(name, desc string) (ICloudgroup, error) {
+func (base *SBaseProvider) CreateICloudgroup(name, desc string) (ICloudgroup, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudpolicies() ([]ICloudpolicy, error) {
+func (base *SBaseProvider) GetICloudpolicies() ([]ICloudpolicy, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetIClouduserByName(name string) (IClouduser, error) {
+func (base *SBaseProvider) GetIClouduserByName(name string) (IClouduser, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) CreateIClouduser(conf *SClouduserCreateConfig) (IClouduser, error) {
+func (base *SBaseProvider) CreateIClouduser(conf *SClouduserCreateConfig) (IClouduser, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudSAMLProviders() ([]ICloudSAMLProvider, error) {
+func (base *SBaseProvider) GetICloudSAMLProviders() ([]ICloudSAMLProvider, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudSAMLProviders")
 }
 
-func (self *SBaseProvider) GetICloudroles() ([]ICloudrole, error) {
+func (base *SBaseProvider) GetICloudroles() ([]ICloudrole, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudroles")
 }
 
-func (self *SBaseProvider) GetICloudroleById(id string) (ICloudrole, error) {
+func (base *SBaseProvider) GetICloudroleById(id string) (ICloudrole, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudroleById")
 }
 
-func (self *SBaseProvider) GetICloudroleByName(name string) (ICloudrole, error) {
+func (base *SBaseProvider) GetICloudroleByName(name string) (ICloudrole, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudroleByName")
 }
 
-func (self *SBaseProvider) CreateICloudrole(opts *SRoleCreateOptions) (ICloudrole, error) {
+func (base *SBaseProvider) CreateICloudrole(opts *SRoleCreateOptions) (ICloudrole, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "CreateICloudrole")
 }
 
-func (self *SBaseProvider) CreateICloudSAMLProvider(opts *SAMLProviderCreateOptions) (ICloudSAMLProvider, error) {
+func (base *SBaseProvider) CreateICloudSAMLProvider(opts *SAMLProviderCreateOptions) (ICloudSAMLProvider, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "CreateICloudSAMLProvider")
 }
 
-func (self *SBaseProvider) CreateICloudpolicy(opts *SCloudpolicyCreateOptions) (ICloudpolicy, error) {
+func (base *SBaseProvider) CreateICloudpolicy(opts *SCloudpolicyCreateOptions) (ICloudpolicy, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetEnrollmentAccounts() ([]SEnrollmentAccount, error) {
+func (base *SBaseProvider) GetEnrollmentAccounts() ([]SEnrollmentAccount, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) CreateSubscription(SubscriptionCreateInput) error {
+func (base *SBaseProvider) CreateSubscription(SubscriptionCreateInput) error {
 	return ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudDnsZones() ([]ICloudDnsZone, error) {
+func (base *SBaseProvider) GetICloudDnsZones() ([]ICloudDnsZone, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudDnsZoneById(id string) (ICloudDnsZone, error) {
+func (base *SBaseProvider) GetICloudDnsZoneById(id string) (ICloudDnsZone, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) CreateICloudDnsZone(opts *SDnsZoneCreateOptions) (ICloudDnsZone, error) {
+func (base *SBaseProvider) CreateICloudDnsZone(opts *SDnsZoneCreateOptions) (ICloudDnsZone, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetCloudRegionExternalIdPrefix() string {
-	return self.factory.GetId()
+func (base *SBaseProvider) GetCloudRegionExternalIdPrefix() string {
+	return base.factory.GetId()
 }
 
-func (self *SBaseProvider) CreateIProject(name string) (ICloudProject, error) {
+func (base *SBaseProvider) CreateIProject(name string) (ICloudProject, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetSamlEntityId() string {
+func (base *SBaseProvider) GetSamlEntityId() string {
 	return ""
 }
 
-func (self *SBaseProvider) GetSamlSpInitiatedLoginUrl(idpName string) string {
+func (base *SBaseProvider) GetSamlSpInitiatedLoginUrl(idpName string) string {
 	return ""
 }
 
-func (self *SBaseProvider) GetICloudInterVpcNetworks() ([]ICloudInterVpcNetwork, error) {
+func (base *SBaseProvider) GetICloudInterVpcNetworks() ([]ICloudInterVpcNetwork, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudInterVpcNetworkById(id string) (ICloudInterVpcNetwork, error) {
+func (base *SBaseProvider) GetICloudInterVpcNetworkById(id string) (ICloudInterVpcNetwork, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) CreateICloudInterVpcNetwork(opts *SInterVpcNetworkCreateOptions) (ICloudInterVpcNetwork, error) {
+func (base *SBaseProvider) CreateICloudInterVpcNetwork(opts *SInterVpcNetworkCreateOptions) (ICloudInterVpcNetwork, error) {
 	return nil, ErrNotImplemented
 }
 
-func (self *SBaseProvider) GetICloudGlobalVpcs() ([]ICloudGlobalVpc, error) {
+func (base *SBaseProvider) GetICloudGlobalVpcs() ([]ICloudGlobalVpc, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudGlobalVpcs")
 }
 
-func (self *SBaseProvider) GetICloudGlobalVpcById(id string) (ICloudGlobalVpc, error) {
+func (base *SBaseProvider) GetICloudGlobalVpcById(id string) (ICloudGlobalVpc, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudGlobalVpcById")
 }
 
-func (self *SBaseProvider) CreateICloudGlobalVpc(opts *GlobalVpcCreateOptions) (ICloudGlobalVpc, error) {
+func (base *SBaseProvider) CreateICloudGlobalVpc(opts *GlobalVpcCreateOptions) (ICloudGlobalVpc, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "CreateICloudGlobalVpc")
 }
 
-func (self *SBaseProvider) GetICloudCDNDomains() ([]ICloudCDNDomain, error) {
+func (base *SBaseProvider) GetICloudCDNDomains() ([]ICloudCDNDomain, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudCDNDomains")
 }
 
-func (self *SBaseProvider) GetICloudCDNDomainByName(name string) (ICloudCDNDomain, error) {
+func (base *SBaseProvider) GetICloudCDNDomainByName(name string) (ICloudCDNDomain, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetICloudCDNDomainByName")
 }
 
-func (self *SBaseProvider) CreateICloudCDNDomain(opts *CdnCreateOptions) (ICloudCDNDomain, error) {
+func (base *SBaseProvider) CreateICloudCDNDomain(opts *CdnCreateOptions) (ICloudCDNDomain, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "CreateICloudCDNDomain")
 }
 
-func (self *SBaseProvider) GetMetrics(opts *MetricListOptions) ([]MetricValues, error) {
+func (base *SBaseProvider) GetMetrics(opts *MetricListOptions) ([]MetricValues, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetMetric")
 }
 
-func (self *SBaseProvider) GetIModelartsPools() ([]ICloudModelartsPool, error) {
+func (base *SBaseProvider) GetIModelartsPools() ([]ICloudModelartsPool, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetIModelartsPools")
 }
 
-func (self *SBaseProvider) GetIModelartsPoolById(id string) (ICloudModelartsPool, error) {
+func (base *SBaseProvider) GetIModelartsPoolById(id string) (ICloudModelartsPool, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetIModelartsPoolDetail")
 }
 
-func (self *SBaseProvider) CreateIModelartsPool(pool *ModelartsPoolCreateOption, callback func(id string)) (ICloudModelartsPool, error) {
+func (base *SBaseProvider) CreateIModelartsPool(pool *ModelartsPoolCreateOption, callback func(id string)) (ICloudModelartsPool, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "CreateIModelartsPool")
 }
 
-func (self *SBaseProvider) GetIModelartsPoolSku() ([]ICloudModelartsPoolSku, error) {
+func (base *SBaseProvider) GetIModelartsPoolSku() ([]ICloudModelartsPoolSku, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetIModelartsPoolSku")
 }
 
-func (self *SBaseProvider) GetISSLCertificates() ([]ICloudSSLCertificate, error) {
+func (base *SBaseProvider) GetISSLCertificates() ([]ICloudSSLCertificate, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetISSLCertificates")
 }
 
-func (self *SBaseProvider) GetIAiGateways() ([]IAiGateway, error) {
+func (base *SBaseProvider) GetIAiGateways() ([]IAiGateway, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetIAiGateways")
 }
 
-func (self *SBaseProvider) GetIAiGatewayById(id string) (IAiGateway, error) {
+func (base *SBaseProvider) GetIAiGatewayById(id string) (IAiGateway, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetIAiGateways")
 }
 
-func (self *SBaseProvider) CreateIAiGateway(opts *AiGatewayCreateOptions) (IAiGateway, error) {
+func (base *SBaseProvider) CreateIAiGateway(opts *AiGatewayCreateOptions) (IAiGateway, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "CreateIAiGateway")
 }
 

pkg/cloudprovider/disk.go

@@ -21,4 +21,6 @@ type DiskCreateConfig struct {
 	Iops       int
 	Throughput int
 	ProjectId  string
+
+	Tags map[string]string
 }