From 5c9ba72671b7845a1894ba78a025f703042f1323 Mon Sep 17 00:00:00 2001 From: nxtcoder17 Date: Wed, 21 Aug 2024 16:55:46 +0530 Subject: [PATCH] fix: updates apps on cluster, when removing all device intercepts gh-issue: https://github.com/kloudlite/kloudlite/issues/276 --- apps/console/internal/domain/app.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/console/internal/domain/app.go b/apps/console/internal/domain/app.go index 0a166c571..db23bca45 100644 --- a/apps/console/internal/domain/app.go +++ b/apps/console/internal/domain/app.go @@ -268,10 +268,14 @@ func (d *domain) RemoveDeviceIntercepts(ctx ResourceContext, deviceName string) fc.AppSpecInterceptEnabled: false, } - _, err := d.appRepo.PatchById(ctx, apps[i].Id, patchForUpdate) + up, err := d.appRepo.PatchById(ctx, apps[i].Id, patchForUpdate) if err != nil { return errors.NewE(err) } + + if err := d.applyApp(ctx, up); err != nil { + return errors.NewE(err) + } } return nil @@ -286,14 +290,13 @@ func (d *domain) OnAppUpdateMessage(ctx ResourceContext, app entities.App, statu if xApp == nil { return errors.Newf("no apps found") } + recordVersion, err := d.MatchRecordVersion(app.Annotations, xApp.RecordVersion) if err != nil { return errors.NewE(err) } - uapp, err := d.appRepo.PatchById( - ctx, - xApp.Id, + uapp, err := d.appRepo.PatchById(ctx, xApp.Id, common.PatchForSyncFromAgent(&app, recordVersion, status, common.PatchOpts{ MessageTimestamp: opts.MessageTimestamp, }))