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

Merge pull request #16210 from ioito/automated-cherry-pick-of-#16209-upstream-release-3.10

Browse Source 
Automated cherry pick of #16209: fix(region): aws dns zone name
This commit is contained in:
Zexi Li
2023-03-13 14:55:21 +08:00
committed by GitHub
parent 99c08dae39 06e07f6a18
commit 82391fba04
4 changed files with 6 additions and 5 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.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
go.sum
+2 -2
View File
@@ -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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -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
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dnshostedzone.go
Generated Vendored
+2 -1
View File
@@ -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 {