Skip to content

Commit c95d96c

Browse files
committed
tmp
1 parent 1582e38 commit c95d96c

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

packages/wrangler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false \"pnpm tsup --watch src --watch ../containers-shared/src\" \"pnpm run check:type --watch --preserveWatchOutput\"",
5959
"generate-json-schema": "node -r esbuild-register scripts/generate-json-schema.ts",
6060
"start": "pnpm run build && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
61-
"test": "dotenv -- pnpm run assert-git-version && dotenv -- vitest",
61+
"test": "dotenv -- pnpm run assert-git-version && dotenv -- vitest --silent=false",
6262
"test:ci": "pnpm run test run",
6363
"test:debug": "pnpm run test --silent=false --verbose=true",
6464
"test:e2e": "dotenv -- vitest run -c ./e2e/vitest.config.mts",

packages/wrangler/src/config/validation.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,13 +2749,6 @@ function validateContainerApp(
27492749
}
27502750

27512751
if ("wrangler_ssh" in containerAppOptional) {
2752-
validateAdditionalProperties(
2753-
diagnostics,
2754-
`${field}.wrangler_ssh`,
2755-
Object.keys(containerAppOptional.wrangler_ssh),
2756-
["enabled", "port"]
2757-
);
2758-
27592752
if (
27602753
!isRequiredProperty(
27612754
containerAppOptional.wrangler_ssh,
@@ -2800,13 +2793,6 @@ function validateContainerApp(
28002793
const fieldPath = `${field}.authorized_keys[${index}]`;
28012794
const key = containerAppOptional.authorized_keys[index];
28022795

2803-
validateAdditionalProperties(
2804-
diagnostics,
2805-
fieldPath,
2806-
Object.keys(key),
2807-
["name", "public_key"]
2808-
);
2809-
28102796
if (!isRequiredProperty(key, "name", "string")) {
28112797
diagnostics.errors.push(`${fieldPath}.name must be a string`);
28122798
}

packages/wrangler/src/containers/containers.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,47 +167,47 @@ export function sshYargs(args: CommonYargsArgv) {
167167
})
168168
// Following are SSH flags that should be directly passed in
169169
.option("cipher", {
170-
describe: "SSH option for cipher_spec (-c)",
170+
describe: "SSH option for cipher_spec",
171171
type: "string",
172172
})
173173
.option("log-file", {
174-
describe: "SSH option for log_file (-c)",
174+
describe: "SSH option for log_file",
175175
type: "string",
176176
})
177177
.option("escape-char", {
178-
describe: "SSH option for escape_char (-e)",
178+
describe: "SSH option for escape_char",
179179
type: "string",
180180
})
181181
.option("config-file", {
182-
describe: "SSH option for config-file (-F)",
182+
describe: "SSH option for config-file",
183183
type: "string",
184184
})
185185
.option("pkcs11", {
186-
describe: "SSH option for pkcs11 (-I)",
186+
describe: "SSH option for pkcs11",
187187
type: "string",
188188
})
189189
.option("identity-file", {
190-
describe: "SSH option for identity_file (-i)",
190+
describe: "SSH option for identity_file",
191191
type: "string",
192192
})
193193
.option("mac-spec", {
194-
describe: "SSH option for mac_spec (-m)",
194+
describe: "SSH option for mac_spec",
195195
type: "string",
196196
})
197197
.option("ctl-cmd", {
198-
describe: "SSH option for ctl_cmd (-O)",
198+
describe: "SSH option for ctl_cmd",
199199
type: "string",
200200
})
201201
.option("option", {
202-
describe: "SSH option for option (-o)",
202+
describe: "SSH option for option",
203203
type: "string",
204204
})
205205
.option("tag", {
206-
describe: "SSH option for tag (-P)",
206+
describe: "SSH option for tag",
207207
type: "string",
208208
})
209209
.option("ctl-path", {
210-
describe: "SSH option for ctl_path (-S)",
210+
describe: "SSH option for ctl_path",
211211
type: "string",
212212
})
213213
);

0 commit comments

Comments
 (0)