Skip to content

Commit

Permalink
fix: Resolve vulnerabilities in axios (#12470)
Browse files Browse the repository at this point in the history
Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Signed-off-by: Saravanan Balasubramanian <sarabala1979@gmail.com>
  • Loading branch information
terrytangyuan authored and sarabala1979 committed Jan 12, 2024
1 parent 309a3d8 commit 2350474
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ui/src/app/reports/components/reports.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ export class Reports extends BasePage<RouteComponentProps<any>, State> {
<p>
Use this page to find costly or time consuming workflows. You must label workflows you want to report on. If you use <b>workflow templates</b> or{' '}
<b>cron workflows</b>, your workflows will be automatically labelled. You'll probably need to enable the{' '}
<a href='https://argo-workflows.readthedocs.io/en/release-3.4/workflow-archive/'>workflow archive</a> to get long term data. Only the {limit} most recent workflows are
shown.
<a href='https://argo-workflows.readthedocs.io/en/release-3.4/workflow-archive/'>workflow archive</a> to get long term data. Only the {limit} most recent
workflows are shown.
</p>
<p>Select a namespace and at least one label to get a report.</p>
<p>
Expand Down
3 changes: 2 additions & 1 deletion ui/src/app/shared/components/cost-optimisation-nudge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Nudge} from './nudge';

export const CostOptimisationNudge = (props: {name: string; children: ReactNode}) => (
<Nudge key={'cost-optimization-nudge/' + props.name}>
<i className='fa fa-money-bill-alt status-icon--pending' /> {props.children} <a href='https://argo-workflows.readthedocs.io/en/release-3.4/cost-optimisation/'>Learn more</a>
<i className='fa fa-money-bill-alt status-icon--pending' /> {props.children}{' '}
<a href='https://argo-workflows.readthedocs.io/en/release-3.4/cost-optimisation/'>Learn more</a>
</Nudge>
);
3 changes: 2 additions & 1 deletion ui/src/app/shared/components/security-nudge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Nudge} from './nudge';

export const SecurityNudge = (props: {children: ReactNode}) => (
<Nudge key='security-nudge'>
<i className='fa fa-lock-open status-icon--failed' /> {props.children} <a href='https://argo-workflows.readthedocs.io/en/release-3.4/workflow-pod-security-context/'>Learn more</a>
<i className='fa fa-lock-open status-icon--failed' /> {props.children}{' '}
<a href='https://argo-workflows.readthedocs.io/en/release-3.4/workflow-pod-security-context/'>Learn more</a>
</Nudge>
);
50 changes: 45 additions & 5 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2419,12 +2419,12 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==

axios@^1.4.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
axios@1.6.4:
version "1.6.4"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.4.tgz#184ee1f63d412caffcf30d2c50982253c3ee86e0"
integrity sha512-heJnIs6N4aa1eSthhN9M5ioILu8Wi8vmQW9iHQ9NUvfkJb0lEEDUiIdQNAuBtfUt3FxReaKdpQA5DbmMOqzF/A==
dependencies:
follow-redirects "^1.15.0"
follow-redirects "^1.15.4"
form-data "^4.0.0"
proxy-from-env "^1.1.0"

Expand Down Expand Up @@ -4416,6 +4416,46 @@ follow-redirects@^1.0.0:
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.1.tgz#67a8f14f5a1f67f962c2c46469c79eaec0a90291"
dependencies:
debug "^3.1.0"
locate-path "^7.1.0"
path-exists "^5.0.0"

find-yarn-workspace-root@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
dependencies:
micromatch "^4.0.2"

flat-cache@^3.0.4:
version "3.2.0"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
dependencies:
flatted "^3.2.9"
keyv "^4.5.3"
rimraf "^3.0.2"

flat@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==

flatted@^3.2.9:
version "3.2.9"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==

follow-redirects@^1.0.0, follow-redirects@^1.15.4:
version "1.15.4"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==

for-each@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
dependencies:
is-callable "^1.1.3"

for-in@^1.0.2:
version "1.0.2"
Expand Down

0 comments on commit 2350474

Please sign in to comment.