Add ability to set query by env var

crates/arroyo-rpc/src/config.rs

@@ -241,6 +241,10 @@ pub struct Config {
     /// process with a non-standard port.
     compiler_endpoint: Option<Url>,
 
+    /// Supplies the default query for `arroyo run`; otherwise the query is read from the command
+    /// line or from stdin
+    pub query: Option<String>,
+
     /// Controls whether preview pipelines should have sinks enabled
     #[serde(default)]
     pub sinks_in_preview: bool,
@@ -274,6 +278,9 @@ pub struct ApiConfig {
 
     /// The HTTP port for the API service
     pub http_port: u16,
+
+    /// The HTTP port for the API service in run mode; defaults to a random port
+    pub run_http_port: Option<u16>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]

crates/arroyo/src/run.rs

@@ -3,7 +3,7 @@ use anyhow::bail;
 use arroyo_openapi::types::{Pipeline, PipelinePatch, PipelinePost, StopType, ValidateQueryPost};
 use arroyo_openapi::Client;
 use arroyo_rpc::config;
-use arroyo_rpc::config::{DatabaseType, DefaultSink, Scheduler};
+use arroyo_rpc::config::{config, DatabaseType, DefaultSink, Scheduler};
 use arroyo_server_common::log_event;
 use arroyo_server_common::shutdown::{Shutdown, ShutdownHandler, SignalBehavior};
 use async_trait::async_trait;
@@ -197,7 +197,10 @@ async fn run_pipeline(
 pub async fn run(args: RunArgs) {
     let _guard = arroyo_server_common::init_logging("pipeline");
 
-    let query = std::io::read_to_string(args.query).unwrap();
+    let query = match config().query.clone() {
+        Some(query) => query,
+        None => std::io::read_to_string(args.query).unwrap(),
+    };
 
     let mut shutdown = Shutdown::new("pipeline", SignalBehavior::Handle);
 
@@ -209,7 +212,11 @@ pub async fn run(args: RunArgs) {
         c.database.r#type = DatabaseType::Sqlite;
         c.database.sqlite.path = db_path.clone();
 
-        c.api.http_port = 0;
+        if let Some(port) = c.api.run_http_port {
+            c.api.http_port = port;
+        } else {
+            c.api.http_port = 0;
+        }
         c.controller.rpc_port = 0;
         c.controller.scheduler = Scheduler::Process;
 

docker/Dockerfile

@@ -56,10 +56,9 @@ RUN apt-get update && \
 
 COPY --from=builder /arroyo ./
 
-ENV PRODUCTION=true \
-    ASSET_DIR="/app/dist" \
-    INSTALL_RUSTC=true \
-    INSTALL_CLANG=true
+ENV INSTALL_RUSTC=true \
+    INSTALL_CLANG=true \
+    ARROYO__API__RUN_HTTP_PORT=8000
 
 EXPOSE 8000
 ENTRYPOINT [ "/app/arroyo" ]
@@ -69,10 +68,9 @@ WORKDIR /app
 RUN apt-get update && \
     apt-get -y install libsasl2-2 ca-certificates curl pkg-config
 
-COPY --from=builder /arroyo ./
+ENV ARROYO__API__RUN_HTTP_PORT=8000
 
-ENV PRODUCTION=true \
-    ASSET_DIR="/app/dist"
+COPY --from=builder /arroyo ./
 
 EXPOSE 8000
 ENTRYPOINT [ "/app/arroyo" ]