rename fastly:runtime to fastly:compute (#959)

Author: Guy Bedford

…ocs/fastly:runtime/purgeSurrogateKey.mdx …ocs/fastly:compute/purgeSurrogateKey.mdxdocumentation/docs/fastly:runtime/purgeSurrogateKey.mdx renamed to documentation/docs/fastly:compute/purgeSurrogateKey.mdx documentation/docs/fastly:runtime/purgeSurrogateKey.mdx renamed to documentation/docs/fastly:compute/purgeSurrogateKey.mdx

@@ -1,8 +1,8 @@
 import { pass, ok, strictEqual, assertThrows } from './assertions-throwing.js';
 import { routes } from './routes.js';
-import { purgeSurrogateKey, vCpuTime } from 'fastly:runtime';
+import { purgeSurrogateKey, vCpuTime } from 'fastly:compute';
 
-routes.set('/runtime/get-vcpu-ms', () => {
+routes.set('/compute/get-vcpu-ms', () => {
   const cpuTime = vCpuTime();
   strictEqual(typeof cpuTime, 'number');
   ok(cpuTime > 0);
@@ -18,7 +18,7 @@ routes.set('/runtime/get-vcpu-ms', () => {
   return pass('ok');
 });
 
-routes.set('/runtime/purge-surrogate-key-invalid', () => {
+routes.set('/compute/purge-surrogate-key-invalid', () => {
   assertThrows(
     () => {
       purgeSurrogateKey();
@@ -29,12 +29,12 @@ routes.set('/runtime/purge-surrogate-key-invalid', () => {
   return pass('ok');
 });
 
-routes.set('/runtime/purge-surrogate-key-hard', () => {
+routes.set('/compute/purge-surrogate-key-hard', () => {
   purgeSurrogateKey('test');
   return pass('ok');
 });
 
-routes.set('/runtime/purge-surrogate-key-soft', () => {
+routes.set('/compute/purge-surrogate-key-soft', () => {
   purgeSurrogateKey('test', true);
   return pass('ok');
 });

…ntation/docs/fastly:runtime/vCpuTime.mdx …ntation/docs/fastly:compute/vCpuTime.mdxdocumentation/docs/fastly:runtime/vCpuTime.mdx renamed to documentation/docs/fastly:compute/vCpuTime.mdx documentation/docs/fastly:runtime/vCpuTime.mdx renamed to documentation/docs/fastly:compute/vCpuTime.mdx

@@ -13,6 +13,7 @@ import "./cache-override.js";
 import "./cache-core.js";
 import "./cache-simple.js";
 import "./client.js";
+import "./compute.js";
 import "./config-store.js";
 import "./console.js";
 import "./crypto.js";
@@ -44,7 +45,6 @@ import "./request-method.js";
 import "./response-json.js";
 import "./response-redirect.js";
 import "./response.js";
-import "./runtime.js";
 import "./secret-store.js";
 import "./server.js";
 import "./tee.js";

…s/js-compute/fixtures/app/src/runtime.js …s/js-compute/fixtures/app/src/compute.jsintegration-tests/js-compute/fixtures/app/src/runtime.js renamed to integration-tests/js-compute/fixtures/app/src/compute.js integration-tests/js-compute/fixtures/app/src/runtime.js renamed to integration-tests/js-compute/fixtures/app/src/compute.js

@@ -4250,17 +4250,17 @@
       "body": "ok"
     }
   },
-  "GET /runtime/get-vcpu-ms": {
+  "GET /compute/get-vcpu-ms": {
     "downstream_response": {
       "body": "ok",
       "status": 200
     }
   },
-  "GET /runtime/purge-surrogate-key-invalid": {},
-  "GET /runtime/purge-surrogate-key-hard": {
+  "GET /compute/purge-surrogate-key-invalid": {},
+  "GET /compute/purge-surrogate-key-hard": {
     "environments": ["compute"]
   },
-  "GET /runtime/purge-surrogate-key-soft": {
+  "GET /compute/purge-surrogate-key-soft": {
     "environments": ["compute"]
   }
 }

integration-tests/js-compute/fixtures/app/src/index.js

@@ -737,7 +737,7 @@ bool SimpleCache::purge(JSContext *cx, unsigned argc, JS::Value *vp) {
     return false;
   }
 
-  auto purge_res = host_api::Runtime::purge_surrogate_key(surrogate_key, false);
+  auto purge_res = host_api::Compute::purge_surrogate_key(surrogate_key, false);
   if (auto *err = purge_res.to_err()) {
     HANDLE_ERROR(cx, *err);
     return false;

integration-tests/js-compute/fixtures/app/tests.json

@@ -220,9 +220,9 @@ bool Fastly::env_get(JSContext *cx, unsigned argc, JS::Value *vp) {
   return true;
 }
 
-bool runtime_get_vcpu_time(JSContext *cx, unsigned argc, JS::Value *vp) {
+bool compute_get_vcpu_time(JSContext *cx, unsigned argc, JS::Value *vp) {
   JS::CallArgs args = CallArgsFromVp(argc, vp);
-  auto res = host_api::Runtime::get_vcpu_ms();
+  auto res = host_api::Compute::get_vcpu_ms();
   if (auto *err = res.to_err()) {
     HANDLE_ERROR(cx, *err);
     return false;
@@ -231,7 +231,7 @@ bool runtime_get_vcpu_time(JSContext *cx, unsigned argc, JS::Value *vp) {
   return true;
 }
 
-bool runtime_purge_surrogate_key(JSContext *cx, unsigned argc, JS::Value *vp) {
+bool compute_purge_surrogate_key(JSContext *cx, unsigned argc, JS::Value *vp) {
   JS::CallArgs args = CallArgsFromVp(argc, vp);
   if (!args.requireAtLeast(cx, "purgeSurrogateKey", 1)) {
     return false;
@@ -246,7 +246,7 @@ bool runtime_purge_surrogate_key(JSContext *cx, unsigned argc, JS::Value *vp) {
   if (soft_val.isBoolean()) {
     soft = soft_val.toBoolean();
   }
-  auto purge_res = host_api::Runtime::purge_surrogate_key(surrogate_key_chars, soft);
+  auto purge_res = host_api::Compute::purge_surrogate_key(surrogate_key_chars, soft);
   if (auto *err = purge_res.to_err()) {
     HANDLE_ERROR(cx, *err);
     return false;
@@ -449,34 +449,34 @@ bool install(api::Engine *engine) {
     return false;
   }
 
-  // fastly:runtime
-  RootedObject runtime_builtin(engine->cx(), JS_NewObject(engine->cx(), nullptr));
-  auto runtime_purge_surrogate_key_fn =
-      JS_NewFunction(engine->cx(), &runtime_purge_surrogate_key, 1, 0, "purgeSurrogateKey");
-  RootedObject runtime_purge_surrogate_key_obj(
-      engine->cx(), JS_GetFunctionObject(runtime_purge_surrogate_key_fn));
-  RootedValue runtime_purge_surrogate_key_val(engine->cx(),
-                                              ObjectValue(*runtime_purge_surrogate_key_obj));
+  // fastly:compute
+  RootedObject compute_builtin(engine->cx(), JS_NewObject(engine->cx(), nullptr));
+  auto compute_purge_surrogate_key_fn =
+      JS_NewFunction(engine->cx(), &compute_purge_surrogate_key, 1, 0, "purgeSurrogateKey");
+  RootedObject compute_purge_surrogate_key_obj(
+      engine->cx(), JS_GetFunctionObject(compute_purge_surrogate_key_fn));
+  RootedValue compute_purge_surrogate_key_val(engine->cx(),
+                                              ObjectValue(*compute_purge_surrogate_key_obj));
 
-  if (!JS_SetProperty(engine->cx(), runtime_builtin, "purgeSurrogateKey",
-                      runtime_purge_surrogate_key_val)) {
+  if (!JS_SetProperty(engine->cx(), compute_builtin, "purgeSurrogateKey",
+                      compute_purge_surrogate_key_val)) {
     return false;
   }
-  if (!JS_SetProperty(engine->cx(), fastly, "purgeSurrogateKey", runtime_purge_surrogate_key_val)) {
+  if (!JS_SetProperty(engine->cx(), fastly, "purgeSurrogateKey", compute_purge_surrogate_key_val)) {
     return false;
   }
-  auto runtime_vcpu_time_get =
-      JS_NewFunction(engine->cx(), &runtime_get_vcpu_time, 0, 0, "vCpuTime");
-  RootedObject runtime_vcpu_time_get_obj(engine->cx(), JS_GetFunctionObject(runtime_vcpu_time_get));
-  RootedValue runtime_vcpu_time_get_val(engine->cx(), ObjectValue(*runtime_vcpu_time_get_obj));
-  if (!JS_SetProperty(engine->cx(), runtime_builtin, "vCpuTime", runtime_vcpu_time_get_val)) {
+  auto compute_vcpu_time_get =
+      JS_NewFunction(engine->cx(), &compute_get_vcpu_time, 0, 0, "vCpuTime");
+  RootedObject compute_vcpu_time_get_obj(engine->cx(), JS_GetFunctionObject(compute_vcpu_time_get));
+  RootedValue compute_vcpu_time_get_val(engine->cx(), ObjectValue(*compute_vcpu_time_get_obj));
+  if (!JS_SetProperty(engine->cx(), compute_builtin, "vCpuTime", compute_vcpu_time_get_val)) {
     return false;
   }
-  if (!JS_SetProperty(engine->cx(), fastly, "vCpuTime", runtime_vcpu_time_get_val)) {
+  if (!JS_SetProperty(engine->cx(), fastly, "vCpuTime", compute_vcpu_time_get_val)) {
     return false;
   }
-  RootedValue runtime_builtin_val(engine->cx(), JS::ObjectValue(*runtime_builtin));
-  if (!engine->define_builtin_module("fastly:runtime", runtime_builtin_val)) {
+  RootedValue compute_builtin_val(engine->cx(), JS::ObjectValue(*compute_builtin));
+  if (!engine->define_builtin_module("fastly:compute", compute_builtin_val)) {
     return false;
   }
 

runtime/fastly/builtins/cache-simple.cpp

@@ -750,7 +750,7 @@ int device_detection_lookup(const char *user_agent, size_t user_agent_len, const
                             size_t buf_len, size_t *nwritten);
 
 WASM_IMPORT("fastly_compute_runtime", "get_vcpu_ms")
-int runtime_get_vcpu_ms(uint64_t *vcpu_ms);
+int compute_get_vcpu_ms(uint64_t *vcpu_ms);
 
 } // namespace fastly
 #ifdef __cplusplus

runtime/fastly/builtins/fastly.cpp

@@ -2745,19 +2745,19 @@ Result<HostString> DeviceDetection::lookup(std::string_view user_agent) {
   return res;
 }
 
-Result<uint64_t> Runtime::get_vcpu_ms() {
+Result<uint64_t> Compute::get_vcpu_ms() {
   Result<uint64_t> res;
   uint64_t ret;
   fastly::fastly_host_error err;
-  if (!convert_result(fastly::runtime_get_vcpu_ms(&ret), &err)) {
+  if (!convert_result(fastly::compute_get_vcpu_ms(&ret), &err)) {
     res.emplace_err(err);
   } else {
     res.emplace(ret);
   }
   return res;
 }
 
-Result<std::optional<HostString>> Runtime::purge_surrogate_key(std::string_view key, bool soft) {
+Result<std::optional<HostString>> Compute::purge_surrogate_key(std::string_view key, bool soft) {
   Result<std::optional<HostString>> res;
 
   auto host_key = string_view_to_world_string(key);

runtime/fastly/host-api/fastly.h

@@ -798,7 +798,7 @@ class DeviceDetection final {
   static Result<HostString> lookup(std::string_view user_agent);
 };
 
-class Runtime final {
+class Compute final {
 public:
   static Result<uint64_t> get_vcpu_ms();
   /// Purge the given surrogate key.