From d2506ccf105bc73d210936c44d9599feec179162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 6 Dec 2023 15:29:43 +0800 Subject: [PATCH] fix(keystone): remove deleted project metadata (#18905) --- pkg/keystone/models/domains.go | 4 ++++ pkg/keystone/models/identitybase.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkg/keystone/models/domains.go b/pkg/keystone/models/domains.go index 85f1cb9995..29b20a1e8e 100644 --- a/pkg/keystone/models/domains.go +++ b/pkg/keystone/models/domains.go @@ -496,6 +496,10 @@ func (domain *SDomain) Delete(ctx context.Context, userCred mcclient.TokenCreden return errors.Wrap(err, "MarkPendingDelete") } } + err = db.Metadata.RemoveAll(ctx, domain, userCred) + if err != nil { + return errors.Wrapf(err, "Metadata.RemoveAll") + } return nil } diff --git a/pkg/keystone/models/identitybase.go b/pkg/keystone/models/identitybase.go index 2c1217fd4f..4bf85c586c 100644 --- a/pkg/keystone/models/identitybase.go +++ b/pkg/keystone/models/identitybase.go @@ -435,6 +435,10 @@ func (model *SIdentityBaseResource) Delete(ctx context.Context, userCred mcclien return errors.Wrap(err, "MarkPendingDelete") } } + err := db.Metadata.RemoveAll(ctx, model, userCred) + if err != nil { + return errors.Wrapf(err, "Metadata.RemoveAll") + } return nil // DeleteModel(ctx, userCred, model.GetIVirtualModel()) }