@highstate/common 0.5.5 → 0.6.1

package/dist/existing-server/index.js

@@ -3,16 +3,17 @@ import { forUnit, output } from '@highstate/pulumi';
 import { remote } from '@pulumi/command';
 import '@noble/hashes/utils';
 import 'micro-key-producer/password.js';
-import { c as createSshTerminal } from '../ssh-XS5DEPfW.js';
+import { c as createSshTerminal } from '../ssh-D_6u85qC.js';
 
-const { args, secrets, outputs } = forUnit(common.existingServer);
+const { args, inputs, secrets, outputs } = forUnit(common.existingServer);
+const privateKey = inputs.sshKeyPair?.privateKey ?? secrets.sshPrivateKey;
 const hostnameResult = new remote.Command("hostname", {
   connection: output({
     host: args.endpoint,
     port: args.sshPort,
     user: args.sshUser,
     password: secrets.sshPassword,
-    privateKey: secrets.sshPrivateKey,
+    privateKey,
     dialErrorLimit: 3
   }),
   create: "hostname",
@@ -23,7 +24,7 @@ const sshCredentials = output({
   user: args.sshUser,
   port: args.sshPort,
   password: secrets.sshPassword,
-  privateKey: secrets.sshPrivateKey
+  privateKey
 });
 var index = outputs({
   server: {

package/dist/index.js

@@ -3,7 +3,7 @@ import { output, ComponentResource } from '@highstate/pulumi';
 import '@highstate/library';
 import { randomBytes } from '@noble/hashes/utils';
 import { secureMask } from 'micro-key-producer/password.js';
-export { c as createSshTerminal } from './ssh-XS5DEPfW.js';
+export { c as createSshTerminal } from './ssh-D_6u85qC.js';
 
 function getServerConnection(server) {
   return output(server).apply((server2) => ({
@@ -11,7 +11,7 @@ function getServerConnection(server) {
     port: server2.sshCredentials?.port ?? 22,
     user: server2.sshCredentials?.user ?? "root",
     password: server2.sshCredentials?.password,
-    privateKey: server2.sshCredentials?.keyPair?.privateKey,
+    privateKey: server2.sshCredentials?.privateKey,
     dialErrorLimit: 3
   }));
 }

package/dist/{ssh-XS5DEPfW.js → ssh-D_6u85qC.js}

@@ -3,7 +3,7 @@ function createSshTerminal(credentials, fallbackEndpoint) {
   if (credentials.port) {
     command.push("-p", credentials.port.toString());
   }
-  if (credentials.keyPair) {
+  if (credentials.privateKey) {
     command.push("-i", "/private-key");
   }
   const endpoint = credentials.endpoint ?? fallbackEndpoint;
@@ -20,7 +20,10 @@ function createSshTerminal(credentials, fallbackEndpoint) {
     command,
     files: {
       "/password": credentials.password,
-      "/private-key": credentials.keyPair?.privateKey
+      "/private-key": {
+        content: credentials.privateKey,
+        mode: 384
+      }
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/common",
-  "version": "0.5.5",
+  "version": "0.6.1",
   "type": "module",
   "files": [
     "dist"
@@ -22,7 +22,7 @@
     "build": "pkgroll --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
-    "@highstate/pulumi": "^0.5.5",
+    "@highstate/pulumi": "^0.6.1",
     "@noble/hashes": "^1.7.1",
     "@pulumi/command": "^1.0.2",
     "micro-key-producer": "^0.7.3"
@@ -33,5 +33,5 @@
   "devDependencies": {
     "pkgroll": "^2.5.1"
   },
-  "gitHead": "daed8a1121d6dc0af8ed92261962356dad2325aa"
+  "gitHead": "afe736f7e93b7fcfbae97e2d6e35b07175a8fc76"
 }