fix: netlify commit hash

netlify.toml

@@ -1,6 +1,5 @@
 [Settings]
 ID = "d2668848-c2a6-411f-b884-004faee1942f"
 [build]
-functions = "./.netlify/functions"
-# Specify is-core-module/package.json as an external dependency
-ignore = "is-core-module/package.json"
+  functions = "./.netlify/functions"
+  command = "echo 'export const COMMIT_HASH = \"${COMMIT_REF}\";' > src/commit-hash.ts && yarn tsc"

src/adapters/supabase/helpers/tables/logs.ts

@@ -1,13 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // This is disabled because logs should be able to log any type of data
 // Normally this is forbidden
-// TODO: break this apart into smaller files.
 
 import { SupabaseClient } from "@supabase/supabase-js";
-import { execSync } from "child_process";
 import { Context as ProbotContext } from "probot";
 import Runtime from "../../../../bindings/bot-runtime";
-import { env } from "../../../../bindings/env";
+import { COMMIT_HASH } from "../../../../commit-hash";
 import { Database } from "../../types/database";
 
 import { LogLevel, PrettyLogs } from "../pretty-logs";
@@ -107,7 +105,7 @@ export class Logs {
       }
     }
 
-    const gitCommit = env.COMMIT_REF || execSync("git rev-parse --short HEAD").toString().trim();
+    const gitCommit = COMMIT_HASH?.substring(0, 7) ?? null;
     metadata.revision = gitCommit;
 
     return metadata;

src/commit-hash.ts

@@ -0,0 +1,8 @@
+import { execSync } from "child_process";
+export let COMMIT_HASH: null | string = null; // "0000000000000000000000000000000000000000";
+
+try {
+  COMMIT_HASH = execSync("git rev-parse --short HEAD").toString().trim();
+} catch (e) {
+  // netlify has no git binary
+}

src/handlers/shared/structured-metadata.ts

@@ -1,11 +1,10 @@
-import { execSync } from "child_process";
-import { env } from "../../bindings/env";
+import { COMMIT_HASH } from "../../commit-hash";
 
 function createStructuredMetadata(className: string, metadata: unknown) {
   const jsonString = JSON.stringify(metadata, null, 2);
   const stackLine = new Error().stack?.split("\n")[2] ?? "";
   const caller = stackLine.match(/at (\S+)/)?.[1] ?? "";
-  const revision = env.COMMIT_REF || execSync("git rev-parse --short HEAD").toString().trim();
+  const revision = COMMIT_HASH?.substring(0, 7) ?? null;
   return [`<!-- Ubiquity - ${className} - ${caller} - ${revision}`, jsonString, "-->"].join("\n");
 }
 

src/tests/commands-test.ts

@@ -1,9 +1,8 @@
 import { describe } from "@jest/globals";
-import { execSync } from "child_process";
 import "dotenv/config";
 import { Octokit } from "octokit";
 import { Server } from "probot";
-import { env } from "../bindings/env";
+import { COMMIT_HASH } from "../commit-hash";
 import { afterAllHandler } from "./after-all-handler";
 import { beforeAllHandler } from "./before-all-handler";
 import { testSuite } from "./test-suite";
@@ -14,7 +13,7 @@ export const TEST_PRIORITY_LABEL = "Priority: 1 (Normal)";
 export const SIX_HOURS = 6 * 60 * 60 * 1000; // 6 hours
 
 // return the current 7 character git commit hash using git rev-parse
-export const GIT_COMMIT_HASH = env.COMMIT_REF || execSync("git rev-parse --short HEAD").toString().trim();
+export const GIT_COMMIT_HASH = COMMIT_HASH?.substring(0, 7) ?? null;
 
 export const owner = process.env.TEST_ORGANIZATION_NAME || "ubiquibot";
 export const repo = process.env.TEST_REPOSITORY_NAME || "staging";

src/types/configuration-types.ts

@@ -55,7 +55,6 @@ const envConfigSchema = T.Object({
   X25519_PRIVATE_KEY: T.String(),
   PRIVATE_KEY: T.String(),
   APP_ID: T.Number(),
-  COMMIT_REF: T.Optional(T.String()), // automatically set in netlify
 });
 
 export const validateEnvConfig = ajv.compile(envConfigSchema);

yarn.lock

@@ -2584,7 +2584,7 @@
 
 "@types/dotenv@^8.2.0":
   version "8.2.0"
-  resolved "https://registry.npmjs.org/@types/dotenv/-/dotenv-8.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/@types/dotenv/-/dotenv-8.2.0.tgz#5cd64710c3c98e82d9d15844375a33bf1b45d053"
   integrity sha512-ylSC9GhfRH7m1EUXBXofhgx4lUWmFeQDINW5oLuS+gxWdfUeW4zJdeVTYVkexEW+e2VUvlZR2kGnGGipAWR7kw==
   dependencies:
     dotenv "*"