review comments - 1

admin/server/deployment.go

@@ -949,11 +949,11 @@ func (s *Server) GetDeploymentConfig(ctx context.Context, req *adminv1.GetDeploy
 	if err != nil {
 		return nil, err
 	}
-	resp.ProjectVariables = make([]*adminv1.ProjectVariable, 0, len(vars))
+	resp.Variables = make([]*adminv1.ProjectVariable, 0, len(vars))
 	for _, v := range vars {
-		resp.ProjectVariables = append(resp.ProjectVariables, projectVariableToDTO(v))
+		resp.Variables = append(resp.Variables, projectVariableToDTO(v))
 	}
-	resp.ProjectVariables = append(resp.ProjectVariables, &adminv1.ProjectVariable{
+	resp.Variables = append(resp.Variables, &adminv1.ProjectVariable{
 		Name:        "rill.watch_repo",
 		Value:       strconv.FormatBool(depl.Editable),
 		Environment: depl.Environment,
@@ -962,9 +962,9 @@ func (s *Server) GetDeploymentConfig(ctx context.Context, req *adminv1.GetDeploy
 	})
 
 	// remove in next release
-	resp.Variables = make(map[string]string, len(vars)) // nolint:staticcheck // Still need to populate for backward compatibility.
+	resp.VariablesLegacy = make(map[string]string, len(vars)) // nolint:staticcheck // Still need to populate for backward compatibility.
 	for _, v := range vars {
-		resp.Variables[v.Name] = v.Value // nolint:staticcheck // Still need to populate for backward compatibility.
+		resp.VariablesLegacy[v.Name] = v.Value // nolint:staticcheck // Still need to populate for backward compatibility.
 	}
 
 	// parsing duckdb connector config

proto/gen/rill/admin/v1/admin.swagger.yaml

@@ -5129,16 +5129,16 @@ definitions:
     type: object
     properties:
       variables:
-        type: object
-        additionalProperties:
-          type: string
-        description: 'Deprecated: Variables for the deployment (connector credentials, etc.). Use `project_variables` instead.'
-      projectVariables:
         type: array
         items:
           type: object
           $ref: '#/definitions/v1ProjectVariable'
-        description: Project-specific variables for the deployment.
+        description: Variables for the deployment.
+      variablesLegacy:
+        type: object
+        additionalProperties:
+          type: string
+        description: 'Deprecated: Variables for the deployment. Use `variables` instead.'
       annotations:
         type: object
         additionalProperties:
@@ -5159,6 +5159,7 @@ definitions:
         title: Duckdb connector config for the deployment
       editable:
         type: boolean
+        description: Whether the deployment is editable (dev environment with changes persisted to git repo).
   v1GetDeploymentCredentialsResponse:
     type: object
     properties:

proto/gen/rill/admin/v1/openapi.yaml

@@ -686,15 +686,11 @@ components:
                     title: Duckdb connector config for the deployment
                     type: object
                 editable:
+                    description: Whether the deployment is editable (dev environment with changes persisted to git repo).
                     type: boolean
                 frontendUrl:
                     description: Frontend URL for the deployment.
                     type: string
-                projectVariables:
-                    description: Project-specific variables for the deployment.
-                    items:
-                        $ref: '#/components/schemas/v1ProjectVariable'
-                    type: array
                 updatedOn:
                     description: Timestamp when the deployment was last updated.
                     format: date-time
@@ -703,9 +699,14 @@ components:
                     description: Whether the deployment is git based or archive based.
                     type: boolean
                 variables:
+                    description: Variables for the deployment.
+                    items:
+                        $ref: '#/components/schemas/v1ProjectVariable'
+                    type: array
+                variablesLegacy:
                     additionalProperties:
                         type: string
-                    description: 'Deprecated: Variables for the deployment (connector credentials, etc.). Use `project_variables` instead.'
+                    description: 'Deprecated: Variables for the deployment. Use `variables` instead.'
                     type: object
             type: object
         v1GetDeploymentCredentialsResponse:

proto/gen/rill/admin/v1/public.openapi.yaml

@@ -686,15 +686,11 @@ components:
                     title: Duckdb connector config for the deployment
                     type: object
                 editable:
+                    description: Whether the deployment is editable (dev environment with changes persisted to git repo).
                     type: boolean
                 frontendUrl:
                     description: Frontend URL for the deployment.
                     type: string
-                projectVariables:
-                    description: Project-specific variables for the deployment.
-                    items:
-                        $ref: '#/components/schemas/v1ProjectVariable'
-                    type: array
                 updatedOn:
                     description: Timestamp when the deployment was last updated.
                     format: date-time
@@ -703,9 +699,14 @@ components:
                     description: Whether the deployment is git based or archive based.
                     type: boolean
                 variables:
+                    description: Variables for the deployment.
+                    items:
+                        $ref: '#/components/schemas/v1ProjectVariable'
+                    type: array
+                variablesLegacy:
                     additionalProperties:
                         type: string
-                    description: 'Deprecated: Variables for the deployment (connector credentials, etc.). Use `project_variables` instead.'
+                    description: 'Deprecated: Variables for the deployment. Use `variables` instead.'
                     type: object
             type: object
         v1GetDeploymentCredentialsResponse:

proto/gen/rill/runtime/v1/runtime.swagger.yaml

@@ -795,7 +795,7 @@ paths:
         - RuntimeService
   /v1/instances/{instanceId}/env/pull:
     post:
-      summary: PullEnv pulls environment variables from cloud to local .env file
+      summary: PullEnv pulls environment variables from admin service to local .env file
       operationId: RuntimeService_PullEnv
       responses:
         "200":
@@ -820,7 +820,7 @@ paths:
         - RuntimeService
   /v1/instances/{instanceId}/env/push:
     post:
-      summary: PushEnv pushes local environment variables to cloud
+      summary: PushEnv pushes local environment variables to admin service
       operationId: RuntimeService_PushEnv
       responses:
         "200":

proto/rill/admin/v1/api.proto

@@ -1942,6 +1942,7 @@ map<string, string> variables_legacy = 1;
   bool uses_archive = 5;
   // Duckdb connector config for the deployment
   google.protobuf.Struct duckdb_connector_config = 6;
+  // Whether the deployment is editable (dev environment with changes persisted to git repo).
   bool editable = 8;
 }
 

proto/rill/runtime/v1/api.proto

@@ -375,15 +375,15 @@ service RuntimeService {
 
   // Env APIs
 
-  // PullEnv pulls environment variables from cloud to local .env file
+  // PullEnv pulls environment variables from admin service to local .env file
   rpc PullEnv(PullEnvRequest) returns (PullEnvResponse) {
     option (google.api.http) = {
       post: "/v1/instances/{instance_id}/env/pull",
       body: "*"
     };
   }
 
-  // PushEnv pushes local environment variables to cloud
+  // PushEnv pushes local environment variables to admin service
   rpc PushEnv(PushEnvRequest) returns (PushEnvResponse) {
     option (google.api.http) = {
       post: "/v1/instances/{instance_id}/env/push",

runtime/config_reloader.go

@@ -82,16 +82,19 @@ func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) er
 	restartController := false
 
 	// Update variables
-	allvars := make(map[string]string)
-	for _, envVars := range cfg.Variables {
-		for k, v := range envVars {
-			allvars[k] = v
-		}
+	vars := make(map[string]string)
+	// default first
+	for k, v := range cfg.Variables[""] {
+		vars[k] = v
+	}
+	// then overlay env specific
+	for k, v := range cfg.Variables[inst.Environment] {
+		vars[k] = v
 	}
-	varsChanged := !maps.Equal(inst.Variables, allvars)
+	varsChanged := !maps.Equal(inst.Variables, vars)
 	if varsChanged {
-		inst.Variables = allvars
 		if !cfg.Editable { // for editable deployments we will write vars to `.env` which will also trigger controller restart
+			inst.Variables = vars
 			restartController = true
 		}
 	}
@@ -172,12 +175,8 @@ func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) er
 		switch env {
 		case "":
 			path = ".env"
-		case "dev":
-			path = ".dev.env"
 		default:
-			// should not happen because only dev vars will be fetched for editable deployments
-			r.rt.Logger.Error("skipping variables for non-dev environment. Only `dev` deployments can be made editable.", zap.String("env", env), zap.String("instance_id", inst.ID))
-			continue
+			path = fmt.Sprintf(".%s.env", env)
 		}
 		contents, err := godotenv.Marshal(envVars)
 		if err != nil {

runtime/drivers/admin/admin_store.go

@@ -117,7 +117,7 @@ func (h *Handle) GetDeploymentConfig(ctx context.Context) (*drivers.DeploymentCo
 	}
 
 	return &drivers.DeploymentConfig{
-		Variables:             groupVariablesByEnv(res.ProjectVariables),
+		Variables:             groupVariablesByEnv(res.Variables),
 		Annotations:           res.Annotations,
 		FrontendURL:           res.FrontendUrl,
 		UpdatedOn:             res.UpdatedOn.AsTime(),

runtime/server/env.go

@@ -43,7 +43,7 @@ func (s *Server) PullEnv(ctx context.Context, req *runtimev1.PullEnvRequest) (*r
 	}
 	defer release()
 
-	// Fetch cloud variables for all environments
+	// Fetch cloud variables
 	cloudPerEnv, err := admin.GetProjectVariables(ctx, inst.Environment)
 	if err != nil && !errors.Is(err, drivers.ErrNotAuthenticated) {
 		return nil, fmt.Errorf("failed to get project variables: %w", err)
@@ -149,7 +149,7 @@ func (s *Server) PushEnv(ctx context.Context, req *runtimev1.PushEnvRequest) (*r
 
 	localPerEnv := p.GetDotEnvPerEnvironment()
 
-	// Fetch existing cloud variables for all environments
+	// Fetch existing cloud variables
 	cloudPerEnv, err := admin.GetProjectVariables(ctx, inst.Environment)
 	if err != nil && !errors.Is(err, drivers.ErrNotAuthenticated) {
 		return nil, fmt.Errorf("failed to get project variables: %w", err)

web-admin/src/client/gen/index.schemas.ts

@@ -536,9 +536,11 @@ export interface V1GetCurrentUserResponse {
 }
 
 /**
- * Deprecated: Variables for the deployment (connector credentials, etc.). Use `project_variables` instead.
+ * Deprecated: Variables for the deployment. Use `variables` instead.
  */
-export type V1GetDeploymentConfigResponseVariables = { [key: string]: string };
+export type V1GetDeploymentConfigResponseVariablesLegacy = {
+  [key: string]: string;
+};
 
 export type V1GetDeploymentConfigResponseAnnotations = {
   [key: string]: string;
@@ -549,10 +551,10 @@ export type V1GetDeploymentConfigResponseDuckdbConnectorConfig = {
 };
 
 export interface V1GetDeploymentConfigResponse {
-  /** Deprecated: Variables for the deployment (connector credentials, etc.). Use `project_variables` instead. */
-  variables?: V1GetDeploymentConfigResponseVariables;
-  /** Project-specific variables for the deployment. */
-  projectVariables?: V1ProjectVariable[];
+  /** Variables for the deployment. */
+  variables?: V1ProjectVariable[];
+  /** Deprecated: Variables for the deployment. Use `variables` instead. */
+  variablesLegacy?: V1GetDeploymentConfigResponseVariablesLegacy;
   annotations?: V1GetDeploymentConfigResponseAnnotations;
   /** Frontend URL for the deployment. */
   frontendUrl?: string;
@@ -561,6 +563,7 @@ export interface V1GetDeploymentConfigResponse {
   /** Whether the deployment is git based or archive based. */
   usesArchive?: boolean;
   duckdbConnectorConfig?: V1GetDeploymentConfigResponseDuckdbConnectorConfig;
+  /** Whether the deployment is editable (dev environment with changes persisted to git repo). */
   editable?: boolean;
 }
 

web-common/src/proto/gen/rill/admin/v1/api_pb.ts

@@ -4803,18 +4803,18 @@ export class GetDeploymentConfigRequest extends Message<GetDeploymentConfigReque
  */
 export class GetDeploymentConfigResponse extends Message<GetDeploymentConfigResponse> {
   /**
-   * Deprecated: Variables for the deployment (connector credentials, etc.). Use `project_variables` instead.
+   * Variables for the deployment.
    *
-   * @generated from field: map<string, string> variables = 1;
+   * @generated from field: repeated rill.admin.v1.ProjectVariable variables = 7;
    */
-  variables: { [key: string]: string } = {};
+  variables: ProjectVariable[] = [];
 
   /**
-   * Project-specific variables for the deployment.
+   * Deprecated: Variables for the deployment. Use `variables` instead.
    *
-   * @generated from field: repeated rill.admin.v1.ProjectVariable project_variables = 7;
+   * @generated from field: map<string, string> variables_legacy = 1;
    */
-  projectVariables: ProjectVariable[] = [];
+  variablesLegacy: { [key: string]: string } = {};
 
   /**
    * Annotations for the deployment (org/project metadata, etc.)
@@ -4852,6 +4852,8 @@ export class GetDeploymentConfigResponse extends Message<GetDeploymentConfigResp
   duckdbConnectorConfig?: Struct;
 
   /**
+   * Whether the deployment is editable (dev environment with changes persisted to git repo).
+   *
    * @generated from field: bool editable = 8;
    */
   editable = false;
@@ -4864,8 +4866,8 @@ export class GetDeploymentConfigResponse extends Message<GetDeploymentConfigResp
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "rill.admin.v1.GetDeploymentConfigResponse";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "variables", kind: "map", K: 9 /* ScalarType.STRING */, V: {kind: "scalar", T: 9 /* ScalarType.STRING */} },
-    { no: 7, name: "project_variables", kind: "message", T: ProjectVariable, repeated: true },
+    { no: 7, name: "variables", kind: "message", T: ProjectVariable, repeated: true },
+    { no: 1, name: "variables_legacy", kind: "map", K: 9 /* ScalarType.STRING */, V: {kind: "scalar", T: 9 /* ScalarType.STRING */} },
     { no: 2, name: "annotations", kind: "map", K: 9 /* ScalarType.STRING */, V: {kind: "scalar", T: 9 /* ScalarType.STRING */} },
     { no: 3, name: "frontend_url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 4, name: "updated_on", kind: "message", T: Timestamp },