From 50e5d1a9f8c329003e5e996340985339bebdd784 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Fri, 24 Sep 2021 19:06:49 +0200 Subject: [PATCH] Remove res-tr table truncate, fix field & expr labels migration --- pkg/provision/migrations_202109_resource_translations.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/provision/migrations_202109_resource_translations.go b/pkg/provision/migrations_202109_resource_translations.go index a5810b294..81c77f9da 100644 --- a/pkg/provision/migrations_202109_resource_translations.go +++ b/pkg/provision/migrations_202109_resource_translations.go @@ -31,9 +31,6 @@ func migrateResourceTranslations(ctx context.Context, log *zap.Logger, s store.S migrated = make(map[string]bool) ) - // might be useful when developing or debugging migration - _ = store.TruncateResourceTranslations(ctx, s) - set, _, err := store.SearchResourceTranslations(ctx, s, sysTypes.ResourceTranslationFilter{}) set.Walk(func(r *sysTypes.ResourceTranslation) error { var pos = strings.Index(r.Resource, "/") @@ -144,14 +141,14 @@ func migrateComposeModuleFieldResourceTranslations(ctx context.Context, s store. // store does not contain this info, // but we need it to generate resource id res.NamespaceID = namespaceID - tt = append(tt, makeResourceTranslation(res, "label", res.Name)) + tt = append(tt, makeResourceTranslation(res, "label", res.Label)) var update = len(res.Expressions.Validators) > 0 for i := range res.Expressions.Validators { validatorID := i + 1 res.Expressions.Validators[i].ValidatorID = uint64(validatorID) - tt = append(tt, makeResourceTranslation(res, fmt.Sprintf("expression.validator.%d.error", validatorID), res.Name)) + tt = append(tt, makeResourceTranslation(res, fmt.Sprintf("expression.validator.%d.error", validatorID), res.Expressions.Validators[i].Error)) } if err = store.CreateResourceTranslation(ctx, s, tt...); err != nil {