From aa2d4d7b93682b27bf402fe143b47f5625817fb3 Mon Sep 17 00:00:00 2001 From: ioito Date: Mon, 30 Oct 2023 20:08:16 +0800 Subject: [PATCH] fix(region): vendor update --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../cloudmux/pkg/multicloud/volcengine/region.go | 4 ---- .../pkg/multicloud/volcengine/securitygroup.go | 16 ++++------------ 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 8e69c4ad87..c08fa95a56 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,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.20231030083735-aeadc6cd423e + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231030120656-24cece79dba4 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19 yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 diff --git a/go.sum b/go.sum index 8f12d2aecf..b0625fb4c7 100644 --- a/go.sum +++ b/go.sum @@ -1179,8 +1179,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.20231030083735-aeadc6cd423e h1:xr7pKgdg+nQgye6hcvbtJXALs3gySQ7lq1YpNVkQwYk= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231030083735-aeadc6cd423e/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231030120656-24cece79dba4 h1:XiDw+/SFMA8H5c00pMJLvVSu2062JjZ/SQc5brziq6g= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231030120656-24cece79dba4/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY= 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/vendor/modules.txt b/vendor/modules.txt index 5bc965ada6..80aa79f324 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1438,7 +1438,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.20231030083735-aeadc6cd423e +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231030120656-24cece79dba4 ## 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/multicloud/volcengine/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go index 70788a17d1..4d2300ab4e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go @@ -473,10 +473,6 @@ func (region *SRegion) GetISecurityGroupById(secgroupId string) (cloudprovider.I return region.GetSecurityGroup(secgroupId) } -func (region *SRegion) DeleteISecurityGroupById(secgroupId string) error { - return region.DeleteSecurityGroupById(secgroupId) -} - func (region *SRegion) getSdkCredential(service string, token string) sdk.Credentials { return region.client.getSdkCredential(region.RegionId, service, token) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go index bc4cae6805..c6e703aeff 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go @@ -102,13 +102,6 @@ func (region *SRegion) GetSecurityGroupRules(secGroupId string) ([]SSecurityGrou return ret, nil } -func (region *SRegion) DeleteSecurityGroupById(secGroupId string) error { - params := make(map[string]string) - params["SecurityGroupId"] = secGroupId - _, err := region.vpcRequest("DeleteSecurityGroupId", params) - return err -} - func (self *SSecurityGroup) CreateRule(opts *cloudprovider.SecurityGroupRuleCreateOptions) (cloudprovider.ISecurityGroupRule, error) { err := self.region.CreateSecurityGroupRule(self.SecurityGroupId, opts) if err != nil { @@ -338,17 +331,16 @@ func (secgroup *SSecurityGroup) GetReferences() ([]cloudprovider.SecurityGroupRe return ret, errors.Wrapf(errors.ErrNotImplemented, "GetReferences not supported") } -func (region *SRegion) DeleteSecurityGroup(secGrpId string) error { +func (region *SRegion) DeleteSecurityGroup(id string) error { params := make(map[string]string) - params["SecurityGroupId"] = secGrpId - + params["SecurityGroupId"] = id _, err := region.vpcRequest("DeleteSecurityGroup", params) if err != nil { - return errors.Wrapf(err, "Delete security group fail") + return errors.Wrapf(err, "Delete %s", id) } return nil } func (secgroup *SSecurityGroup) Delete() error { - return secgroup.region.DeleteSecurityGroupById(secgroup.SecurityGroupId) + return secgroup.region.DeleteSecurityGroup(secgroup.SecurityGroupId) }