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

fix(region): vendor update

Browse Source
This commit is contained in:
ioito
2023-10-30 20:08:16 +08:00
parent ab366a5f04
commit aa2d4d7b93
5 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -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
go.sum
+2 -2
View File
@@ -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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -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
vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go
Generated Vendored
-4
View File
@@ -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)
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go
Generated Vendored
+4 -12
View File
@@ -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)
}