iterate in sorted order

admin/deployments.go

@@ -299,6 +299,7 @@ func (s *Service) StartDeploymentInner(ctx context.Context, depl *database.Deplo
 	if err != nil {
 		return err
 	}
+	// base variables are returned first followed by environment specific variables, so we can just iterate once and overlay them in order
 	v := map[string]string{}
 	for _, variable := range vars {
 		v[variable.Name] = variable.Value

admin/projects.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"slices"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/rilldata/rill/admin/database"
@@ -534,11 +536,15 @@ func (s *Service) TriggerParserAndAwaitResource(ctx context.Context, depl *datab
 
 // ResolveVariables resolves the project's variables for the given environment.
 // It fetches the variable specific to the environment plus the default variables not set exclusively for the environment.
+// The returned list is sorted by environment name for consistent ordering, with default variables (empty environment) first.
 func (s *Service) ResolveVariables(ctx context.Context, depl *database.Deployment) ([]*database.ProjectVariable, error) {
 	vars, err := s.DB.FindProjectVariables(ctx, depl.ProjectID, &depl.Environment)
 	if err != nil {
 		return nil, err
 	}
+	slices.SortFunc(vars, func(a, b *database.ProjectVariable) int {
+		return strings.Compare(a.Environment, b.Environment)
+	})
 	// Enable the file watcher for editable deployments.
 	vars = append(vars, &database.ProjectVariable{
 		Name:        "rill.watch_repo",

runtime/server/env.go

@@ -48,13 +48,13 @@ func (s *Server) PushEnv(ctx context.Context, req *runtimev1.PushEnvRequest) (*r
 	if err != nil && !errors.Is(err, drivers.ErrNotAuthenticated) {
 		return nil, fmt.Errorf("failed to get project variables: %w", err)
 	}
-	var cloudPerEnv map[string]map[string]string
-	if cfg != nil {
-		cloudPerEnv = cfg.Variables
-	} 
-	if cloudPerEnv == nil {
-		cloudPerEnv = make(map[string]map[string]string)
-	}
+	var cloudPerEnv map[string]map[string]string
+	if cfg != nil {
+		cloudPerEnv = cfg.Variables
+	}
+	if cloudPerEnv == nil {
+		cloudPerEnv = make(map[string]map[string]string)
+	}
 
 	var addedCount, changedCount int32