ci: merge staging to master

npmDepsHash

@@ -1 +1 @@
-sha256-NYzadQBEN6ZbZfdSnW9aoW77InHvL8oL0joXcrs1ktI=
+sha256-Ud5IBToO1LXjvPkAyw+oc2m9EFbwtHvvyVO2Y2BdZwg=

package.json

@@ -153,7 +153,7 @@
     "nexpect": "^0.6.0",
     "node-gyp-build": "^4.4.0",
     "nodemon": "^3.0.1",
-    "polykey": "^1.17.4",
+    "polykey": "^1.18.0",
     "prettier": "^3.0.0",
     "shelljs": "^0.8.5",
     "shx": "^0.3.4",

src/secrets/CommandCat.ts

@@ -123,7 +123,7 @@ class CommandGet extends CommandPolykey {
                 break;
               default:
                 never(
-                  `Expected "SuccessMessage" or "ContentMessage", got ${type}`,
+                  `Expected "SuccessMessage" or "ErrorMessage", got ${type}`,
                 );
             }
           }

src/secrets/CommandCreate.ts

@@ -1,4 +1,5 @@
 import type PolykeyClient from 'polykey/dist/PolykeyClient';
+import path from 'path';
 import * as errors from '../errors';
 import CommandPolykey from '../CommandPolykey';
 import * as binUtils from '../utils';
@@ -27,6 +28,7 @@ class CommandCreate extends CommandPolykey {
       const { default: PolykeyClient } = await import(
         'polykey/dist/PolykeyClient'
       );
+      const { never } = await import('polykey/dist/utils');
       const clientOptions = await binProcessors.processClientOptions(
         options.nodePath,
         options.nodeId,
@@ -68,16 +70,49 @@ class CommandCreate extends CommandPolykey {
             cause: e,
           });
         }
-        await binUtils.retryAuthentication(
-          (auth) =>
-            pkClient.rpcClient.methods.vaultsSecretsNew({
-              metadata: auth,
-              nameOrId: secretPath[0],
-              secretName: secretPath[1] ?? '/',
-              secretContent: content.toString('binary'),
-            }),
-          meta,
-        );
+        await binUtils.retryAuthentication(async (auth) => {
+          // Make sure the path exists
+          const response =
+            await pkClient.rpcClient.methods.vaultsSecretsMkdir();
+          const writer = response.writable.getWriter();
+          await writer.write({
+            nameOrId: secretPath[0],
+            dirName: path.dirname(secretPath[1] ?? '/'),
+            metadata: { ...auth, options: { recursive: true } },
+          });
+          await writer.close();
+          for await (const chunk of response.readable) {
+            const type = chunk.type;
+            switch (type) {
+              case 'SuccessMessage':
+                // No special action required if mkdir succeeds
+                break;
+              case 'ErrorMessage':
+                // This operation can only fail if a file already exists at the
+                // target location. No other error should happen.
+                if (chunk.code === 'EEXIST') {
+                  throw new errors.ErrorPolykeyCLIMakeDirectory(
+                    `A file already exists at path ${chunk.reason}`,
+                  );
+                } else {
+                  throw new errors.ErrorPolykeyCLIMakeDirectory(
+                    `Failed to create directory ${chunk.reason} (${chunk.code})`,
+                  );
+                }
+              default:
+                never(
+                  `Expected "SuccessMessage" or "ErrorMessage", got ${type}`,
+                );
+            }
+          }
+          // Write the contents
+          await pkClient.rpcClient.methods.vaultsSecretsWriteFile({
+            metadata: auth,
+            nameOrId: secretPath[0],
+            secretName: secretPath[1] ?? '/',
+            secretContent: content.toString('binary'),
+          });
+        }, meta);
       } finally {
         if (pkClient! != null) await pkClient.stop();
       }

src/secrets/CommandEdit.ts

@@ -110,7 +110,7 @@ class CommandEdit extends CommandPolykey {
                     break;
                   default:
                     never(
-                      `Expected "SuccessMessage" or "ContentMessage", got ${type}`,
+                      `Expected "SuccessMessage" or "ErrorMessage", got ${type}`,
                     );
                 }
               }

tests/secrets/create.test.ts

@@ -93,7 +93,7 @@ describe('commandCreateSecret', () => {
     expect(result.exitCode).not.toBe(0);
     // The root directory is already defined so we can't create a new secret
     // at path `vault:/`.
-    expect(result.stderr).toInclude('ErrorSecretsSecretDefined');
+    expect(result.stderr).toInclude('ErrorSecretsIsDirectory');
   });
   test.prop([fileNameArb, fileNameArb, envVariableArb], { numRuns: 10 })(
     'secrets handle unix style paths for secrets',