Skip to content

Commit 1b2a84c

Browse files
committed
cluster/apiserver - fix checkResourceDefault for tests
1 parent 79d3c9e commit 1b2a84c

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

cluster/apiserver/apiserver/mains/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (s *Server) DeleteTemplate(ctx context.Context, req *metav1.DeleteOptions)
169169
return nil, serr.K8sNotFoundOrInternalWithErr(err)
170170
}
171171

172-
if err := s.checkResourceDefault(tmpl); err != nil {
172+
if err := s.checkResourceDefault(tmpl); err == nil {
173173
return nil, grpcutils.InvalidArg("You cannot delete the default Template: %s", tmpl.Metadata.Name)
174174
}
175175

cluster/apiserver/apiserver/mains/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (s *Server) checkResourceDefault(rsc umetav1.ResourceObjectI) error {
8686
return grpcutils.InvalidArg("Resource name is not set")
8787
}
8888

89-
if strings.HasPrefix(rsc.GetMetadata().Name, "default.") {
89+
if !strings.HasPrefix(rsc.GetMetadata().Name, "default.") {
9090
return grpcutils.InvalidArg("This resource is not a default resource")
9191
}
9292

cluster/apiserver/apiserver/mains/workspace_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,13 +430,13 @@ func TestWorkspace(t *testing.T) {
430430
Name: ws.Status.SpaceRef.Name,
431431
})
432432
assert.Nil(t, err)
433-
assert.Nil(t, srv.checkResourceDefault(spc))
433+
assert.Nil(t, srv.checkResourceDefault(spc), "%+v", err)
434434

435435
tmpl, err := srv.GetTemplate(usr.Ctx(), &metav1.GetOptions{
436436
Name: ws.Status.TemplateRef.Name,
437437
})
438438
assert.Nil(t, err)
439-
assert.Nil(t, srv.checkResourceDefault(tmpl))
439+
assert.Nil(t, srv.checkResourceDefault(tmpl), "%+v", err)
440440
})
441441

442442
}

0 commit comments

Comments
 (0)