Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5d69df4

Browse files
dario-piotrowiczedmundhung
dario-piotrowicz
and
edmundhung
authored
Refactor remote config related code (#10519)
* move diff logic to wrangler src utils * move `downloadWorkerConfig`, `mapBindings` and `assertNever` to utils * rename `mapBindings` to `mapWorkerMetadataBindings` and reorder args * add tsdoc comment to `downloadWorkerConfig` and rename+reorder its args * fix comment formatting * add tsdoc comment to `mapWorkerMetadataBindings` --------- Co-authored-by: Edmund Hung <[email protected]>
1 parent 3bdf86c commit 5d69df4

File tree

16 files changed

+523
-493
lines changed

16 files changed

+523
-493
lines changed

‎.changeset/little-windows-drive.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Slightly improve `wrangler init --from-dash` error message

‎.changeset/little-windows-tell.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Internally refactor diffing and `wrangler init --from-dash` logic

‎packages/wrangler/src/__tests__/init.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,10 +1136,10 @@ describe("init", () => {
11361136
).rejects.toThrowError();
11371137

11381138
expect(std.err).toMatchInlineSnapshot(`
1139-
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mError Occurred TypeError: Failed to fetch: Unable to fetch bindings, routes, or services metadata from the dashboard. Please try again later.[0m
1139+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mError Occurred: Unable to fetch bindings, routes, or services metadata from the dashboard. Please try again later.[0m
11401140
1141-
"
1142-
`);
1141+
"
1142+
`);
11431143
});
11441144

11451145
it("should not include migrations in config file when none are necessary", async () => {

‎packages/wrangler/src/api/startDevWorker/ProxyController.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import { handleRuntimeStdioWithStructuredLogs } from "../../dev/miniflare/stdio"
1515
import { getHttpsOptions } from "../../https-options";
1616
import { logger } from "../../logger";
1717
import { getSourceMappedStack } from "../../sourcemap";
18+
import { assertNever } from "../../utils/assert-never";
1819
import { Controller } from "./BaseController";
1920
import { castErrorCause } from "./events";
20-
import { assertNever, createDeferred } from "./utils";
21+
import { createDeferred } from "./utils";
2122
import type { EsbuildBundle } from "../../dev/use-esbuild";
2223
import type { ControllerEventMap } from "./BaseController";
2324
import type {

‎packages/wrangler/src/api/startDevWorker/utils.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import assert from "node:assert";
22
import { readFile } from "node:fs/promises";
3+
import { assertNever } from "../../utils/assert-never";
34
import type { ConfigBindingOptions } from "../../config";
45
import type { CfWorkerInit } from "../../deployment-bundle/worker";
56
import type {
@@ -40,8 +41,6 @@ export function createDeferred<T>(
4041
};
4142
}
4243

43-
export function assertNever(_value: never) {}
44-
4544
export function urlFromParts(
4645
parts: Partial<URL>,
4746
base = "http://localhost"

‎packages/wrangler/src/cloudchamber/apply.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import { formatConfigSnippet } from "../config";
2727
import { configRolloutStepsToAPI } from "../containers/deploy";
2828
import { FatalError, UserError } from "../errors";
2929
import { getAccountId } from "../user";
30+
import { Diff } from "../utils/diff";
3031
import {
3132
sortObjectRecursive,
3233
stripUndefined,
3334
} from "../utils/sortObjectRecursive";
3435
import { promiseSpinner } from "./common";
35-
import { Diff } from "./helpers/diff";
3636
import { cleanForInstanceType } from "./instance-type/instance-type";
3737
import type { Config } from "../config";
3838
import type { ContainerApp, Observability } from "../config/environment";

‎packages/wrangler/src/containers/deploy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import {
2020
RolloutsService,
2121
} from "@cloudflare/containers-shared";
2222
import { promiseSpinner } from "../cloudchamber/common";
23-
import { Diff } from "../cloudchamber/helpers/diff";
2423
import { inferInstanceType } from "../cloudchamber/instance-type/instance-type";
2524
import { formatConfigSnippet } from "../config";
2625
import { FatalError, UserError } from "../errors";
2726
import { getAccountId } from "../user";
27+
import { Diff } from "../utils/diff";
2828
import {
2929
sortObjectRecursive,
3030
stripUndefined,

‎packages/wrangler/src/deploy/config-diffs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { green, red } from "@cloudflare/cli/colors";
2-
import { Diff } from "../cloudchamber/helpers/diff";
32
import { getResolvedWorkersDev } from "../triggers/deploy";
3+
import { Diff } from "../utils/diff";
44
import type { Config, RawConfig } from "../config";
55

66
/**

‎packages/wrangler/src/deploy/deploy.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import { getMigrationsToUpload } from "../durable";
2828
import { getDockerPath } from "../environment-variables/misc-variables";
2929
import { UserError } from "../errors";
3030
import { getFlag } from "../experimental-flags";
31-
import { downloadWorkerConfig } from "../init";
3231
import { logger } from "../logger";
3332
import { getMetricsUsageHeaders } from "../metrics";
3433
import { isNavigatorDefined } from "../navigator-user-agent";
@@ -48,6 +47,7 @@ import {
4847
} from "../sourcemap";
4948
import triggersDeploy from "../triggers/deploy";
5049
import { formatCompatibilityDate } from "../utils/compatibility-date";
50+
import { downloadWorkerConfig } from "../utils/download-worker-config";
5151
import { helpIfErrorIsSizeOrScriptStartup } from "../utils/friendly-validator-errors";
5252
import { printBindings } from "../utils/print-bindings";
5353
import { retryOnAPIFailure } from "../utils/retry";
@@ -387,10 +387,10 @@ export default async function deploy(props: Props): Promise<{
387387
let configDiff: ReturnType<typeof getRemoteConfigDiff> | undefined;
388388
if (getFlag("DEPLOY_REMOTE_DIFF_CHECK")) {
389389
const remoteWorkerConfig = await downloadWorkerConfig(
390-
accountId,
391390
name,
391+
serviceMetaData.default_environment.environment,
392392
entry.file,
393-
serviceMetaData.default_environment.environment
393+
accountId
394394
);
395395

396396
configDiff = getRemoteConfigDiff(remoteWorkerConfig, {

‎packages/wrangler/src/deployments.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { fetchResult } from "./cfetch";
66
import { configFileName, readConfig } from "./config";
77
import { confirm, prompt } from "./dialogs";
88
import { UserError } from "./errors";
9-
import { mapBindings } from "./init";
109
import { logger } from "./logger";
1110
import * as metrics from "./metrics";
1211
import { requireAuth } from "./user";
1312
import { getScriptName } from "./utils/getScriptName";
13+
import { mapWorkerMetadataBindings } from "./utils/map-worker-metadata-bindings";
1414
import { printWranglerBanner } from "./wrangler-banner";
1515
import type { Config } from "./config";
1616
import type { WorkerMetadataBinding } from "./deployment-bundle/create-worker-upload-form";
@@ -332,10 +332,10 @@ Handlers: ${
332332
${
333333
bindings.length > 0
334334
? TOML.stringify(
335-
(await mapBindings(
336-
complianceConfig,
335+
(await mapWorkerMetadataBindings(
336+
bindings,
337337
accountId,
338-
bindings
338+
complianceConfig
339339
)) as TOML.JsonMap
340340
)
341341
: `None`

0 commit comments

Comments
 (0)