-
Notifications
You must be signed in to change notification settings - Fork 3.4k
fix: filter large user-supplied config values from the cloud API #32957
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tgriesser
wants to merge
9
commits into
develop
Choose a base branch
from
tgriesser/fix/filter-large-user-supplied-values
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+85
−21
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
24dc326
fix: filter large user-supplied config values from the cloud API
tgriesser 7c1c09b
fix test failures
tgriesser 4514288
add changelog entry, retain truthy values
tgriesser a04ec72
Merge branch 'develop' into tgriesser/fix/filter-large-user-supplied-…
tgriesser 186b513
address PR review
tgriesser 0a7bd3c
Merge branch 'develop' into tgriesser/fix/filter-large-user-supplied-…
tgriesser fe031c7
fix typo [ci skip]
tgriesser a10648c
update PR feedback
tgriesser dd67d03
fix tests after dropping resolved
tgriesser File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,29 @@ | ||
| import _ from 'lodash' | ||
| import type { ResolvedFromConfig } from '@packages/types' | ||
| import * as configUtils from '@packages/config' | ||
|
|
||
| export const setUrls = configUtils.setUrls | ||
|
|
||
| export function getResolvedRuntimeConfig (config, runtimeConfig) { | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed this as it's no longer needed if we're dropping |
||
| const resolvedRuntimeFields = _.mapValues(runtimeConfig, (v): ResolvedFromConfig => ({ value: v, from: 'runtime' })) | ||
| // Strips out values that can be aribitrarily sized / are duplicated from config | ||
| // payload sent for recording | ||
| export function filterRuntimeConfigForRecording (config) { | ||
| const { rawJson, devServer, env, resolved, ...configRest } = config | ||
| const { webpackConfig, viteConfig, ...devServerRest } = devServer ?? {} | ||
| const resultConfig = { ...configRest } | ||
|
|
||
| return { | ||
| ...config, | ||
| ...runtimeConfig, | ||
| resolved: { ...config.resolved, ...resolvedRuntimeFields }, | ||
| if (env) { | ||
| resultConfig.env = _.mapValues(env ?? {}, (val, key) => `omitted: ${typeof val}`) | ||
| } | ||
|
|
||
| if (devServer) { | ||
| resultConfig.devServer = { ...devServerRest } | ||
| if (typeof webpackConfig !== 'undefined') { | ||
| resultConfig.devServer.webpackConfig = `omitted` | ||
tgriesser marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| if (typeof viteConfig !== 'undefined') { | ||
| resultConfig.devServer.viteConfig = `omitted` | ||
| } | ||
| } | ||
|
|
||
| return resultConfig | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.