@highstate/common 0.6.1 → 0.7.0

package/dist/existing-server/index.js

@@ -3,7 +3,7 @@ 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-D_6u85qC.js';
+import { c as createSshTerminal } from '../ssh-CNgI5FJI.js';
 
 const { args, inputs, secrets, outputs } = forUnit(common.existingServer);
 const privateKey = inputs.sshKeyPair?.privateKey ?? secrets.sshPrivateKey;
@@ -20,25 +20,25 @@ const hostnameResult = new remote.Command("hostname", {
   triggers: [Date.now()]
 });
 const hostname = hostnameResult.stdout.apply((x) => x.trim());
-const sshCredentials = output({
-  user: args.sshUser,
-  port: args.sshPort,
-  password: secrets.sshPassword,
-  privateKey
+const server = output({
+  endpoint: args.endpoint,
+  hostname,
+  sshCredentials: {
+    user: args.sshUser,
+    port: args.sshPort,
+    password: secrets.sshPassword,
+    privateKey
+  }
 });
 var index = outputs({
-  server: {
-    endpoint: args.endpoint,
-    hostname,
-    sshCredentials
-  },
+  server,
   $status: {
     hostname: {
       value: hostname
     }
   },
   $terminals: {
-    ssh: sshCredentials.apply((credentials) => createSshTerminal(credentials, args.endpoint))
+    ssh: server.apply(createSshTerminal)
   }
 });
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { types, remote } from '@pulumi/command';
 import { Input, Output, InputOrArray, Resource, ComponentResource, ResourceOptions, Unwrap, InstanceTerminal } from '@highstate/pulumi';
-import { common, ssh } from '@highstate/library';
+import { common } from '@highstate/library';
 
 declare function getServerConnection(server: Input<common.Server>): Output<types.input.remote.ConnectionArgs>;
 interface CommandOptions {
@@ -57,6 +57,6 @@ declare abstract class DnsRecord extends ComponentResource {
 
 declare function generatePassword(): string;
 
-declare function createSshTerminal(credentials: ssh.Credentials, fallbackEndpoint: string): InstanceTerminal;
+declare function createSshTerminal(server: common.Server): InstanceTerminal;
 
 export { type CommandOptions, DnsRecord, type DnsRecordArgs, Server, createSshTerminal, generatePassword, getServerConnection };

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-D_6u85qC.js';
+export { c as createSshTerminal } from './ssh-CNgI5FJI.js';
 
 function getServerConnection(server) {
   return output(server).apply((server2) => ({

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

@@ -1,15 +1,15 @@
-function createSshTerminal(credentials, fallbackEndpoint) {
+function createSshTerminal(server) {
   const command = ["ssh", "-tt", "-o", "StrictHostKeyChecking=no"];
-  if (credentials.port) {
-    command.push("-p", credentials.port.toString());
+  if (server.sshCredentials?.port) {
+    command.push("-p", server.sshCredentials.port.toString());
   }
-  if (credentials.privateKey) {
+  if (server.sshCredentials?.privateKey) {
     command.push("-i", "/private-key");
   }
-  const endpoint = credentials.endpoint ?? fallbackEndpoint;
-  const user = credentials.user ?? "root";
+  const endpoint = server.sshCredentials?.endpoint ?? server.endpoint;
+  const user = server.sshCredentials?.user ?? "root";
   command.push(`${user}@${endpoint}`);
-  if (credentials.password) {
+  if (server.sshCredentials?.password) {
     command.unshift("sshpass", "-f", "/password");
   }
   return {
@@ -19,9 +19,9 @@ function createSshTerminal(credentials, fallbackEndpoint) {
     image: "ghcr.io/exeteres/highstate/terminal-ssh",
     command,
     files: {
-      "/password": credentials.password,
+      "/password": server.sshCredentials?.password,
       "/private-key": {
-        content: credentials.privateKey,
+        content: server.sshCredentials?.privateKey,
         mode: 384
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/common",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "type": "module",
   "files": [
     "dist"
@@ -22,7 +22,7 @@
     "build": "pkgroll --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
-    "@highstate/pulumi": "^0.6.1",
+    "@highstate/pulumi": "^0.7.0",
     "@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": "afe736f7e93b7fcfbae97e2d6e35b07175a8fc76"
+  "gitHead": "2f5227f7b88cf38946e490fc4cdb96127bd8b174"
 }