From e27dbf1266d4e68bc78fd372ac8afb34d942d578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 1 Apr 2024 11:39:28 +0800 Subject: [PATCH] fix(cloudid): vendor update (#19847) --- go.mod | 2 +- go.sum | 4 +- pkg/cloudid/models/cloudaccount.go | 14 +--- pkg/cloudid/models/cloudprovider.go | 8 +- vendor/modules.txt | 2 +- .../pkg/cloudprovider/cloudprovider.go | 79 ------------------- .../multicloud/aliyun/provider/provider.go | 12 --- .../pkg/multicloud/aws/provider/provider.go | 12 --- .../x/cloudmux/pkg/multicloud/azure/azure.go | 1 - .../pkg/multicloud/azure/provider/provider.go | 8 -- .../multicloud/google/provider/provider.go | 24 ------ .../x/cloudmux/pkg/multicloud/hcso/huawei.go | 1 - .../pkg/multicloud/hcso/provider/provider.go | 12 --- .../multicloud/huawei/provider/provider.go | 12 --- .../multicloud/qcloud/provider/provider.go | 8 -- 15 files changed, 10 insertions(+), 189 deletions(-) diff --git a/go.mod b/go.mod index 3670e19bd6..e6b8b2e923 100644 --- a/go.mod +++ b/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.20240329124141-d15a857c94a0 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240401032225-9a152ed52202 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 diff --git a/go.sum b/go.sum index 00299a0dfe..a028b5dd64 100644 --- a/go.sum +++ b/go.sum @@ -1204,8 +1204,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.20240329124141-d15a857c94a0 h1:Hjjtyn6teI4BXBfzt6vAzLOBmpohAIyhUa0w3eRsX5c= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240329124141-d15a857c94a0/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240401032225-9a152ed52202 h1:nufuDeVPNxkYT8IbVbkwSb4SbGYxWV1w1DhrhR7++tE= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240401032225-9a152ed52202/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= 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= diff --git a/pkg/cloudid/models/cloudaccount.go b/pkg/cloudid/models/cloudaccount.go index 18a60c6511..08e7c0566b 100644 --- a/pkg/cloudid/models/cloudaccount.go +++ b/pkg/cloudid/models/cloudaccount.go @@ -194,20 +194,10 @@ func (self *SCloudaccount) GetCloudgroups(managerId string) ([]SCloudgroup, erro return groups, nil } -func (manager *SCloudaccountManager) GetSupportCloudIdAccounts() ([]SCloudaccount, error) { - accounts := []SCloudaccount{} - q := manager.Query().In("provider", cloudprovider.GetSupportCloudIdProvider()) - err := db.FetchModelObjects(manager, q, &accounts) - if err != nil { - return nil, errors.Wrapf(err, "db.FetchModelObjects") - } - return accounts, nil -} - func (manager *SCloudaccountManager) SyncCloudaccountResources(ctx context.Context, userCred mcclient.TokenCredential, isStart bool) { - accounts, err := manager.GetSupportCloudIdAccounts() + accounts, err := manager.GetCloudaccounts() if err != nil { - log.Errorf("GetSupportCloudIdAccounts error: %v", err) + log.Errorf("GetCloudaccounts error: %v", err) return } for i := range accounts { diff --git a/pkg/cloudid/models/cloudprovider.go b/pkg/cloudid/models/cloudprovider.go index ed8bc9d75a..0b87211ed4 100644 --- a/pkg/cloudid/models/cloudprovider.go +++ b/pkg/cloudid/models/cloudprovider.go @@ -132,9 +132,9 @@ func (self *SCloudprovider) StartCloudproviderSyncResourcesTask(ctx context.Cont return task.ScheduleRun(nil) } -func (manager *SCloudproviderManager) GetSupportCloudIdProviders() ([]SCloudprovider, error) { +func (manager *SCloudproviderManager) GetCloudproviders() ([]SCloudprovider, error) { ret := []SCloudprovider{} - q := manager.Query().In("provider", cloudprovider.GetSupportCloudIdProvider()) + q := manager.Query() err := db.FetchModelObjects(manager, q, &ret) if err != nil { return nil, errors.Wrapf(err, "db.FetchModelObjects") @@ -143,9 +143,9 @@ func (manager *SCloudproviderManager) GetSupportCloudIdProviders() ([]SCloudprov } func (manager *SCloudproviderManager) SyncCloudproviderResources(ctx context.Context, userCred mcclient.TokenCredential, isStart bool) { - managers, err := manager.GetSupportCloudIdProviders() + managers, err := manager.GetCloudproviders() if err != nil { - log.Errorf("GetSupportCloudIdAccounts error: %v", err) + log.Errorf("GetCloudproviders error: %v", err) return } for i := range managers { diff --git a/vendor/modules.txt b/vendor/modules.txt index e64998a882..7637d30daf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1472,7 +1472,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.20240329124141-d15a857c94a0 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240401032225-9a152ed52202 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/cloudprovider.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/cloudprovider.go index 4fd9cec5bd..c977c47693 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/cloudprovider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/cloudprovider.go @@ -218,18 +218,6 @@ type ICloudProviderFactory interface { IsNeedForceAutoCreateProject() bool - IsCloudpolicyWithSubscription() bool // 自定义权限属于订阅级别资源 - IsClouduserpolicyWithSubscription() bool // 绑定用户权限需要指定订阅 - - IsSupportCloudIdService() bool - IsSupportClouduserPolicy() bool - IsSupportResetClouduserPassword() bool - GetClouduserMinPolicyCount() int - IsClouduserNeedInitPolicy() bool - IsSupportCreateCloudgroup() bool - - IsSystemCloudpolicyUnified() bool // 国内国外权限是否一致 - IsSupportCrossCloudEnvVpcPeering() bool IsSupportCrossRegionVpcPeering() bool IsSupportVpcPeeringVpcCidrOverlap() bool @@ -672,16 +660,6 @@ func GetPrivateProviders() []string { return providers } -func GetSupportCloudgroupProviders() []string { - providers := []string{} - for p, d := range providerTable { - if d.IsSupportCreateCloudgroup() { - providers = append(providers, p) - } - } - return providers -} - func GetOnPremiseProviders() []string { providers := make([]string, 0) for p, d := range providerTable { @@ -692,26 +670,6 @@ func GetOnPremiseProviders() []string { return providers } -func GetSupportCloudIdProvider() []string { - providers := []string{} - for p, d := range providerTable { - if d.IsSupportCloudIdService() { - providers = append(providers, p) - } - } - return providers -} - -func GetClouduserpolicyWithSubscriptionProviders() []string { - providers := []string{} - for p, d := range providerTable { - if d.IsClouduserpolicyWithSubscription() { - providers = append(providers, p) - } - } - return providers -} - func GetProviderCloudEnv(provider string) string { p, err := GetProviderFactory(provider) if err != nil { @@ -769,43 +727,6 @@ func (factory *baseProviderFactory) IsNeedForceAutoCreateProject() bool { return false } -func (factory *baseProviderFactory) IsCloudpolicyWithSubscription() bool { - return false -} - -func (factory *baseProviderFactory) IsClouduserpolicyWithSubscription() bool { - return false -} - -func (factory *baseProviderFactory) IsSupportCloudIdService() bool { - return false -} - -func (factory *baseProviderFactory) IsSupportClouduserPolicy() bool { - return true -} - -func (factory *baseProviderFactory) IsSupportResetClouduserPassword() bool { - return true -} - -func (factory *baseProviderFactory) IsClouduserNeedInitPolicy() bool { - return false -} - -func (factory *baseProviderFactory) GetClouduserMinPolicyCount() int { - // unlimited - return -1 -} - -func (factory *baseProviderFactory) IsSupportCreateCloudgroup() bool { - return false -} - -func (factory *baseProviderFactory) IsSystemCloudpolicyUnified() bool { - return true -} - func (factory *baseProviderFactory) IsSupportCrossCloudEnvVpcPeering() bool { return false } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/provider/provider.go index 9426789ef4..ab0dd715aa 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/provider/provider.go @@ -43,18 +43,6 @@ func (self *SAliyunProviderFactory) IsCloudeventRegional() bool { return true } -func (self *SAliyunProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (self *SAliyunProviderFactory) IsSupportCreateCloudgroup() bool { - return true -} - -func (factory *SAliyunProviderFactory) IsSystemCloudpolicyUnified() bool { - return false -} - func (factory *SAliyunProviderFactory) IsSupportSAMLAuth() bool { return true } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go index 711bae674c..cceb3fb7d0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go @@ -54,18 +54,6 @@ func (self *SAwsProviderFactory) IsSupportPrepaidResources() bool { return false } -func (self *SAwsProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (self *SAwsProviderFactory) IsSupportCreateCloudgroup() bool { - return true -} - -func (factory *SAwsProviderFactory) IsSystemCloudpolicyUnified() bool { - return false -} - func (factory *SAwsProviderFactory) IsSupportSAMLAuth() bool { return true } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go index 60a94a8791..f41e1b0f2f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go @@ -1004,7 +1004,6 @@ func (self *SAzureClient) GetCapabilities() []string { cloudprovider.CLOUD_CAPABILITY_CACHE + cloudprovider.READ_ONLY_SUFFIX, cloudprovider.CLOUD_CAPABILITY_EVENT, cloudprovider.CLOUD_CAPABILITY_CLOUDID, - cloudprovider.CLOUD_CAPABILITY_SAML_AUTH, cloudprovider.CLOUD_CAPABILITY_WAF, cloudprovider.CLOUD_CAPABILITY_QUOTA + cloudprovider.READ_ONLY_SUFFIX, cloudprovider.CLOUD_CAPABILITY_CACHE + cloudprovider.READ_ONLY_SUFFIX, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/provider/provider.go index 5712d6add4..6086fff306 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/provider/provider.go @@ -64,14 +64,6 @@ func (self *SAzureProviderFactory) IsSupportPrepaidResources() bool { return false } -func (self *SAzureProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (self *SAzureProviderFactory) IsSupportCreateCloudgroup() bool { - return true -} - func (self *SAzureProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, input cloudprovider.SCloudaccountCredential) (cloudprovider.SCloudaccount, error) { output := cloudprovider.SCloudaccount{} if len(input.DirectoryId) == 0 { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/provider/provider.go index 26df18ddd6..1d49eb0813 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/provider/provider.go @@ -51,30 +51,6 @@ func (self *SGoogleProviderFactory) IsClouduserSupportPassword() bool { return false } -func (factory *SGoogleProviderFactory) IsCloudpolicyWithSubscription() bool { - return true -} - -func (factory *SGoogleProviderFactory) IsClouduserpolicyWithSubscription() bool { - return true -} - -func (factory *SGoogleProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (factory *SGoogleProviderFactory) IsClouduserNeedInitPolicy() bool { - return true -} - -func (factory *SGoogleProviderFactory) IsSupportResetClouduserPassword() bool { - return false -} - -func (factory *SGoogleProviderFactory) GetClouduserMinPolicyCount() int { - return 1 -} - func (self *SGoogleProviderFactory) IsClouduserBelongCloudprovider() bool { return true } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go index c7c4cfcc96..382019e4b0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/huawei.go @@ -505,7 +505,6 @@ func (self *SHuaweiClient) GetCapabilities() []string { cloudprovider.CLOUD_CAPABILITY_CACHE, cloudprovider.CLOUD_CAPABILITY_EVENT, cloudprovider.CLOUD_CAPABILITY_CLOUDID, - cloudprovider.CLOUD_CAPABILITY_SAML_AUTH, cloudprovider.CLOUD_CAPABILITY_NAT, cloudprovider.CLOUD_CAPABILITY_NAS, cloudprovider.CLOUD_CAPABILITY_MODELARTES, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/provider/provider.go index f3a6166695..92f13e0ce1 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/provider/provider.go @@ -50,18 +50,6 @@ func (self *SHCSOProviderFactory) GetMaxCloudEventKeepDays() int { return 7 } -func (self *SHCSOProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (self *SHCSOProviderFactory) IsSupportClouduserPolicy() bool { - return false -} - -func (self *SHCSOProviderFactory) IsSupportCreateCloudgroup() bool { - return true -} - func (factory *SHCSOProviderFactory) IsSupportCrossCloudEnvVpcPeering() bool { return false } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/provider/provider.go index 592d636555..4016467731 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/provider/provider.go @@ -49,18 +49,6 @@ func (self *SHuaweiProviderFactory) GetMaxCloudEventKeepDays() int { return 7 } -func (self *SHuaweiProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (self *SHuaweiProviderFactory) IsSupportClouduserPolicy() bool { - return false -} - -func (self *SHuaweiProviderFactory) IsSupportCreateCloudgroup() bool { - return true -} - func (factory *SHuaweiProviderFactory) IsSupportCrossCloudEnvVpcPeering() bool { return false } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/provider/provider.go index fe9c7553f4..eef094d493 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/provider/provider.go @@ -52,14 +52,6 @@ func (self *SQcloudProviderFactory) GetMaxCloudEventKeepDays() int { return 30 } -func (self *SQcloudProviderFactory) IsSupportCloudIdService() bool { - return true -} - -func (self *SQcloudProviderFactory) IsSupportCreateCloudgroup() bool { - return true -} - func (self *SQcloudProviderFactory) IsSupportSAMLAuth() bool { return true }