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.

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

Feature/1116 arango noun mutation update to return only IDs #1511

Merged
merged 7 commits into from
Nov 20, 2023
Merged

Feature/1116 arango noun mutation update to return only IDs #1511

merged 7 commits into from
Nov 20, 2023

Conversation

pxp928
Copy link
Collaborator

@pxp928 pxp928 commented Nov 18, 2023 •
edited
Loading

Description of the PR

Update arango (and ENT vulnerability and Package) to return IDs for mutation. Updated package, source and vulnerability to return flat struct of IDs

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

@pxp928
change artifact mutation to return only ID
8970a02 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928
change builder and license to return only ID during ingestion
ce4a823 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928
update package to return flat struct of IDs
a8709dc 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928
update source and vulnerability to return mutation ID
2818cb3 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928
update ENT for vulnerability and package mutation IDs
b007968 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928
update ENT for source mutation IDs
68b1317 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928
Copy link
Collaborator Author

pxp928 commented Nov 18, 2023

Working on fixing up the tests here.

@pxp928 pxp928 force-pushed the feature/1116-arango-noun-mutation branch 12 times, most recently from a501a73 to 2af664c Compare November 20, 2023 00:38
pxp928
pxp928 commented Nov 20, 2023
View reviewed changes
pkg/assembler/backends/ent/backend/scorecard_test.go
},
},
},
// TODO: Determine why this test fails?
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@mrizzi I am not sure why this test fails. Can you take a look and I can fix it up.

@pxp928
update tests for arango and ent
f2ce74f 
Signed-off-by: pxp928 <parth.psu@gmail.com>
@pxp928 pxp928 force-pushed the feature/1116-arango-noun-mutation branch from 2af664c to f2ce74f Compare November 20, 2023 17:36
jeffmendoza
jeffmendoza approved these changes Nov 20, 2023
View reviewed changes
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.

For pkg/src/vuln don't we still want to update the backends to return the id struct and remove the helpers from the resolvers that pull the ids out?

@pxp928
Copy link
Collaborator Author

pxp928 commented Nov 20, 2023

For pkg/src/vuln don't we still want to update the backends to return the id struct and remove the helpers from the resolvers that pull the ids out?

yes but this broke the e2e so that is the reason why I left it. (until we update key/value inmem)

@pxp928 pxp928 merged commit 489fcb1 into guacsec:1116-return-ID Nov 20, 2023
8 checks passed
pxp928 added a commit that referenced this pull request Nov 21, 2023
@pxp928
Feature/1116 arango noun mutation update to return only IDs (#1511)
d82c14a 
* change artifact mutation to return only ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* change builder and license to return only ID during ingestion

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update package to return flat struct of IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update source and vulnerability to return mutation ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for vulnerability and package mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for source mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update tests for arango and ent

Signed-off-by: pxp928 <parth.psu@gmail.com>

---------

Signed-off-by: pxp928 <parth.psu@gmail.com>
pxp928 added a commit that referenced this pull request Nov 30, 2023
@pxp928
Feature/1116 arango noun mutation update to return only IDs (#1511)
4704167 
* change artifact mutation to return only ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* change builder and license to return only ID during ingestion

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update package to return flat struct of IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update source and vulnerability to return mutation ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for vulnerability and package mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for source mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update tests for arango and ent

Signed-off-by: pxp928 <parth.psu@gmail.com>

---------

Signed-off-by: pxp928 <parth.psu@gmail.com>
pxp928 added a commit that referenced this pull request Nov 30, 2023
@pxp928
Feature/1116 arango noun mutation update to return only IDs (#1511)
a4cce91 
* change artifact mutation to return only ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* change builder and license to return only ID during ingestion

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update package to return flat struct of IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update source and vulnerability to return mutation ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for vulnerability and package mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for source mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update tests for arango and ent

Signed-off-by: pxp928 <parth.psu@gmail.com>

---------

Signed-off-by: pxp928 <parth.psu@gmail.com>
kodiakhq bot pushed a commit that referenced this pull request Nov 30, 2023
@pxp928 @mrizzi
@desmax74 @jeffmendoza
Update mutation API to return only ID (merge branch 1116-return-ID to…
32697ae 
… main) (#1542)

* Backend interface - Methods for returning 'string' (#1285)

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Enable GitHub CI tests (#1296)

* Enable GitHub CI tests

Signed-off-by: mrizzi <mrizzi@redhat.com>

* Mocks backend updated

Signed-off-by: mrizzi <mrizzi@redhat.com>

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

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

Signed-off-by: mrizzi <mrizzi@redhat.com>

* Ent - Pin postgres image to hash

Signed-off-by: mrizzi <mrizzi@redhat.com>

---------

Signed-off-by: mrizzi <mrizzi@redhat.com>

---------

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Ent - IngestArtifactID,IngestArtifactIDs implementations (#1300)

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Ent - IngestBuilderID, IngestPackageID, IngestSourceID, IngestVulnerabilityID (#1329)

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* Ent - upsertPackageIDDoNothing vs upsertPackageIDIgnore (#1270)

* Ent - upsertPackageIDDoNothing vs upsertPackageIDIgnore

Signed-off-by: mrizzi <mrizzi@redhat.com>

* Ent - final upsertPackage implementation

Signed-off-by: mrizzi <mrizzi@redhat.com>

---------

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: desmax74 <mdessi@redhat.com>

* Ent - upsertPackage: enhanced ID management

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

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

* Ent - Packages: subpath query issue reproducer

Signed-off-by: mrizzi <mrizzi@redhat.com>

* Ent - Packages: subpath query issue fix

Signed-off-by: mrizzi <mrizzi@redhat.com>

---------

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* Ent - TestIngestVulnerabilities changes to support ID

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* Ent - Node: added SourceName management

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

* 1116-return-ID

Signed-off-by: desmax74 <mdessi@redhat.com>

---------

Signed-off-by: desmax74 <mdessi@redhat.com>
Signed-off-by: mrizzi <mrizzi@redhat.com>
Co-authored-by: Marco Rizzi <mrizzi@users.noreply.github.com>
Co-authored-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Ent - IngestHasSBOMID (#1470)

Signed-off-by: desmax74 <mdessi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Ent - ScorecardID (#1469)

Signed-off-by: desmax74 <mdessi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Ent - PkgEqualsID (#1473)

Signed-off-by: desmax74 <mdessi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ent IngestHasSbomID and IngestHasSBOMIDs with the new includes field

Signed-off-by: pxp928 <parth.psu@gmail.com>

* Feature/1116 arango noun mutation update to return only IDs (#1511)

* change artifact mutation to return only ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* change builder and license to return only ID during ingestion

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update package to return flat struct of IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update source and vulnerability to return mutation ID

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for vulnerability and package mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update ENT for source mutation IDs

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update tests for arango and ent

Signed-off-by: pxp928 <parth.psu@gmail.com>

---------

Signed-off-by: pxp928 <parth.psu@gmail.com>

* Update all resolvers for Return ID (#1514)

* Update resolvers to use ID backend methods

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

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

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

---------

Signed-off-by: Jeff Mendoza <jlm@jlm.name>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Update keyvalue backend to return ID (#1524)

* Update keyvalue backend to return ID

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

* Lint gosimple

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

* Regen backend mock

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

---------

Signed-off-by: Jeff Mendoza <jlm@jlm.name>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* Feature/1116 arango verb mutation (#1529)

Signed-off-by: pxp928 <parth.psu@gmail.com>

* Complete Ent Return -ID (#1536)

* Updated ent with ID

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

* Update ent tests for ID.

Signed-off-by: Jeff Mendoza <jlm@jlm.name>

---------

Signed-off-by: Jeff Mendoza <jlm@jlm.name>
Signed-off-by: pxp928 <parth.psu@gmail.com>

* change mutations back to original name (#1541)

Signed-off-by: pxp928 <parth.psu@gmail.com>

* remove branch from ci workflow

Signed-off-by: pxp928 <parth.psu@gmail.com>

---------

Signed-off-by: mrizzi <mrizzi@redhat.com>
Signed-off-by: pxp928 <parth.psu@gmail.com>
Signed-off-by: desmax74 <mdessi@redhat.com>
Signed-off-by: Jeff Mendoza <jlm@jlm.name>
Co-authored-by: Marco Rizzi <mrizzi@users.noreply.github.com>
Co-authored-by: Massimiliano Dessì - (Fast Chauffeur) <desmax74@users.noreply.github.com>
Co-authored-by: mrizzi <mrizzi@redhat.com>
Co-authored-by: Jeff Mendoza <jlm@jlm.name>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaimaruseac mihaimaruseac mihaimaruseac approved these changes

@jeffmendoza jeffmendoza jeffmendoza approved these changes

Assignees
No one assigned
Labels
size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pxp928 @mihaimaruseac @jeffmendoza