Skip to content
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.

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

Update mutation API to return only ID (merge branch 1116-return-ID to main) #1542

Merged
merged 15 commits into from
Nov 30, 2023

Conversation

pxp928
Copy link
Collaborator

@pxp928 pxp928 commented Nov 30, 2023

Description of the PR

closes #1199
closes #1198

completes all tasks related to issue #1116

PR Checklist

  • All commits have a Developer Certificate of Origin (DCO) -- they are generated using -s flag to git commit.
  • All new changes are covered by tests
  • If GraphQL schema is changed, make generate has been run
  • If collectsub protobuf has been changed, make proto has been run
  • All CI checks are passing (tests and formatting)
  • All dependent PRs have already been merged

Copy link
Collaborator

@mihaimaruseac mihaimaruseac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(stamp approval based on reviewing PRs into the branch and this being just a merge)

mrizzi and others added 15 commits November 30, 2023 11:37
* Enable GitHub CI tests

Signed-off-by: mrizzi <[email protected]>

* Mocks backend updated

Signed-off-by: mrizzi <[email protected]>

* Ent - Bump v0.12.4-0.20230918073025-797534a0d1ca (#1283)

* Ent - Bump v0.12.4-0.20230918073025-797534a0d1ca

Signed-off-by: mrizzi <[email protected]>

* Ent - Pin postgres image to hash

Signed-off-by: mrizzi <[email protected]>

---------

Signed-off-by: mrizzi <[email protected]>

---------

Signed-off-by: mrizzi <[email protected]>
Signed-off-by: pxp928 <[email protected]>
…bilityID (#1329)

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* Ent - upsertPackageIDDoNothing vs upsertPackageIDIgnore (#1270)

* Ent - upsertPackageIDDoNothing vs upsertPackageIDIgnore

Signed-off-by: mrizzi <[email protected]>

* Ent - final upsertPackage implementation

Signed-off-by: mrizzi <[email protected]>

---------

Signed-off-by: mrizzi <[email protected]>
Signed-off-by: desmax74 <[email protected]>

* Ent - upsertPackage: enhanced ID management

Signed-off-by: mrizzi <[email protected]>
Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* Ent - Packages: subpath query issue  (#1330)

* Ent - Packages: subpath query issue reproducer

Signed-off-by: mrizzi <[email protected]>

* Ent - Packages: subpath query issue fix

Signed-off-by: mrizzi <[email protected]>

---------

Signed-off-by: mrizzi <[email protected]>
Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* Ent - TestIngestVulnerabilities changes to support ID

Signed-off-by: mrizzi <[email protected]>
Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* Ent - Node: added SourceName management

Signed-off-by: mrizzi <[email protected]>
Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

* 1116-return-ID

Signed-off-by: desmax74 <[email protected]>

---------

Signed-off-by: desmax74 <[email protected]>
Signed-off-by: mrizzi <[email protected]>
Co-authored-by: Marco Rizzi <[email protected]>
Co-authored-by: mrizzi <[email protected]>
Signed-off-by: pxp928 <[email protected]>
Signed-off-by: desmax74 <[email protected]>
Signed-off-by: pxp928 <[email protected]>
Signed-off-by: desmax74 <[email protected]>
Signed-off-by: pxp928 <[email protected]>
Signed-off-by: desmax74 <[email protected]>
Signed-off-by: pxp928 <[email protected]>
* change artifact mutation to return only ID

Signed-off-by: pxp928 <[email protected]>

* change builder and license to return only ID during ingestion

Signed-off-by: pxp928 <[email protected]>

* update package to return flat struct of IDs

Signed-off-by: pxp928 <[email protected]>

* update source and vulnerability to return mutation ID

Signed-off-by: pxp928 <[email protected]>

* update ENT for vulnerability and package mutation IDs

Signed-off-by: pxp928 <[email protected]>

* update ENT for source mutation IDs

Signed-off-by: pxp928 <[email protected]>

* update tests for arango and ent

Signed-off-by: pxp928 <[email protected]>

---------

Signed-off-by: pxp928 <[email protected]>
* Update resolvers to use ID backend methods

Signed-off-by: Jeff Mendoza <[email protected]>

* Remove old methods from backend interface, update pkg/src/vuln resolvers.

Signed-off-by: Jeff Mendoza <[email protected]>

---------

Signed-off-by: Jeff Mendoza <[email protected]>
Signed-off-by: pxp928 <[email protected]>
* Update keyvalue backend to return ID

Signed-off-by: Jeff Mendoza <[email protected]>

* Lint gosimple

Signed-off-by: Jeff Mendoza <[email protected]>

* Regen backend mock

Signed-off-by: Jeff Mendoza <[email protected]>

---------

Signed-off-by: Jeff Mendoza <[email protected]>
Signed-off-by: pxp928 <[email protected]>
* Updated ent with ID

Signed-off-by: Jeff Mendoza <[email protected]>

* Update ent tests for ID.

Signed-off-by: Jeff Mendoza <[email protected]>

---------

Signed-off-by: Jeff Mendoza <[email protected]>
Signed-off-by: pxp928 <[email protected]>
Copy link
Collaborator

@jeffmendoza jeffmendoza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow no conflicts !!!

@kodiakhq kodiakhq bot merged commit 32697ae into main Nov 30, 2023
10 checks passed
@kodiakhq kodiakhq bot deleted the 1116-return-ID branch November 30, 2023 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
5 participants