No need to increment project resource version, just use current versi…

…on. (#208)
metal-stack · Sep 8, 2023 · b0bc235 · b0bc235
1 parent 89d1ed6
commit b0bc235
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/cmd/project.go b/cmd/project.go
@@ -107,8 +107,7 @@ func (c projectCmd) Update(rq *models.V1ProjectUpdateRequest) (*models.V1Project
 		return nil, err
 	}
 
-	// FIXME: should not be done by the client, see https://github.com/fi-ts/cloudctl/pull/26
-	rq.Meta.Version = resp.Payload.Meta.Version + 1
+	rq.Meta.Version = resp.Payload.Meta.Version
 
 	updateResp, err := c.client.Project().UpdateProject(projectmodel.NewUpdateProjectParams().WithBody(rq), nil)
 	if err != nil {

diff --git a/cmd/project_test.go b/cmd/project_test.go
@@ -165,11 +165,7 @@ UID   TENANT        NAME        DESCRIPTION   QUOTAS CLUSTERS/MACHINES/IPS   LAB
 				Project: func(mock *mock.Mock) {
 					mock.On("CreateProject", testcommon.MatchIgnoreContext(t, project.NewCreateProjectParams().WithBody(projectResponseToCreate(project1))), nil).Return(nil, &project.CreateProjectConflict{}).Once()
 					mock.On("FindProject", testcommon.MatchIgnoreContext(t, project.NewFindProjectParams().WithID(project1.Meta.ID)), nil).Return(&project.FindProjectOK{
-						Payload: &models.V1ProjectResponse{
-							Meta: &models.V1Meta{
-								Version: 0,
-							},
-						},
+						Payload: project1,
 					}, nil)
 					mock.On("UpdateProject", testcommon.MatchIgnoreContext(t, project.NewUpdateProjectParams().WithBody(projectResponseToUpdate(project1))), nil).Return(&project.UpdateProjectOK{
 						Payload: project1,
@@ -214,16 +210,10 @@ UID   TENANT        NAME        DESCRIPTION   QUOTAS CLUSTERS/MACHINES/IPS   LAB
 			mocks: &client.MetalMockFns{
 				Project: func(mock *mock.Mock) {
 					mock.On("FindProject", testcommon.MatchIgnoreContext(t, project.NewFindProjectParams().WithID(project1.Meta.ID)), nil).Return(&project.FindProjectOK{
-						Payload: &models.V1ProjectResponse{
-							Meta: &models.V1Meta{
-								Version: 0,
-							},
-						},
+						Payload: project1,
 					}, nil)
-					p := project1
-					p.Meta.Version = 1
-					mock.On("UpdateProject", testcommon.MatchIgnoreContext(t, project.NewUpdateProjectParams().WithBody(projectResponseToUpdate(p))), nil).Return(&project.UpdateProjectOK{
-						Payload: p,
+					mock.On("UpdateProject", testcommon.MatchIgnoreContext(t, project.NewUpdateProjectParams().WithBody(projectResponseToUpdate(project1))), nil).Return(&project.UpdateProjectOK{
+						Payload: project1,
 					}, nil)
 				},
 			},