fix(api): worker model migration should not set need registration (#5196)

Author: richardlt

engine/api/workermodel/crud.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/go-gorp/gorp"
 
@@ -104,6 +105,13 @@ func Update(ctx context.Context, db gorp.SqlExecutor, old *sdk.Model, data sdk.M
 	model := sdk.Model(*old)
 	model.Update(data)
 
+	// model need to be register when modified
+	model.UserLastModified = time.Now()
+	model.NeedRegistration = true
+	model.NbSpawnErr = 0
+	model.LastSpawnErr = nil
+	model.LastSpawnErrLogs = nil
+
 	// update model in db
 	if err := UpdateDB(ctx, db, &model); err != nil {
 		return nil, sdk.WrapError(err, "cannot update worker model")

engine/api/workermodel/crud_test.go

@@ -131,7 +131,6 @@ func TestUpdateModel(t *testing.T) {
 	cpy.GroupID = g2.ID
 	res, err = workermodel.Update(context.TODO(), db, res, cpy)
 	require.Error(t, err)
-
 }
 
 // create a worker model aaa
@@ -363,3 +362,37 @@ func TestCopyModelTypeData_OldRestricted(t *testing.T) {
 		PatternName: "my-pattern",
 	}))
 }
+
+func TestUpdateModel_NeedRegister(t *testing.T) {
+	db, store, end := test.SetupPG(t, bootstrap.InitiliazeDB)
+	defer end()
+
+	g := assets.InsertTestGroup(t, db, sdk.RandomString(10))
+
+	u, _ := assets.InsertLambdaUser(t, db)
+
+	name := sdk.RandomString(10)
+	m, err := workermodel.Create(context.TODO(), db, sdk.Model{
+		Type:        sdk.Docker,
+		Name:        name,
+		GroupID:     g.ID,
+		ModelDocker: sdk.ModelDocker{},
+	}, u)
+	require.NoError(t, err)
+	require.NoError(t, workermodel.UpdateRegistration(context.TODO(), db, store, m.ID))
+
+	m, err = workermodel.LoadByID(context.TODO(), db, m.ID)
+	require.NoError(t, err)
+	require.False(t, m.NeedRegistration)
+	require.True(t, m.LastRegistration.After(m.UserLastModified))
+
+	mUpdated, err := workermodel.Update(context.TODO(), db, m, sdk.Model{
+		Type:        sdk.Docker,
+		Name:        name,
+		GroupID:     g.ID,
+		ModelDocker: sdk.ModelDocker{},
+	})
+	require.NoError(t, err)
+	require.True(t, mUpdated.NeedRegistration)
+	require.True(t, mUpdated.UserLastModified.After(m.LastRegistration))
+}

engine/api/workermodel/dao.go

@@ -232,12 +232,6 @@ func UpdateDB(ctx context.Context, db gorp.SqlExecutor, model *sdk.Model) error
 		return err
 	}
 
-	dbmodel.UserLastModified = time.Now()
-	dbmodel.NeedRegistration = true
-	dbmodel.NbSpawnErr = 0
-	dbmodel.LastSpawnErr = nil
-	dbmodel.LastSpawnErrLogs = nil
-
 	needSaveRegistryPassword, dockerRegistryPassword, err := replaceDockerRegistryPassword(db, &dbmodel)
 	if err != nil {
 		return err