From e8f3e390bac115dc0fa9d4d7bf2f39e2205bb31e Mon Sep 17 00:00:00 2001 From: ioito Date: Mon, 15 Jan 2024 19:10:38 +0800 Subject: [PATCH] fix(region): vendor update for aliyun security group rule create --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../x/cloudmux/pkg/multicloud/aliyun/securitygroup.go | 2 +- .../yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go | 6 ++++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 84b8243e50..c713509f4e 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.20240112111333-5c48e40fddb1 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f 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 63a883eb34..f5302fd0fa 100644 --- a/go.sum +++ b/go.sum @@ -1201,8 +1201,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.20240112111333-5c48e40fddb1 h1:Fo8fYTq1ppvTv7CFv63Bu0mxtwbeNESP8NxmAG6D+l8= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240112111333-5c48e40fddb1/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f h1:8o0QBLcujkaQMG0zMdkj2r177DW/i4YDsWVAE7tI1tE= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= 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 1e4e2466dd..dab961fdad 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1465,7 +1465,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.20240112111333-5c48e40fddb1 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f ## 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/aliyun/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go index 1961117ef8..a33edd81f8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go @@ -354,7 +354,7 @@ func (self *SSecurityGroup) CreateRule(opts *cloudprovider.SecurityGroupRuleCrea } for i := range rules { rule := rules[i] - if utils.IsInStringArray(rule.SecurityGroupRuleId, ruleIds) { + if !utils.IsInStringArray(rule.SecurityGroupRuleId, ruleIds) { rule.region = self.region return &rule, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go index 5cd636f5ef..1227735b76 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go @@ -822,9 +822,11 @@ func (self *SRegion) GetInstances(hostId string) ([]SInstance, error) { for _, res := range resources { if res.NodeId == hostId || len(hostId) == 0 { instance, err := self.GetQemuConfig(res.Node, res.VmId) - if err == nil { - ret = append(ret, *instance) + if err != nil { + log.Warningf("get pve vm %s %d error: %v", res.Node, res.VmId, err) + continue } + ret = append(ret, *instance) } }