Skip to content

Commit

Permalink
Update eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
nktpro committed Apr 16, 2024
1 parent f5ae711 commit 42cc2a9
Show file tree
Hide file tree
Showing 15 changed files with 35 additions and 32 deletions.
7 changes: 7 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ module.exports = tseslint.config(
files: ["**/*.ts"],
rules: {
"@typescript-eslint/await-thenable": "error",
"@typescript-eslint/switch-exhaustiveness-check": "error",
"@typescript-eslint/use-unknown-in-catch-callback-variable": "error",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/no-misused-promises": "error",
"@typescript-eslint/require-await": "error",
"@typescript-eslint/no-floating-promises": "error",
"@typescript-eslint/prefer-promise-reject-errors": "error"
},
languageOptions: {
parserOptions: {
Expand Down
4 changes: 2 additions & 2 deletions examples/multi/multi-1.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ServerInstanceConfig } from "../../src/types.ts";
import type { ServerInstanceConfig } from "../../src/types.ts";

export default {
role: "server",
Expand All @@ -8,7 +8,7 @@ export default {
cpus: 15,
memoryGiBs: 50,
diskGiBs: 200,
k3sVersion: "v1.28.7+k3s1",
k3sVersion: "v1.24.17+k3s1",
serviceCidr: "10.254.244.0/22",
clusterCidr: "10.254.248.0/21",
clusterDnsIp: "10.254.244.10",
Expand Down
2 changes: 1 addition & 1 deletion examples/multi/multi-2.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ServerInstanceConfig } from "../../src/types.ts";
import type { ServerInstanceConfig } from "../../src/types.ts";
import serverInstanceConfig from "./multi-1.ts";

export default {
Expand Down
2 changes: 1 addition & 1 deletion examples/multi/multi-3.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ServerInstanceConfig } from "../../src/types.ts";
import type { ServerInstanceConfig } from "../../src/types.ts";
import serverInstanceConfig from "./multi-1.ts";

export default {
Expand Down
2 changes: 1 addition & 1 deletion examples/multi/multi-4.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AgentInstanceConfig } from "../../src/types.ts";
import type { AgentInstanceConfig } from "../../src/types.ts";
import serverInstanceConfig from "./multi-3.ts";

export default {
Expand Down
2 changes: 1 addition & 1 deletion examples/multi/multi-5.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AgentInstanceConfig } from "../../src/types.ts";
import type { AgentInstanceConfig } from "../../src/types.ts";
import agentInstanceConfig from "./multi-4.ts";

export default {
Expand Down
2 changes: 1 addition & 1 deletion examples/multi/multi-6.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AgentInstanceConfig } from "../../src/types.ts";
import type { AgentInstanceConfig } from "../../src/types.ts";
import agentInstanceConfig from "./multi-4.ts";

export default {
Expand Down
2 changes: 1 addition & 1 deletion examples/multi/multi-7.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AgentInstanceConfig } from "../../src/types.ts";
import type { AgentInstanceConfig } from "../../src/types.ts";
import agentInstanceConfig from "./multi-4.ts";

export default {
Expand Down
2 changes: 1 addition & 1 deletion examples/single/single.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ServerInstanceConfig } from "../../src/types.ts";
import type { ServerInstanceConfig } from "../../src/types.ts";

export default {
role: "server",
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/actions/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import {
multipassTailCloudInitOutputLog,
multipassWaitForState,
} from "../multipass.ts";
import { InstanceConfig, InstanceConfigPathSchema, InstanceState, ServerInstanceConfig } from "../types.ts";
import type { InstanceConfig, ServerInstanceConfig } from "../types.ts";
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
import {
createCloudInitConfig,
err,
Expand Down
3 changes: 2 additions & 1 deletion src/actions/destroy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createCliAction, cyan, ExitCode, resolvePath, Type, yellow } from "../deps.ts";
import { multipass, multipassInfo, multipassK3sKillAll, multipassStop, multipassUnroute } from "../multipass.ts";
import { InstanceConfig, InstanceConfigPathSchema, InstanceState } from "../types.ts";
import type { InstanceConfig } from "../types.ts";
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
import { getExternalIp, loadInstanceConfig, log, ok } from "../utils.ts";

export async function destroyInstance(instance: InstanceConfig) {
Expand Down
6 changes: 3 additions & 3 deletions src/multipass.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { StdInputBehavior, StdOutputBehavior } from "./deps.ts";
import {
assertExists,
captureExec,
Expand All @@ -11,11 +12,10 @@ import {
NonZeroExitError,
printErrLines,
printOutLines,
StdInputBehavior,
StdOutputBehavior,
validate,
} from "./deps.ts";
import { InstanceConfig, InstanceState, JoinMetadata, MultipassInfo, ServerInstanceConfig } from "./types.ts";
import type { InstanceConfig, JoinMetadata, ServerInstanceConfig } from "./types.ts";
import { InstanceState, MultipassInfo } from "./types.ts";
import { err, getExternalIp, log, ok, print } from "./utils.ts";

export const multipassBin = memoizePromise(() => locateBin("multipass"));
Expand Down
3 changes: 2 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { FlexObject, NonEmptyString, PosInt, Static, Type } from "./deps/typebox.ts";
import type { Static } from "./deps/typebox.ts";
import { FlexObject, NonEmptyString, PosInt, Type } from "./deps/typebox.ts";

export const Cidr = NonEmptyString({
pattern: "^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))$",
Expand Down
15 changes: 4 additions & 11 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import {
dirname,
green,
NonZeroExitError,
printErrLines,
printOutLines,
resolvePath,
validate,
ValueError,
} from "./deps.ts";
import type { ValueError } from "./deps.ts";
import { dirname, green, NonZeroExitError, printErrLines, printOutLines, resolvePath, validate } from "./deps.ts";
import { fsExists, gray, inheritExec, joinPath, red, stringifyYaml } from "./deps.ts";
import { AgentInstanceConfigSchema, InstanceConfig, JoinMetadataSchema, ServerInstanceConfigSchema } from "./types.ts";
import type { InstanceConfig } from "./types.ts";
import { AgentInstanceConfigSchema, JoinMetadataSchema, ServerInstanceConfigSchema } from "./types.ts";
import cloudInitScripts from "./cloud_init_scripts.json" with { type: "json" };

function renderValidationError(error: ValueError) {
Expand Down

0 comments on commit 42cc2a9

Please sign in to comment.