remove pull env api

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

@@ -7418,6 +7418,14 @@ definitions:
     type: object
   v1ReloadConfigResponse:
     type: object
+    properties:
+      variablesCount:
+        type: integer
+        format: int32
+        title: Number of variables pulled from cloud
+      modified:
+        type: boolean
+        title: Whether the .env file(s) were modified
     title: Response message for RuntimeService.ReloadConfig
   v1RenameFileResponse:
     type: object

proto/rill/runtime/v1/api.proto

@@ -545,7 +545,12 @@ message ReloadConfigRequest {
 }
 
 // Response message for RuntimeService.ReloadConfig
-message ReloadConfigResponse {}
+message ReloadConfigResponse {
+   // Number of variables pulled from cloud
+  int32 variables_count = 1;
+  // Whether the .env file(s) were modified
+  bool modified = 2;
+}
 
 // **********
 // Repos
@@ -1361,17 +1366,6 @@ message GitPushRequest {
 
 message GitPushResponse {}
 
-message PullEnvRequest {
-  string instance_id = 1 [(validate.rules).string = {pattern: "^[_\\-a-zA-Z0-9]+$"}];
-}
-
-message PullEnvResponse {
-  // Number of variables pulled from cloud
-  int32 variables_count = 1;
-  // Whether the .env file(s) were modified
-  bool modified = 2;
-}
-
 message PushEnvRequest {
   string instance_id = 1 [(validate.rules).string = {pattern: "^[_\\-a-zA-Z0-9]+$"}];
 }

runtime/config_reloader.go

@@ -48,32 +48,32 @@ func newConfigReloader(rt *Runtime) *configReloader {
 	return c
 }
 
-func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) error {
-	err := r.mu.Lock(ctx)
+func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) (varsCount int, modified bool, err error) {
+	err = r.mu.Lock(ctx)
 	if err != nil {
-		return err
+		return 0, false, err
 	}
 	defer r.mu.Unlock()
 
 	inst, err := r.rt.Instance(ctx, instanceID)
 	if err != nil {
-		return err
+		return 0, false, err
 	}
 
 	admin, release, err := r.rt.Admin(ctx, instanceID)
 	if err != nil {
 		if errors.Is(err, ErrAdminNotConfigured) {
-			return nil
+			return 0, false, nil
 		}
-		return err
+		return 0, false, err
 	}
 	defer release()
 
 	r.rt.Logger.Info("Reloading config for instance", zap.String("instance_id", instanceID), observability.ZapCtx(ctx))
 
 	cfg, err := admin.GetConfig(ctx)
 	if err != nil {
-		return err
+		return 0, false, err
 	}
 
 	// Clone for editing
@@ -110,7 +110,7 @@ func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) er
 			if connectorConfigChanged {
 				duckdbConfig, err := structpb.NewStruct(updatedDuckdbConfig)
 				if err != nil {
-					return err
+					return 0, false, err
 				}
 				// Create a new Connector with updated config
 				connector = &runtimev1.Connector{
@@ -135,7 +135,7 @@ func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) er
 	if !ok || cfg.UpdatedOn.After(updatedOn) {
 		repo, release, err := r.rt.Repo(ctx, inst.ID)
 		if err != nil {
-			return err
+			return 0, false, err
 		}
 		defer release()
 
@@ -152,25 +152,27 @@ func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) er
 			// retrigger parser to pick up changes
 			ctrl, err := r.rt.Controller(ctx, instanceID)
 			if err != nil {
-				return err
+				return 0, false, err
 			}
 			err = ctrl.Reconcile(ctx, GlobalProjectParserName)
 			if err != nil {
-				return fmt.Errorf("failed to trigger parser: %w", err)
+				return 0, false, fmt.Errorf("failed to trigger parser: %w", err)
 			}
 		}
 	}
 
 	err = r.rt.EditInstance(ctx, inst, restartController)
 	if err != nil {
-		return err
+		return 0, false, err
 	}
 	if !(varsChanged && cfg.Editable) {
-		return nil
+		return 0, false, nil
 	}
 
 	// write variables to .env files for editable deployments. This will also trigger controller restart via repo watcher
+	var count int
 	for env, envVars := range cfg.Variables {
+		count += len(envVars)
 		var path string
 		switch env {
 		case "":
@@ -180,14 +182,14 @@ func (r *configReloader) reloadConfig(ctx context.Context, instanceID string) er
 		}
 		contents, err := godotenv.Marshal(envVars)
 		if err != nil {
-			return fmt.Errorf("failed to marshal env vars: %w", err)
+			return 0, false, fmt.Errorf("failed to marshal env vars: %w", err)
 		}
 		err = r.rt.PutFile(ctx, instanceID, path, strings.NewReader(contents), true, true)
 		if err != nil {
-			return fmt.Errorf("failed to write %s file: %w", path, err)
+			return 0, false, fmt.Errorf("failed to write %s file: %w", path, err)
 		}
 	}
-	return nil
+	return count, true, nil
 }
 
 func (r *configReloader) periodicallyReloadConfigs(ctx context.Context) {
@@ -199,7 +201,7 @@ func (r *configReloader) periodicallyReloadConfigs(ctx context.Context) {
 			return
 		}
 		for _, inst := range instances {
-			err := r.reloadConfig(ctx, inst.ID)
+			_, _, err := r.reloadConfig(ctx, inst.ID)
 			if err != nil {
 				r.rt.Logger.Error("periodicallyReloadConfigs: failed to reload config", zap.String("instance_id", inst.ID), zap.Error(err))
 			}