Merge branch 'cleanup/code-dedup-safe-refactor' into 'master'

chore(engine): flatten nested if/else after error returns

Closes #716

See merge request postgres-ai/database-lab!1151

Author: agneum

engine/cmd/cli/commands/global/actions.go

@@ -31,11 +31,11 @@ func initCLI(c *cli.Context) error {
 
 	cfg, err := config.Load(filename)
 	if err != nil {
-		if os.IsNotExist(err) {
-			cfg = &config.CLIConfig{}
-		} else {
+		if !os.IsNotExist(err) {
 			return err
 		}
+
+		cfg = &config.CLIConfig{}
 	}
 
 	environmentID := c.String(commands.EnvironmentIDKey)

engine/internal/cloning/base.go

@@ -502,11 +502,11 @@ func (c *Base) calculateProtectionTime(durationMinutes *uint) *models.LocalTime
 	maxMinutes := c.config.ProtectionMaxDurationMinutes
 
 	if minutes == 0 {
-		if maxMinutes > 0 {
-			minutes = maxMinutes
-		} else {
+		if maxMinutes == 0 {
 			return nil
 		}
+
+		minutes = maxMinutes
 	}
 
 	if maxMinutes > 0 && minutes > maxMinutes {