Skip to content

Commit 7d2b6c8

Browse files
authored
Merge pull request #1487 from snyk/staging
RELEASE
2 parents 77f4355 + bd0d1bb commit 7d2b6c8

File tree

5 files changed

+43
-57
lines changed

5 files changed

+43
-57
lines changed

.circleci/config.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- prodsec/security_scans:
2626
mode: auto
2727
release-branch: master
28+
open-source-additional-arguments: --exclude=test
2829
aks_integration_tests:
2930
docker:
3031
- image: cimg/node:18.19.1
@@ -326,18 +327,6 @@ jobs:
326327
echo "export IMAGE_NAME_APPROVED_UBI9=${IMAGE_NAME_APPROVED_UBI9}" >> $BASH_ENV
327328
echo "export IMAGE_NAME_PUBLISHED_UBI9=${IMAGE_NAME_PUBLISHED_UBI9}" >> $BASH_ENV
328329
name: Export environment variables
329-
- snyk/scan:
330-
additional-arguments: --all-projects --exclude=test
331-
fail-on-issues: true
332-
monitor-on-build: true
333-
severity-threshold: high
334-
token-variable: SNYK_TOKEN
335-
- snyk/scan:
336-
command: code test
337-
fail-on-issues: true
338-
monitor-on-build: true
339-
severity-threshold: high
340-
token-variable: SNYK_TOKEN
341330
- snyk/scan:
342331
additional-arguments: --project-name=alpine --policy-path=.snyk
343332
command: container test
@@ -432,18 +421,6 @@ jobs:
432421
- run:
433422
command: npm ci
434423
- install_python_requests
435-
- snyk/scan:
436-
additional-arguments: --all-projects --exclude=test
437-
fail-on-issues: true
438-
monitor-on-build: false
439-
severity-threshold: high
440-
token-variable: SNYK_TOKEN
441-
- snyk/scan:
442-
command: code test
443-
fail-on-issues: true
444-
monitor-on-build: false
445-
severity-threshold: high
446-
token-variable: SNYK_TOKEN
447424
- run:
448425
command: |
449426
npm run build &&

.snyk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
22
version: v1.25.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
4-
ignore:
5-
SNYK-JS-INFLIGHT-6095116:
6-
- '*':
7-
reason: Needs some work to remove the dependency and need to release a fix. The ignore window is short.
8-
expires: 2023-12-02T14:33:00.260Z
9-
created: 2023-12-01T14:33:00.260Z
4+
ignore: {}
105
patch: {}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN adduser -S -G snyk -h /srv/app -u 10001 snyk
3434

3535
# Install gcloud
3636
RUN curl -sL https://sdk.cloud.google.com > /install.sh
37-
RUN bash /install.sh --disable-prompts --install-dir=/ && rm /google-cloud-sdk/bin/anthoscli && rm -rf /google-cloud-sdk/platform
37+
RUN bash /install.sh --disable-prompts --install-dir=/ && rm -rf /google-cloud-sdk/platform
3838
ENV PATH=/google-cloud-sdk/bin:$PATH
3939
RUN rm /install.sh
4040
RUN apk del curl bash

package-lock.json

Lines changed: 35 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@kubernetes/client-node": "^0.20.0",
3838
"@snyk/dep-graph": "^2.8.1",
3939
"async": "^3.2.5",
40-
"aws-sdk": "^2.1602.0",
40+
"aws-sdk": "^2.1616.0",
4141
"bunyan": "^1.8.15",
4242
"child-process-promise": "^2.2.1",
4343
"fastq": "^1.17.1",
@@ -47,11 +47,11 @@
4747
"packageurl-js": "^1.2.1",
4848
"sleep-promise": "^9.1.0",
4949
"snyk-config": "5.3.0",
50-
"snyk-docker-plugin": "6.10.3",
50+
"snyk-docker-plugin": "6.11.0",
5151
"source-map-support": "^0.5.21",
5252
"tunnel": "0.0.6",
53-
"typescript": "4.7.4",
54-
"yaml": "^2.4.1"
53+
"typescript": "4.9.5",
54+
"yaml": "^2.4.2"
5555
},
5656
"devDependencies": {
5757
"@commitlint/cli": "^17.8.1",
@@ -61,7 +61,7 @@
6161
"@types/jest": "^26.0.24",
6262
"@types/lru-cache": "^5.1.1",
6363
"@types/needle": "^2.5.3",
64-
"@types/node": "^16.18.96",
64+
"@types/node": "^16.18.97",
6565
"@types/source-map-support": "^0.5.10",
6666
"@types/tunnel": "0.0.2",
6767
"@typescript-eslint/eslint-plugin": "^4.33.0",

0 commit comments

Comments
 (0)