From 983caa0ad58834b570deafe4d4b385effc110c0a Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 15 Nov 2019 10:28:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E6=9C=89=E4=BA=9B?= =?UTF-8?q?=E4=BA=91=E4=B8=8D=E8=83=BD=E5=88=9B=E5=BB=BAdefault=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=AE=89=E5=85=A8=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/regiondrivers/managedvirtual.go | 3 +++ pkg/multicloud/aws/securitygroup.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index 204f1b2c81..fad09c9831 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -1424,6 +1424,9 @@ func (self *SManagedVirtualizationRegionDriver) RequestSyncSecurityGroup(ctx con } if len(cache.ExternalId) == 0 { + if strings.ToLower(secgroup.Name) == "default" { //避免有些云不支持default关键字 + secgroup.Name = "DefaultGroup" + } // 避免有的云不支持重名安全组 groupName := secgroup.Name for i := 0; i < 30; i++ { diff --git a/pkg/multicloud/aws/securitygroup.go b/pkg/multicloud/aws/securitygroup.go index 13eb9e434a..6f20ff1ab2 100644 --- a/pkg/multicloud/aws/securitygroup.go +++ b/pkg/multicloud/aws/securitygroup.go @@ -235,6 +235,9 @@ func (self *SRegion) CreateSecurityGroup(vpcId string, name string, secgroupIdTa desc = "vpc default group" } params.SetDescription(desc) + if strings.ToLower(name) == "default" { + name = randomString(fmt.Sprintf("%s-", vpcId), 9) + } params.SetGroupName(name) group, err := self.ec2Client.CreateSecurityGroup(params)