Skip to content

Commit 74fcb47

Browse files
jonnyowenpowelljonnyowenpowell
authored
Merge pull request #1465 from snyk/fix/empty-runtime-images-payload
fix: avoid sending empty runtime images payloads
2 parents a38f8b5 + e918a06 commit 74fcb47

File tree

5 files changed

+149
-97
lines changed

5 files changed

+149
-97
lines changed

‎.circleci/config.yml

Lines changed: 63 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,23 @@ commands:
1616
sudo apt update
1717
sudo apt install python3-requests
1818
when: always
19-
setup_node:
20-
description: Setup Node 18
21-
steps:
22-
- run:
23-
command: |
24-
export NVM_DIR="/opt/circleci/.nvm"
25-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
26-
nvm install v18
27-
npm ci
28-
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
29-
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
30-
echo 'nvm alias default v18' >> $BASH_ENV
3119
jobs:
3220
aks_integration_tests:
33-
machine:
34-
docker_layer_caching: true
35-
image: ubuntu-2004:202111-01
21+
docker:
22+
- image: cimg/node:18.19.1
3623
resource_class: large
3724
steps:
3825
- checkout
39-
- setup_node
26+
- setup_remote_docker
27+
- run:
28+
command: npm ci
4029
- install_python_requests
4130
- azure-cli/install
4231
- run:
4332
command: mkdir -p /tmp/logs/test/integration/aks
4433
name: Create temp dir for logs
4534
- run:
4635
command: |
47-
npm ci &&
4836
export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
4937
.circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:aks:yaml
5038
name: Integration tests AKS
@@ -58,10 +46,7 @@ jobs:
5846
working_directory: ~/kubernetes-monitor
5947
build_and_upload_operator:
6048
docker:
61-
- auth:
62-
password: $DOCKERHUB_PASSWORD
63-
username: $DOCKERHUB_USER
64-
image: cimg/python:3.10
49+
- image: cimg/python:3.10
6550
steps:
6651
- checkout
6752
- setup_remote_docker
@@ -106,10 +91,11 @@ jobs:
10691
when: on_fail
10792
working_directory: ~/kubernetes-monitor
10893
build_image:
109-
machine:
110-
image: ubuntu-2004:202111-02
94+
docker:
95+
- image: cimg/base:current
11196
steps:
11297
- checkout
98+
- setup_remote_docker
11399
- install_python_requests
114100
- run:
115101
command: |
@@ -149,12 +135,12 @@ jobs:
149135
when: on_fail
150136
working_directory: ~/kubernetes-monitor
151137
code_formatter:
152-
machine:
153-
docker_layer_caching: true
154-
image: ubuntu-2004:202111-01
138+
docker:
139+
- image: cimg/node:18.19.1
155140
steps:
156141
- checkout
157-
- setup_node
142+
- run:
143+
command: npm ci
158144
- install_python_requests
159145
- run:
160146
command: |
@@ -168,10 +154,7 @@ jobs:
168154
working_directory: ~/kubernetes-monitor
169155
prepare_to_deploy:
170156
docker:
171-
- auth:
172-
password: $DOCKERHUB_PASSWORD
173-
username: $DOCKERHUB_USER
174-
image: cimg/node:16.13
157+
- image: cimg/base:current
175158
steps:
176159
- checkout
177160
- install_python_requests
@@ -185,10 +168,7 @@ jobs:
185168
working_directory: ~/kubernetes-monitor
186169
deploy_to_prod:
187170
docker:
188-
- auth:
189-
password: $DOCKERHUB_PASSWORD
190-
username: $DOCKERHUB_USER
191-
image: cimg/node:16.13
171+
- image: cimg/base:current
192172
steps:
193173
- checkout
194174
- install_python_requests
@@ -202,10 +182,7 @@ jobs:
202182
working_directory: ~/kubernetes-monitor
203183
deploy_to_sysdig_integration_cluster:
204184
docker:
205-
- auth:
206-
password: $DOCKERHUB_PASSWORD
207-
username: $DOCKERHUB_USER
208-
image: cimg/base:stable
185+
- image: cimg/base:stable
209186
steps:
210187
- checkout
211188
- run:
@@ -242,22 +219,22 @@ jobs:
242219
when: on_fail
243220
working_directory: ~/kubernetes-monitor
244221
eks_integration_tests:
245-
machine:
246-
docker_layer_caching: true
247-
image: ubuntu-2004:202111-01
222+
docker:
223+
- image: cimg/node:18.19.1
248224
resource_class: large
249225
steps:
250226
- checkout
227+
- setup_remote_docker
228+
- run:
229+
command: npm ci
251230
- install_python_requests
252-
- setup_node
253231
- aws-cli/install:
254232
override-installed: true
255233
- run:
256234
command: mkdir -p /tmp/logs/test/integration/eks
257235
name: Create temp dir for logs
258236
- run:
259237
command: |
260-
npm ci &&
261238
export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
262239
.circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:eks:yaml
263240
name: Integration tests EKS
@@ -270,13 +247,14 @@ jobs:
270247
path: /tmp/logs/test/integration/eks
271248
working_directory: ~/kubernetes-monitor
272249
integration_tests:
273-
machine:
274-
docker_layer_caching: true
275-
image: ubuntu-2004:202111-01
250+
docker:
251+
- image: cimg/node:18.19.1
276252
resource_class: large
277253
steps:
278254
- checkout
279-
- setup_node
255+
- setup_remote_docker
256+
- run:
257+
command: npm ci
280258
- install_python_requests
281259
- run:
282260
command: mkdir -p /tmp/logs/test/integration/kind
@@ -295,13 +273,14 @@ jobs:
295273
path: /tmp/logs/test/integration/kind
296274
working_directory: ~/kubernetes-monitor
297275
integration_tests_helm:
298-
machine:
299-
docker_layer_caching: true
300-
image: ubuntu-2004:202111-01
276+
docker:
277+
- image: cimg/node:18.19.1
301278
resource_class: large
302279
steps:
303280
- checkout
304-
- setup_node
281+
- setup_remote_docker
282+
- run:
283+
command: npm ci
305284
- install_python_requests
306285
- run:
307286
command: mkdir -p /tmp/logs/test/integration/kind-helm
@@ -320,13 +299,14 @@ jobs:
320299
path: /tmp/logs/test/integration/kind-helm
321300
working_directory: ~/kubernetes-monitor
322301
integration_tests_operator_on_k8s:
323-
machine:
324-
docker_layer_caching: true
325-
image: ubuntu-2004:202111-01
326-
resource_class: large
302+
docker:
303+
- image: cimg/node:18.19.1
304+
resource_class: large
327305
steps:
328306
- checkout
329-
- setup_node
307+
- setup_remote_docker
308+
- run:
309+
command: npm ci
330310
- install_python_requests
331311
- run:
332312
command: mkdir -p /tmp/logs/test/integration/kind-olm-operator
@@ -347,13 +327,14 @@ jobs:
347327
path: /tmp/logs/test/integration/kind-olm-operator
348328
working_directory: ~/kubernetes-monitor
349329
integration_tests_proxy:
350-
machine:
351-
docker_layer_caching: true
352-
image: ubuntu-2004:202111-01
330+
docker:
331+
- image: cimg/node:18.19.1
353332
resource_class: large
354333
steps:
355334
- checkout
356-
- setup_node
335+
- setup_remote_docker
336+
- run:
337+
command: npm ci
357338
- install_python_requests
358339
- run:
359340
command: mkdir -p /tmp/logs/test/integration/proxy
@@ -372,12 +353,12 @@ jobs:
372353
path: /tmp/logs/test/integration/proxy
373354
working_directory: ~/kubernetes-monitor
374355
lint:
375-
machine:
376-
docker_layer_caching: true
377-
image: ubuntu-2004:202111-01
356+
docker:
357+
- image: cimg/node:18.19.1
378358
steps:
379359
- checkout
380-
- setup_node
360+
- run:
361+
command: npm ci
381362
- install_python_requests
382363
- run:
383364
command: |
@@ -390,13 +371,14 @@ jobs:
390371
when: on_fail
391372
working_directory: ~/kubernetes-monitor
392373
openshift4_integration_tests:
393-
machine:
394-
docker_layer_caching: true
395-
image: ubuntu-2204:current
396-
resource_class: large
374+
docker:
375+
- image: cimg/node:18.19.1
376+
resource_class: large
397377
steps:
398378
- checkout
399-
- setup_node
379+
- setup_remote_docker
380+
- run:
381+
command: npm ci
400382
- install_python_requests
401383
- run:
402384
command: mkdir -p /tmp/logs/test/integration/openshift4
@@ -650,10 +632,7 @@ jobs:
650632
working_directory: ~/kubernetes-monitor
651633
publish:
652634
docker:
653-
- auth:
654-
password: $DOCKERHUB_PASSWORD
655-
username: $DOCKERHUB_USER
656-
image: cimg/node:16.13
635+
- image: cimg/node:18.19.1
657636
steps:
658637
- checkout
659638
- setup_remote_docker
@@ -877,10 +856,7 @@ jobs:
877856
working_directory: ~/kubernetes-monitor
878857
sync_community_operators_with_snyk_fork:
879858
docker:
880-
- auth:
881-
password: $DOCKERHUB_PASSWORD
882-
username: $DOCKERHUB_USER
883-
image: cimg/python:3.10
859+
- image: cimg/python:3.10
884860
steps:
885861
- checkout
886862
- install_python_requests
@@ -909,10 +885,7 @@ jobs:
909885
working_directory: ~/kubernetes-monitor
910886
sync_embedded_community_operators_with_snyk_fork:
911887
docker:
912-
- auth:
913-
password: $DOCKERHUB_PASSWORD
914-
username: $DOCKERHUB_USER
915-
image: cimg/python:3.10
888+
- image: cimg/python:3.10
916889
steps:
917890
- checkout
918891
- install_python_requests
@@ -942,10 +915,11 @@ jobs:
942915
system_tests:
943916
machine:
944917
docker_layer_caching: true
945-
image: ubuntu-2204:2022.04.1
918+
image: default
946919
steps:
947920
- checkout
948-
- setup_node
921+
- run:
922+
command: npm ci
949923
- install_python_requests
950924
- run:
951925
command: |
@@ -966,10 +940,7 @@ jobs:
966940
working_directory: ~/kubernetes-monitor
967941
tag_and_push:
968942
docker:
969-
- auth:
970-
password: $DOCKERHUB_PASSWORD
971-
username: $DOCKERHUB_USER
972-
image: cimg/node:16.13
943+
- image: cimg/node:18.19.1
973944
steps:
974945
- checkout
975946
- setup_remote_docker
@@ -992,12 +963,12 @@ jobs:
992963
when: on_fail
993964
working_directory: ~/kubernetes-monitor
994965
unit_tests:
995-
machine:
996-
docker_layer_caching: true
997-
image: ubuntu-2004:202111-01
966+
docker:
967+
- image: cimg/node:18.19.1
998968
steps:
999969
- checkout
1000-
- setup_node
970+
- run:
971+
command: npm ci
1001972
- install_python_requests
1002973
- snyk/scan:
1003974
additional-arguments: --all-projects --exclude=test

‎src/data-scraper/index.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ export async function scrapeData(): Promise<void> {
101101
2,
102102
);
103103

104-
logger.info({}, 'sending runtime data upstream');
105-
await sendRuntimeData(runtimeDataPayload);
104+
if (runtimeDataPayload) {
105+
logger.info({}, 'sending runtime data upstream');
106+
await sendRuntimeData(runtimeDataPayload);
107+
}
106108

107109
cursor = responseBody?.page.next || '';
108110
if (!cursor) {

‎src/data-scraper/scraping-v1.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ export async function scrapeDataV1(): Promise<void> {
9191
1,
9292
);
9393

94-
logger.info({}, 'sending runtime data upstream');
95-
await sendRuntimeData(runtimeDataPayload);
94+
if (runtimeDataPayload) {
95+
logger.info({}, 'sending runtime data upstream');
96+
await sendRuntimeData(runtimeDataPayload);
97+
}
9698

9799
cursor = responseBody?.page.next || '';
98100
if (!cursor) {

‎src/transmitter/payload.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,11 @@ const workloadKindMap = {
152152
pod: 'Pod',
153153
rollout: 'Rollout',
154154
};
155+
155156
export function constructRuntimeData(
156157
runtimeResults: IRuntimeImage[],
157158
sysdigVersion: number,
158-
): IRuntimeDataPayload {
159+
): IRuntimeDataPayload | undefined {
159160
const filteredRuntimeResults = runtimeResults.reduce((acc, runtimeResult) => {
160161
if (!isExcludedNamespace(runtimeResult.namespace)) {
161162
const mappedWorkloadKind =
@@ -178,6 +179,10 @@ export function constructRuntimeData(
178179
return acc;
179180
}, [] as IRuntimeImage[]);
180181

182+
if (filteredRuntimeResults.length === 0) {
183+
return;
184+
}
185+
181186
const dataFact: IRuntimeDataFact = {
182187
type: 'loadedPackages',
183188
data: filteredRuntimeResults,

0 commit comments

Comments
 (0)