diff --git a/go.mod b/go.mod index cd139ca602..0845336b8b 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.20230309073903-be630d4cb16b + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230313030311-453a655724d6 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index d869e4f520..9acc55c2b2 100644 --- a/go.sum +++ b/go.sum @@ -1164,8 +1164,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.20230309073903-be630d4cb16b h1:DDZB/Z0NrpgDthZiLUGJ8UpEvlirpUt4oqHgh8Dlmcg= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230309073903-be630d4cb16b/go.mod h1:sWqblYRhQCO63xeKdxdAT3wczCCY8Mc+TDa3WD/a5Kg= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230313030311-453a655724d6 h1:vnCkyaZec1QZaeKnY1v58WnEJ+rGgrsJvY4LG251X2w= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230313030311-453a655724d6/go.mod h1:sWqblYRhQCO63xeKdxdAT3wczCCY8Mc+TDa3WD/a5Kg= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/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 2b0234e36b..a239cd7055 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1442,7 +1442,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.20230309073903-be630d4cb16b +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230313030311-453a655724d6 ## 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/aws/dnshostedzone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dnshostedzone.go index 23f84002ae..c1d9af9d53 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dnshostedzone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dnshostedzone.go @@ -15,6 +15,7 @@ package aws import ( + "strings" "time" "github.com/aws/aws-sdk-go/aws/awserr" @@ -54,7 +55,7 @@ func (self *SHostedZone) GetId() string { } func (self *SHostedZone) GetName() string { - return self.Name + return strings.TrimSuffix(self.Name, ".") } func (self *SHostedZone) GetGlobalId() string {