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.

Sign up for GitHub

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

Jump to bottom

ISSUE-1124-2: Adding support for masking across same tag of same image #1681

Merged

varunsharma0286 merged 1 commit into main from ISSUE-1124-2

Oct 20, 2023

Contributor

varunsharma0286 commented Oct 19, 2023

Issue#
#1124

Changes proposed in this pull request:

Adding support for masking across same tag of same image

noboruma reviewed

View reviewed changes

deepfence_server/ingesters/agent.go Outdated Show resolved Hide resolved

noboruma reviewed

View reviewed changes

deepfence_server/reporters/scan/scan_reporters.go Outdated Show resolved Hide resolved

noboruma reviewed

View reviewed changes

deepfence_server/reporters/scan/scan_reporters.go Outdated Show resolved Hide resolved

noboruma reviewed

View reviewed changes

deepfence_worker/cronscheduler/init_neo4j.go Outdated Show resolved Hide resolved

varunsharma0286 force-pushed the ISSUE-1124-2 branch from 7d8ba46 to 40e4912 Compare

October 20, 2023 07:18

noboruma reviewed

View reviewed changes

deepfence_worker/cronscheduler/init_neo4j.go Show resolved Hide resolved


          ISSUE-1124-2: Adding support for masking across same tag of same image

6b2984f

varunsharma0286 force-pushed the ISSUE-1124-2 branch from 40e4912 to 6b2984f Compare

October 20, 2023 09:26

noboruma reviewed

View reviewed changes

deepfence_server/ingesters/agent.go

               		SET n+= row, n.updated_at = TIMESTAMP(), n.active = true, s.updated_at = TIMESTAMP(), n.docker_image_id=row.node_id,
-              		s.tags = REDUCE(distinctElements = [], element IN COALESCE(s.tags, []) + row.docker_image_tag | CASE WHEN NOT element in distinctElements THEN distinctElements + element ELSE distinctElements END)`,
+              		s.tags = REDUCE(distinctElements = [], element IN COALESCE(s.tags, []) + row.docker_image_tag | CASE WHEN NOT element in distinctElements THEN distinctElements + element ELSE distinctElements END),
+              		n.updated_at = TIMESTAMP()`,

Collaborator

noboruma Oct 20, 2023

Suggested change

n.updated_at = TIMESTAMP()`,

Not needed

noboruma approved these changes

View reviewed changes

varunsharma0286 merged commit b024bf6 into main

varunsharma0286 deleted the ISSUE-1124-2 branch

October 20, 2023 10:51

saurabh2253 pushed a commit that referenced this pull request


          ISSUE-1124-2: Adding support for masking across same tag of same image (

5a465ee

#1681)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet