fix(region): ignore empty certificate error for ssl sync (#19053)

yunionio · Dec 19, 2023 · 3f10e5a · 3f10e5a
1 parent 1ad385f
commit 3f10e5a
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 236 deletions.
diff --git 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.20231218072105-9257091d5b31
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231219063422-30c5f1f76541
 	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
@@ -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.20231218072105-9257091d5b31 h1:AdJrsaKEjnohmLNNr2WOUoFfG87GYRJ6JNXqnMuvTx8=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231218072105-9257091d5b31/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231219063422-30c5f1f76541 h1:dmT7zzhP95ybI68F178+E41ve/M8JT9bC45DEZPXy4A=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231219063422-30c5f1f76541/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/pkg/compute/models/sslcertificate.go b/pkg/compute/models/sslcertificate.go
@@ -74,8 +74,8 @@ type SSSLCertificate struct {
 	Fingerprint string    `width:"128" charset:"utf8" nullable:"false" list:"user" create:"required"`
 	City        string    `width:"2048" charset:"utf8" nullable:"false" list:"user" create:"required"`
 	OrgName     string    `width:"2048" charset:"utf8" nullable:"false" list:"user" create:"required"`
-	Certificate string    `charset:"utf8" nullable:"false" list:"user" create:"required"`
-	PrivateKey  string    `charset:"utf8" nullable:"false" list:"user" create:"required"`
+	Certificate string    `charset:"utf8" nullable:"true" list:"user" create:"required"`
+	PrivateKey  string    `charset:"utf8" nullable:"true" list:"user" create:"required"`
 }
 
 func (s SSSLCertificate) GetExternalId() string {

diff --git 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.20231218072105-9257091d5b31
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231219063422-30c5f1f76541
 ## 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/huawei/client/client.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/client/client.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/client/modules/mod_keypairs.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/client/modules/mod_keypairs.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/client/modules/mod_quotas.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/client/modules/mod_quotas.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/keypair.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/keypair.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/quota.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/quota.go