querysub 0.711.0 → 0.712.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.711.0",
+  "version": "0.712.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/components/ServicesListPage.tsx

@@ -102,8 +102,8 @@ export class ServicesListPage extends qreact.Component {
                                 parameters: {
                                     key: newServiceId,
                                     machineIds: [],
-                                    repoUrl: gitInfo.repoUrl,
-                                    gitRef: gitInfo.latestRef,
+                                    repoUrl: gitInfo?.repoUrl || "",
+                                    gitRef: gitInfo?.latestRef || "",
                                     command: "ping 1.1.1.1",
                                     deploy: false,
                                     overlapTime: DEFAULT_OVERLAP_TIME,

package/src/deployManager/emergencyUpdateMain.ts

@@ -32,7 +32,7 @@ async function main() {
     let controller = new MachineServiceControllerBase();
     let commitMessage = `emergency update ${formatDateTime(Date.now())}`;
 
-    let gitInfo = await controller.getGitInfo();
+    let gitInfo = await getGitInfoAssert(controller);
     console.log(magenta(`Starting emergency update of ${gitInfo.repoUrl}`), {
         commitMessage,
         querysubUncommittedFiles: gitInfo.querysubUncommitted.length,
@@ -47,7 +47,7 @@ async function main() {
     }
 
     // Re-read, as publishing querysub updates our package.json, which then needs to be committed here
-    gitInfo = await controller.getGitInfo();
+    gitInfo = await getGitInfoAssert(controller);
     if (gitInfo.uncommitted.length > 0) {
         console.log(magenta(`Committing and pushing the service repo (${gitInfo.uncommitted.length} files changed)`));
         await controller.commitPushService(commitMessage);
@@ -56,7 +56,7 @@ async function main() {
     }
 
     // Re-read, as latestRef must include the commit we just pushed
-    gitInfo = await controller.getGitInfo();
+    gitInfo = await getGitInfoAssert(controller);
 
     let serviceIds = await controller.getServiceList();
     let configs: ServiceConfig[] = [];
@@ -92,4 +92,12 @@ async function main() {
     console.log(green(`Archives initialized`));
 }
 
+async function getGitInfoAssert(controller: MachineServiceControllerBase) {
+    let gitInfo = await controller.getGitInfo();
+    if (!gitInfo) {
+        throw new Error(`Expected git info for the emergency update, but getGitInfo returned undefined because this process is public (isPublic() is true). Run the emergency update without --public, from the repo you deploy from.`);
+    }
+    return gitInfo;
+}
+
 main().catch(logErrors).finally(() => process.exit());

package/src/deployManager/machineSchema.ts

@@ -1,6 +1,6 @@
 import { isNodeTrue, list, timeInDay, timeInMinute, timeInSecond } from "socket-function/src/misc";
 import { getArchives2 } from "../-a-archives/archives2";
-import { getDomain } from "../config";
+import { getDomain, isPublic } from "../config";
 import { archiveJSONT } from "../-a-archives/archivesJSONT";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { assertIsManagementUser } from "../diagnostics/managementPages";
@@ -442,6 +442,7 @@ export class MachineServiceControllerBase {
         return extractType(module, "ServiceConfig");
     }
     public async getGitInfo() {
+        if (isPublic()) return undefined;
         let repoUrl = await getGitURLLive();
         let uncommitted = await getGitUncommitted(".");
         let latestRef = await getLatestRefOnUpstreamBranch(".");