Skip to content

Commit d11ba62

Browse files
dkontorovskyydkontorovskyy
authored
Merge pull request #825 from snyk/fix/replace-uuid
fix: replace uuid package with native crypto
2 parents 99250ae + ea9524c commit d11ba62

File tree

9 files changed

+12894
-3293
lines changed

9 files changed

+12894
-3293
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ commands:
3030
npm install
3131
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
3232
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
33-
echo 'nvm use 16' >> $BASH_ENV
33+
echo 'nvm alias default v16' >> $BASH_ENV
3434
jobs:
3535
aks_integration_tests:
3636
machine:
3737
docker_layer_caching: true
38-
enabled: true
3938
image: ubuntu-2004:202010-01
4039
steps:
4140
- checkout
@@ -46,10 +45,6 @@ jobs:
4645
name: Create temp dir for logs
4746
- run:
4847
command: |
49-
export NVM_DIR="/opt/circleci/.nvm"
50-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
51-
nvm install v16
52-
npm install
5348
export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
5449
.circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:aks:yaml
5550
name: Integration tests AKS
@@ -107,7 +102,6 @@ jobs:
107102
build_image:
108103
machine:
109104
docker_layer_caching: true
110-
enabled: true
111105
image: ubuntu-2004:202010-01
112106
steps:
113107
- checkout
@@ -129,7 +123,6 @@ jobs:
129123
code_formatter:
130124
machine:
131125
docker_layer_caching: true
132-
enabled: true
133126
image: ubuntu-2004:202010-01
134127
steps:
135128
- checkout
@@ -150,7 +143,7 @@ jobs:
150143
- auth:
151144
password: $DOCKERHUB_PASSWORD
152145
username: $DOCKERHUB_USER
153-
image: cimg/node:16.1
146+
image: cimg/node:16.5
154147
steps:
155148
- checkout
156149
- install_python_requests
@@ -174,7 +167,7 @@ jobs:
174167
- auth:
175168
password: $DOCKERHUB_PASSWORD
176169
username: $DOCKERHUB_USER
177-
image: cimg/node:16.1
170+
image: cimg/node:16.5
178171
steps:
179172
- checkout
180173
- install_python_requests
@@ -195,20 +188,16 @@ jobs:
195188
eks_integration_tests:
196189
machine:
197190
docker_layer_caching: true
198-
enabled: true
199191
image: ubuntu-2004:202010-01
200192
steps:
201193
- checkout
202194
- install_python_requests
195+
- setup_node16
203196
- run:
204197
command: mkdir -p /tmp/logs/test/integration/eks
205198
name: Create temp dir for logs
206199
- run:
207200
command: |
208-
export NVM_DIR="/opt/circleci/.nvm"
209-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
210-
nvm install v16
211-
npm install
212201
export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
213202
.circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:eks:yaml
214203
name: Integration tests EKS
@@ -223,7 +212,6 @@ jobs:
223212
integration_tests:
224213
machine:
225214
docker_layer_caching: true
226-
enabled: true
227215
image: ubuntu-2004:202010-01
228216
steps:
229217
- checkout
@@ -248,7 +236,6 @@ jobs:
248236
integration_tests_helm:
249237
machine:
250238
docker_layer_caching: true
251-
enabled: true
252239
image: ubuntu-2004:202010-01
253240
steps:
254241
- checkout
@@ -273,7 +260,6 @@ jobs:
273260
integration_tests_operator_on_k8s:
274261
machine:
275262
docker_layer_caching: true
276-
enabled: true
277263
image: ubuntu-2004:202010-01
278264
steps:
279265
- checkout
@@ -299,7 +285,6 @@ jobs:
299285
integration_tests_proxy:
300286
machine:
301287
docker_layer_caching: true
302-
enabled: true
303288
image: ubuntu-2004:202010-01
304289
steps:
305290
- checkout
@@ -324,7 +309,6 @@ jobs:
324309
lint:
325310
machine:
326311
docker_layer_caching: true
327-
enabled: true
328312
image: ubuntu-2004:202010-01
329313
steps:
330314
- checkout
@@ -343,7 +327,6 @@ jobs:
343327
openshift3_integration_tests:
344328
machine:
345329
docker_layer_caching: true
346-
enabled: true
347330
image: ubuntu-2004:202010-01
348331
steps:
349332
- checkout
@@ -367,7 +350,6 @@ jobs:
367350
openshift4_integration_tests:
368351
machine:
369352
docker_layer_caching: true
370-
enabled: true
371353
image: ubuntu-2004:202010-01
372354
steps:
373355
- checkout
@@ -620,7 +602,7 @@ jobs:
620602
- auth:
621603
password: $DOCKERHUB_PASSWORD
622604
username: $DOCKERHUB_USER
623-
image: cimg/node:16.1
605+
image: cimg/node:16.5
624606
steps:
625607
- checkout
626608
- setup_remote_docker
@@ -823,7 +805,6 @@ jobs:
823805
system_tests:
824806
machine:
825807
docker_layer_caching: true
826-
enabled: true
827808
image: ubuntu-2004:202010-01
828809
steps:
829810
- checkout
@@ -856,7 +837,7 @@ jobs:
856837
- auth:
857838
password: $DOCKERHUB_PASSWORD
858839
username: $DOCKERHUB_USER
859-
image: cimg/node:16.1
840+
image: cimg/node:16.5
860841
steps:
861842
- checkout
862843
- setup_remote_docker
@@ -881,7 +862,6 @@ jobs:
881862
unit_tests:
882863
machine:
883864
docker_layer_caching: true
884-
enabled: true
885865
image: ubuntu-2004:202010-01
886866
steps:
887867
- checkout

‎.circleci/config/commands/setup_node16.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ steps:
88
npm install
99
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
1010
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
11-
echo 'nvm use 16' >> $BASH_ENV
11+
echo 'nvm alias default v16' >> $BASH_ENV

‎.circleci/config/jobs/@jobs.yml‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
build_image:
22
machine:
33
image: ubuntu-2004:202010-01
4-
enabled: true
54
docker_layer_caching: true
65
working_directory: ~/kubernetes-monitor
76
steps:
@@ -68,7 +67,6 @@ build_and_upload_operator:
6867
lint:
6968
machine:
7069
docker_layer_caching: true
71-
enabled: true
7270
image: ubuntu-2004:202010-01
7371
steps:
7472
- checkout
@@ -87,7 +85,6 @@ lint:
8785
code_formatter:
8886
machine:
8987
docker_layer_caching: true
90-
enabled: true
9188
image: ubuntu-2004:202010-01
9289
steps:
9390
- checkout
@@ -106,7 +103,6 @@ code_formatter:
106103
unit_tests:
107104
machine:
108105
image: ubuntu-2004:202010-01
109-
enabled: true
110106
docker_layer_caching: true
111107
working_directory: ~/kubernetes-monitor
112108
steps:
@@ -127,7 +123,6 @@ unit_tests:
127123
system_tests:
128124
machine:
129125
image: ubuntu-2004:202010-01
130-
enabled: true
131126
docker_layer_caching: true
132127
working_directory: ~/kubernetes-monitor
133128
steps:
@@ -159,7 +154,6 @@ system_tests:
159154
integration_tests:
160155
machine:
161156
image: ubuntu-2004:202010-01
162-
enabled: true
163157
docker_layer_caching: true
164158
working_directory: ~/kubernetes-monitor
165159
steps:
@@ -185,7 +179,6 @@ integration_tests:
185179
integration_tests_helm:
186180
machine:
187181
image: ubuntu-2004:202010-01
188-
enabled: true
189182
docker_layer_caching: true
190183
working_directory: ~/kubernetes-monitor
191184
steps:
@@ -211,7 +204,6 @@ integration_tests_helm:
211204
integration_tests_proxy:
212205
machine:
213206
image: ubuntu-2004:202010-01
214-
enabled: true
215207
docker_layer_caching: true
216208
working_directory: ~/kubernetes-monitor
217209
steps:
@@ -237,23 +229,18 @@ integration_tests_proxy:
237229
eks_integration_tests:
238230
machine:
239231
image: ubuntu-2004:202010-01
240-
enabled: true
241232
docker_layer_caching: true
242233
working_directory: ~/kubernetes-monitor
243234
steps:
244235
- checkout
245236
- install_python_requests
237+
- setup_node16
246238
- run:
247239
name: Create temp dir for logs
248240
command: mkdir -p /tmp/logs/test/integration/eks
249241
- run:
250242
name: Integration tests EKS
251-
# WARNING! Do not use the step "setup_node16" here - the call to "nvm use 16" breaks the tests!
252243
command: |
253-
export NVM_DIR="/opt/circleci/.nvm"
254-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
255-
nvm install v16
256-
npm install
257244
export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
258245
.circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:eks:yaml
259246
- run:
@@ -267,24 +254,19 @@ eks_integration_tests:
267254
aks_integration_tests:
268255
machine:
269256
image: ubuntu-2004:202010-01
270-
enabled: true
271257
docker_layer_caching: true
272258
working_directory: ~/kubernetes-monitor
273259
steps:
274260
- checkout
261+
- setup_node16
275262
- install_python_requests
276263
- azure-cli/install
277264
- run:
278265
name: Create temp dir for logs
279266
command: mkdir -p /tmp/logs/test/integration/aks
280267
- run:
281268
name: Integration tests AKS
282-
# WARNING! Do not use the step "setup_node16" here - the call to "nvm use 16" breaks the tests!
283269
command: |
284-
export NVM_DIR="/opt/circleci/.nvm"
285-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
286-
nvm install v16
287-
npm install
288270
export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
289271
.circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:aks:yaml
290272
- run:
@@ -298,7 +280,6 @@ aks_integration_tests:
298280
openshift3_integration_tests:
299281
machine:
300282
image: ubuntu-2004:202010-01
301-
enabled: true
302283
docker_layer_caching: true
303284
working_directory: ~/kubernetes-monitor
304285
steps:
@@ -323,7 +304,6 @@ openshift3_integration_tests:
323304
openshift4_integration_tests:
324305
machine:
325306
image: ubuntu-2004:202010-01
326-
enabled: true
327307
docker_layer_caching: true
328308
working_directory: ~/kubernetes-monitor
329309
steps:
@@ -350,7 +330,7 @@ openshift4_integration_tests:
350330
######################## MERGE TO STAGING ########################
351331
tag_and_push:
352332
docker:
353-
- image: cimg/node:16.1
333+
- image: cimg/node:16.5
354334
auth:
355335
username: $DOCKERHUB_USER
356336
password: $DOCKERHUB_PASSWORD
@@ -378,7 +358,7 @@ tag_and_push:
378358

379359
deploy_dev:
380360
docker:
381-
- image: cimg/node:16.1
361+
- image: cimg/node:16.5
382362
auth:
383363
username: $DOCKERHUB_USER
384364
password: $DOCKERHUB_PASSWORD
@@ -404,7 +384,7 @@ deploy_dev:
404384
######################## MERGE TO MASTER ########################
405385
publish:
406386
docker:
407-
- image: cimg/node:16.1
387+
- image: cimg/node:16.5
408388
auth:
409389
username: $DOCKERHUB_USER
410390
password: $DOCKERHUB_PASSWORD
@@ -450,7 +430,7 @@ publish:
450430

451431
deploy_prod:
452432
docker:
453-
- image: cimg/node:16.1
433+
- image: cimg/node:16.5
454434
auth:
455435
username: $DOCKERHUB_USER
456436
password: $DOCKERHUB_PASSWORD

‎.circleci/config/jobs/integration_tests_operator_on_k8s.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
machine:
22
image: ubuntu-2004:202010-01
33
docker_layer_caching: true
4-
enabled: true
54
steps:
65
- checkout
76
- setup_node16

0 commit comments

Comments
 (0)