Merge pull request #3510 from ioito/hotfix/qx-qcloud-secgroup-delete

fix: 避免删除安全组失败
This commit is contained in:
yunion-ci-robot
2019-11-07 17:21:15 +08:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
@@ -242,7 +242,7 @@ func (region *SRegion) GetClassicSecurityGroups() ([]SClassicSecurityGroup, erro
}
func (region *SRegion) GetClassicSecurityGroupDetails(secgroupId string) (*SClassicSecurityGroup, error) {
secgroup := SClassicSecurityGroup{}
secgroup := SClassicSecurityGroup{region: region}
return &secgroup, region.client.Get(secgroupId, []string{}, &secgroup)
}
+1 -1
View File
@@ -451,7 +451,7 @@ func (self *SRegion) GetSecurityGroupDetails(secGroupId string) (*SSecurityGroup
return nil, err
}
secgrp := SSecurityGroup{SecurityGroupId: secGroupId}
secgrp := SSecurityGroup{SecurityGroupId: secGroupId, region: self}
err = body.Unmarshal(&secgrp.SecurityGroupPolicySet, "SecurityGroupPolicySet")
if err != nil {
log.Errorf("Unmarshal security group details fail %s", err)