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

Populate and prune attested node events #4527

Merged
merged 17 commits into from
Oct 10, 2023
Merged

Populate and prune attested node events #4527

merged 17 commits into from
Oct 10, 2023

Conversation

faisal-memon
Copy link
Contributor

@faisal-memon faisal-memon commented Sep 26, 2023 •
edited

Pull Request check list

  • Commit conforms to CONTRIBUTING.md?
  • Proper tests/regressions included?
  • Documentation updated?

Affected functionality
database layer

Description of change
Adds in the code to populate and prune attested node events.

Which issue this PR fixes
Part of #4498

@faisal-memon faisal-memon marked this pull request as ready for review September 26, 2023 22:34
@faisal-memon
Copy link
Contributor Author

Unit tests added, ready for review.

@azdagron azdagron added this to the 1.8.1 milestone Oct 3, 2023
azdagron
azdagron reviewed Oct 4, 2023
View reviewed changes
pkg/server/datastore/sqlstore/sqlstore.go Outdated
@@ -1329,7 +1357,7 @@ func getBundle(tx *gorm.DB, trustDomainID string) (*common.Bundle, error) {
return bundle, nil
}

func createAttestedNode(tx *gorm.DB, node *common.AttestedNode) (*common.AttestedNode, error) {
func (ds *Plugin) createAttestedNode(tx *gorm.DB, node *common.AttestedNode) (*common.AttestedNode, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mistake, was from an earlier design but ended up not needing this change. Removed it.

pkg/server/datastore/sqlstore/sqlstore.go Outdated
}

var events []AttestedNodeEvent
if err := tx.Find(&events, "id > ?", req.GreaterThanEventID).Error; err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should be explicit about the ordering... these should be ordered by ascending ID. In practice we'd probably get anyway that but it's safer to be explicit. This also holds true for the entry events.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

pkg/server/datastore/sqlstore/sqlstore.go

resp := &datastore.ListAttestedNodesEventsResponse{}
for _, event := range events {
resp.SpiffeIDs = append(resp.SpiffeIDs, event.SpiffeID)
Copy link
Member

Choose a reason for hiding this comment

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

considering the volume of events, i wonder if we should preallocate this slice to len(events)

Same would be applicable to the entry events listing code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@azdagron azdagron mentioned this pull request Oct 4, 2023
Closed
7 tasks
faisal-memon and others added 17 commits October 9, 2023 15:10
@faisal-memon
Populate and prune attested node events
772c2a7 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Fix unit tests
c442e54 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Add unit tests
b3f76c3 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Fix typos
6c273dc 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Remove createAttestedNode change
d59b453 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Event ascending order
382c31c 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Preallocate slices
4bd19ef 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@faisal-memon
Cleanup
2fe08c3 
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @MarcosDY @faisal-memon
Bump github.com/hashicorp/go-plugin from 1.4.10 to 1.5.2 (spiffe#4525)
93b4fa5 
* Bump github.com/hashicorp/go-plugin from 1.4.10 to 1.5.2

Bumps [github.com/hashicorp/go-plugin](https://github.com/hashicorp/go-plugin) from 1.4.10 to 1.5.2.
- [Release notes](https://github.com/hashicorp/go-plugin/releases)
- [Changelog](https://github.com/hashicorp/go-plugin/blob/main/CHANGELOG.md)
- [Commits](hashicorp/go-plugin@v1.4.10...v1.5.2)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/go-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

* Update expected error message when running invalid plugin

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Marcos Yacob <marcos.yacob@hpe.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marcos Yacob <marcos.yacob@hpe.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@azdagron @faisal-memon
New Mutable Authorized Entry Cache (spiffe#4451)
5b0be44 
Signed-off-by: Andrew Harding <azdagron@gmail.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump github.com/hashicorp/vault/sdk from 0.9.2 to 0.10.0 (spiffe#4519)
8521489 
Bumps [github.com/hashicorp/vault/sdk](https://github.com/hashicorp/vault) from 0.9.2 to 0.10.0.
- [Release notes](https://github.com/hashicorp/vault/releases)
- [Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG-v0.md)
- [Commits](hashicorp/vault@v0.9.2...v0.10.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/vault/sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump actions/checkout from 4.0.0 to 4.1.0 (spiffe#4523)
ac6cfb8 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@3df4ab1...8ade135)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump sigs.k8s.io/controller-runtime from 0.16.0 to 0.16.2 (spiffe#4526)
6dce0d2 
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.16.0 to 0.16.2.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.16.0...v0.16.2)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump the aws-sdk group with 3 updates (spiffe#4533)
46d069a 
Bumps the aws-sdk group with 3 updates: [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2), [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2).

Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.120.0 to 1.123.0
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/ec2/v1.120.0...service/ec2/v1.123.0)

Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.39.0 to 1.40.0
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/s3/v1.39.0...service/s3/v1.40.0)

Updates `github.com/aws/aws-sdk-go-v2/service/sts` from 1.22.0 to 1.23.0
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.23.0/CHANGELOG.md)
- [Commits](aws/aws-sdk-go-v2@service/s3/v1.22.0...service/s3/v1.23.0)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws-sdk
- dependency-name: github.com/aws/aws-sdk-go-v2/service/s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws-sdk
- dependency-name: github.com/aws/aws-sdk-go-v2/service/sts
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws-sdk
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump github.com/lestrrat-go/jwx/v2 from 2.0.12 to 2.0.13 (spiffe#4529)
4637eab 
Bumps [github.com/lestrrat-go/jwx/v2](https://github.com/lestrrat-go/jwx) from 2.0.12 to 2.0.13.
- [Release notes](https://github.com/lestrrat-go/jwx/releases)
- [Changelog](https://github.com/lestrrat-go/jwx/blob/develop/v2/Changes)
- [Commits](lestrrat-go/jwx@v2.0.12...v2.0.13)

---
updated-dependencies:
- dependency-name: github.com/lestrrat-go/jwx/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump google.golang.org/api from 0.142.0 to 0.145.0 (spiffe#4538)
d6efcbe 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.142.0 to 0.145.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.142.0...v0.145.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@dependabot @faisal-memon
Bump github.com/shirou/gopsutil/v3 from 3.23.8 to 3.23.9 (spiffe#4537)
dfd4bed 
Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.23.8 to 3.23.9.
- [Release notes](https://github.com/shirou/gopsutil/releases)
- [Commits](shirou/gopsutil@v3.23.8...v3.23.9)

---
updated-dependencies:
- dependency-name: github.com/shirou/gopsutil/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Faisal Memon <fymemon@yahoo.com>
@azdagron azdagron merged commit f8c831c into spiffe:main Oct 10, 2023
31 checks passed
@amartinezfayo amartinezfayo modified the milestones: 1.8.1, 1.8.2, 1.8.3 Oct 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azdagron azdagron azdagron approved these changes

@evan2645 evan2645 Awaiting requested review from evan2645 evan2645 is a code owner

@amartinezfayo amartinezfayo Awaiting requested review from amartinezfayo amartinezfayo is a code owner

@MarcosDY MarcosDY Awaiting requested review from MarcosDY MarcosDY is a code owner

@rturner3 rturner3 Awaiting requested review from rturner3 rturner3 is a code owner

Assignees

@azdagron azdagron

Labels
None yet
Projects
None yet
Milestone
1.8.3
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@faisal-memon @azdagron @amartinezfayo