Merge branch 'thyeggman/resolve-eslint-rule-violations' of https://github.com/github/vscode-github-actions into thyeggman/resolve-eslint-rule-violations

thyeggman · thyeggman · commit ef63039376be · 2022-10-13T13:28:43.000-07:00
diff --git a/@types/ssh-config.d.ts b/@types/ssh-config.d.ts
@@ -0,0 +1,22 @@
+/**
+ * SSH Config interface
+ *
+ * Note that this interface atypically capitalizes field names. This is for consistency
+ * with SSH config files.
+ */
+
+/**
+ * ConfigResolvers take a config, resolve some additional data (perhaps using
+ * a config file), and return a new Config.
+ */
+declare module 'ssh-config' {
+  export type ConfigResolver = (config: Config) => Config;
+
+  export type Config = Record<string, string>;
+
+  export class SSHConfig {
+    compute: (host: string) => Config;
+  }
+
+  export function parse(config: string): SSHConfig;
+}
diff --git a/src/external/ssh.ts b/src/external/ssh.ts
@@ -1,29 +1,8 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import {parse as parseConfig} from 'ssh-config';
+import {parse as parseConfig, Config, ConfigResolver} from 'ssh-config';
 
 const SSH_URL_RE = /^(?:([^@:]+)@)?([^:/]+):?(.+)$/;
 const URL_SCHEME_RE = /^([a-z-]+):\/\//;
 
-/**
- * SSH Config interface
- *
- * Note that this interface atypically capitalizes field names. This is for consistency
- * with SSH config files.
- */
-export interface Config {
-  Host: string;
-  [param: string]: string;
-}
-
-/**
- * ConfigResolvers take a config, resolve some additional data (perhaps using
- * a config file), and return a new Config.
- */
-export type ConfigResolver = (config: Config) => Config;
-
 /**
  * Parse and resolve an SSH url. Resolves host aliases using the configuration
  * specified by ~/.ssh/config, if present.
diff --git a/src/typings/ref.d.ts b/src/typings/ref.d.ts
@@ -1,7 +1,6 @@
 /// <reference path='./git.d.ts'/>
 
 declare module 'tunnel';
-declare module 'ssh-config';
 
 declare module 'atob';
 declare module 'btoa';
