From 609344074734cde4c3d2f13b9a6aa2b34c33ae37 Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Wed, 21 Dec 2022 09:46:05 +0100 Subject: [PATCH] fix(import): activate label policy after creation (#4879) --- internal/api/grpc/admin/import.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/internal/api/grpc/admin/import.go b/internal/api/grpc/admin/import.go index 4967cc4fe2..c82ae90eb9 100644 --- a/internal/api/grpc/admin/import.go +++ b/internal/api/grpc/admin/import.go @@ -420,6 +420,17 @@ func (s *Server) importData(ctx context.Context, orgs []*admin_pb.DataOrg) (*adm _, err = s.command.AddLabelPolicy(ctx, org.GetOrgId(), management.AddLabelPolicyToDomain(org.GetLabelPolicy())) if err != nil { errors = append(errors, &admin_pb.ImportDataError{Type: "label_policy", Id: org.GetOrgId(), Message: err.Error()}) + if isCtxTimeout(ctx) { + return &admin_pb.ImportDataResponse{Errors: errors, Success: success}, count, err + } + } else { + _, err = s.command.ActivateLabelPolicy(ctx, org.GetOrgId()) + if err != nil { + errors = append(errors, &admin_pb.ImportDataError{Type: "label_policy", Id: org.GetOrgId(), Message: err.Error()}) + if isCtxTimeout(ctx) { + return &admin_pb.ImportDataResponse{Errors: errors, Success: success}, count, err + } + } } } if org.LockoutPolicy != nil {