fix: ensure block existence check is performed for empty server names

tsuru · Feb 13, 2025 · edc5274 · edc5274
1 parent 0e311e6
commit edc5274
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/internal/pkg/rpaas/mutation.go b/internal/pkg/rpaas/mutation.go
@@ -62,13 +62,13 @@ func (m *mutation) UpdateBlock(block ConfigurationBlock) error {
 }
 
 func (m *mutation) DeleteBlock(serverName, blockName string) error {
-	if m.spec.Blocks == nil {
-		return NotFoundError{Msg: fmt.Sprintf("block %q not found", blockName)}
-	}
-
 	blockType := v1alpha1.BlockType(blockName)
 
 	if serverName == "" {
+		if m.spec.Blocks == nil {
+			return NotFoundError{Msg: fmt.Sprintf("block %q not found", blockName)}
+		}
+
 		if _, ok := m.spec.Blocks[blockType]; !ok {
 			return NotFoundError{Msg: fmt.Sprintf("block %q not found", blockName)}
 		}