remove packing ability and requirement for fastly.toml file to exist when using the js-compute-runtime cli (#108)

Co-authored-by: Jake Champion <[email protected]>

Author: JakeChampion

CHANGELOG.md

@@ -1,3 +1,12 @@
+## unreleased
+
+### Enhancements
+
+- Removed the requirement for a fastly.toml file to be present when using js-compute-runtimes CLI to compile a WASM file
+
+- **Breaking change:** Removed --skip-pkg argument from js-compute-runtime's CLI
+  [#108](https://github.com/fastly/js-compute-runtime/pull/108)
+
 ## 0.2.5 (2022-04-12)
 
 ### Fixes

Cargo.lock

@@ -8,8 +8,6 @@ edition = "2018"
 anyhow = "1.0.34"
 env_logger = "0.8.2"
 log = "0.4.11"
-sanitize-filename = "0.3.0"
 structopt = "0.3.20"
 tempfile = "3.1.0"
-toml = "0.5.0"
 wizer = "1.4.0"

Cargo.toml

@@ -96,19 +96,6 @@ As an example, to turn a file `test.js` with this source code:
 addEventListener('fetch', e => {
   console.log("Hello World!");
 });
-```
-Create a fastly.toml file which is required for the application to run:
-```toml
-# This file describes a Fastly Compute@Edge package. To learn more visit:
-# https://developer.fastly.com/reference/fastly-toml/
-
-authors = ["[email protected]"]
-description = "test service"
-language = "javascript"
-manifest_version = 2
-name = "test"
-service_id = ""
-
 ```
 
 into a C@E service with your build of the CLI tool, run the following command:

README.md

@@ -1,7 +1,7 @@
 {
   "scripts": {
     "install:ci": "npm ci",
-    "build:test": "base=$npm_config_test; webpack \"./fixtures/$base/$base.ts\" --output-path \"./fixtures/$base\" --output-filename \"$base.js\"; ../../target/release/js-compute-runtime --skip-pkg \"./fixtures/$base/$base.js\" \"./fixtures/$base/$base.wasm\"",
+    "build:test": "base=$npm_config_test; webpack \"./fixtures/$base/$base.ts\" --output-path \"./fixtures/$base\" --output-filename \"$base.js\"; ../../target/release/js-compute-runtime \"./fixtures/$base/$base.js\" \"./fixtures/$base/$base.wasm\"",
     "lint": "npx prettier --write ./fixtures/**/*.ts"
   },
   "devDependencies": {

integration-tests/js-compute/package.json

@@ -1,10 +1,8 @@
 use anyhow::Context;
 use std::fs;
-use std::mem::ManuallyDrop;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use structopt::StructOpt;
-use toml::Value;
 use wizer::Wizer;
 
 #[derive(StructOpt)]
@@ -21,10 +19,6 @@ pub struct Options {
     #[structopt(long, parse(from_os_str))]
     engine_wasm: Option<PathBuf>,
 
-    /// Skip creation of deployable bundle.
-    #[structopt(long)]
-    skip_pkg: bool,
-
     #[structopt(long = "internal-wizening-mode")]
     wizen: bool,
 }
@@ -33,12 +27,6 @@ fn main() -> anyhow::Result<()> {
     env_logger::init();
     let options = Options::from_args();
 
-    if !(options.wizen || options.skip_pkg) && !Path::exists(Path::new("fastly.toml")) {
-        eprintln!("Error: fastly.toml not found.\n");
-        Options::clap().print_help()?;
-        std::process::exit(-1);
-    }
-
     if options.wizen {
         log::debug!("Wizerize subprocess start");
         wizen(&options.engine_wasm, &options.output)?;
@@ -47,9 +35,6 @@ fn main() -> anyhow::Result<()> {
     }
 
     initialize_js(&options.input, &options.output, options.engine_wasm)?;
-    if !options.skip_pkg {
-        create_bundle(&options.input, &options.output)?;
-    }
 
     Ok(())
 }
@@ -87,58 +72,6 @@ fn initialize_js(input_path: &PathBuf,
     Ok(())
 }
 
-fn create_bundle(_input_path: &PathBuf, wasm_path: &PathBuf) -> anyhow::Result<()> {
-    log::debug!("Creating bundle for Fastly deploy");
-    let fastly_toml = fs::read_to_string("fastly.toml")?.parse::<Value>()?;
-    let name = fastly_toml["name"].as_str().unwrap();
-    let name = sanitize_filename::sanitize(&name).replace(" ", "-");
-    log::debug!("sanitized project name: {}", name);
-
-    let tmpdir = ManuallyDrop::new(tempfile::tempdir()?);
-    log::debug!("Bundling in temp directory: {}", tmpdir.path().display());
-    let build_dir = tmpdir.path().join(&name);
-    log::debug!("Build dir: {}", build_dir.display());
-    fs::create_dir(&build_dir)?;
-    let bin_dir = build_dir.join("bin");
-    fs::create_dir(&bin_dir)?;
-
-    fs::copy(wasm_path, bin_dir.join("main.wasm"))?;
-    fs::copy("fastly.toml", &build_dir.join("fastly.toml"))?;
-
-    let pkgdir = Path::new(".").canonicalize()?.join("pkg");
-    if !Path::exists(&pkgdir) {
-        fs::create_dir(&pkgdir)?;
-    }
-
-    let pkgpath = pkgdir.join(format!("{}.tar.gz", name));
-    log::debug!("Creating tarball: {}", pkgpath.display());
-
-    let status = Command::new("tar")
-        .current_dir(tmpdir.path())
-        .arg("-czf")
-        .arg(pkgpath)
-        .arg(name)
-        .status()
-        .expect("Failed to invoke tar");
-
-    if !status.success() {
-        eprintln!("Tar failed with status: {}", status);
-        std::process::exit(-1);
-    }
-
-    if std::env::var("FASTLY_JS_DEBUG_TEMP_DIR").is_ok() {
-        log::debug!(
-            "FASTLY_JS_DEBUG_TEMP_DIR is set; will not clean up {}",
-            tmpdir.path().display()
-        );
-    } else {
-        log::debug!("Cleaning up {}", tmpdir.path().display());
-        drop(ManuallyDrop::into_inner(tmpdir));
-    }
-
-    Ok(())
-}
-
 fn wizen(engine_path: &Option<PathBuf>, output_path: &Path) -> anyhow::Result<()> {
     let engine_wasm_bytes = match engine_path {
         None => {