From 6f5f7e96f7f4d09034ef0b8d85bccdfd869107fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 26 Aug 2024 17:27:06 +0800 Subject: [PATCH] fix(region): set security group domain id (#21093) --- pkg/compute/regiondrivers/google.go | 4 +++- pkg/compute/regiondrivers/managedvirtual.go | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/compute/regiondrivers/google.go b/pkg/compute/regiondrivers/google.go index 7b3372874f..d2284fcf12 100644 --- a/pkg/compute/regiondrivers/google.go +++ b/pkg/compute/regiondrivers/google.go @@ -27,6 +27,7 @@ import ( "yunion.io/x/pkg/util/secrules" "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/apis" billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" @@ -339,7 +340,8 @@ func (self *SGoogleRegionDriver) CreateDefaultSecurityGroup( newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) newGroup.Description = "auto generage" newGroup.ManagerId = vpc.ManagerId - newGroup.DomainId = ownerId.GetDomainId() + newGroup.DomainId = ownerId.GetProjectDomainId() + newGroup.ProjectSrc = string(apis.OWNER_SOURCE_LOCAL) newGroup.GlobalvpcId = vpc.GlobalvpcId newGroup.ProjectId = ownerId.GetProjectId() err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index f558054388..57848e29de 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -3457,8 +3457,9 @@ func (self *SManagedVirtualizationRegionDriver) CreateDefaultSecurityGroup( newGroup.VpcId = vpc.Id newGroup.ManagerId = vpc.ManagerId newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() + newGroup.DomainId = ownerId.GetProjectDomainId() newGroup.ProjectId = ownerId.GetProjectId() + newGroup.ProjectSrc = string(apis.OWNER_SOURCE_LOCAL) err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) if err != nil { return nil, errors.Wrapf(err, "insert")