Delete openapi yaml executables

Makefile.toml

@@ -202,12 +202,12 @@ dependencies = [
 [tasks.generate-worker-service-openapi]
 description = "Generates openapi spec for worker service"
 dependencies = ["build"]
-script = "./target/debug/golem-worker-service-yaml > ./target/golem-worker-service.yaml"
+script = "./target/debug/golem-worker-service --dump-openapi-yaml > ./target/golem-worker-service.yaml"
 
 [tasks.generate-template-service-openapi]
 description = "Generates openapi spec for template service"
 dependencies = ["build"]
-script = "./target/debug/golem-template-service-yaml > ./target/golem-template-service.yaml"
+script = "./target/debug/golem-template-service --dump-openapi-yaml > ./target/golem-template-service.yaml"
 
 [tasks.merge-openapi]
 install_crate = { crate_name = "golem-openapi-client-generator", version = "0.0.4" }

golem-template-service/Cargo.toml

@@ -7,10 +7,6 @@ edition = "2021"
 name = "golem-template-service"
 path = "src/server.rs"
 
-[[bin]]
-name = "golem-template-service-yaml"
-path = "src/openapi_yaml.rs"
-
 [lib]
 
 [dependencies]

golem-template-service/src/server.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use golem_template_service::api::make_open_api_service;
 use golem_template_service::config::{DbConfig, TemplateServiceConfig};
 use golem_template_service::service::Services;
 use golem_template_service::{api, db, grpcapi, metrics};
@@ -29,38 +30,44 @@ use tracing_subscriber::fmt::format::FmtSpan;
 use tracing_subscriber::EnvFilter;
 
 fn main() -> Result<(), std::io::Error> {
-    let prometheus = metrics::register_all();
-    let config = TemplateServiceConfig::new();
-
-    if config.enable_tracing_console {
-        // NOTE: also requires RUSTFLAGS="--cfg tokio_unstable" cargo build
-        console_subscriber::init();
-    } else if config.enable_json_log {
-        tracing_subscriber::fmt()
-            .json()
-            .flatten_event(true)
-            .with_span_events(FmtSpan::FULL) // NOTE: enable to see span events
-            .with_env_filter(EnvFilter::from_default_env())
-            .init();
+    if std::env::args().any(|arg| arg == "--dump-openapi-yaml") {
+        let service = make_open_api_service(&Services::noop());
+        println!("{}", service.spec_yaml());
+        Ok(())
     } else {
-        tracing_subscriber::fmt()
-            .with_env_filter(EnvFilter::from_default_env())
-            .with_ansi(true)
-            .init();
-    }
+        let prometheus = metrics::register_all();
+        let config = TemplateServiceConfig::new();
+
+        if config.enable_tracing_console {
+            // NOTE: also requires RUSTFLAGS="--cfg tokio_unstable" cargo build
+            console_subscriber::init();
+        } else if config.enable_json_log {
+            tracing_subscriber::fmt()
+                .json()
+                .flatten_event(true)
+                .with_span_events(FmtSpan::FULL) // NOTE: enable to see span events
+                .with_env_filter(EnvFilter::from_default_env())
+                .init();
+        } else {
+            tracing_subscriber::fmt()
+                .with_env_filter(EnvFilter::from_default_env())
+                .with_ansi(true)
+                .init();
+        }
 
-    let exporter = opentelemetry_prometheus::exporter()
-        .with_registry(prometheus.clone())
-        .build()
-        .unwrap();
+        let exporter = opentelemetry_prometheus::exporter()
+            .with_registry(prometheus.clone())
+            .build()
+            .unwrap();
 
-    global::set_meter_provider(MeterProvider::builder().with_reader(exporter).build());
+        global::set_meter_provider(MeterProvider::builder().with_reader(exporter).build());
 
-    tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap()
-        .block_on(async_main(&config, prometheus))
+        tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .unwrap()
+            .block_on(async_main(&config, prometheus))
+    }
 }
 
 async fn async_main(

golem-worker-service/Cargo.toml

@@ -11,10 +11,6 @@ description = "Golem Worker Service including API Gateway functionalities"
 name = "golem-worker-service"
 path = "src/main.rs"
 
-[[bin]]
-name = "golem-worker-service-yaml"
-path = "src/openapi_yaml.rs"
-
 [lib]
 
 [dependencies]

golem-worker-service/src/main.rs

@@ -1,4 +1,5 @@
 use golem_worker_service::api;
+use golem_worker_service::api::make_open_api_service;
 use golem_worker_service::service::Services;
 use golem_worker_service::{config, grpcapi};
 use golem_worker_service_base::app_config::WorkerServiceBaseConfig;
@@ -15,11 +16,16 @@ use tokio::select;
 
 #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    let prometheus = metrics::register_all();
-
-    let config: WorkerServiceBaseConfig = config::get_config();
-
-    app(&config, prometheus).await
+    if std::env::args().any(|arg| arg == "--dump-openapi-yaml") {
+        let services = Services::noop();
+        let api_service = make_open_api_service(&services);
+        println!("{}", api_service.spec_yaml());
+        Ok(())
+    } else {
+        let prometheus = metrics::register_all();
+        let config: WorkerServiceBaseConfig = config::get_config();
+        app(&config, prometheus).await
+    }
 }
 
 pub async fn app(