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

Consolidating a few past PRs #302

Merged
merged 10 commits into from
May 10, 2024
Merged

Conversation

quintessence
Copy link
Contributor

@quintessence quintessence commented Mar 14, 2024

Description of the change
Fixing broken URLs that were fixed in other open PRs (listed below) and also removed references to Node Resolver (PR #262 ).

Which issue this PR fixes

- Fixed broken URLs from PR 240
- Added example from PR 231
- Added note about Key Manager from PR 285
- Removed references to, and changed diagrams concerning, Node Resolver

Signed-off-by: Quintessence <[email protected]>
Copy link

netlify bot commented Mar 14, 2024

Deploy Preview for spiffe ready!

Name Link
🔨 Latest commit f7df7db
🔍 Latest deploy log https://app.netlify.com/sites/spiffe/deploys/663e2037a6fc7100072ea65f
😎 Deploy Preview https://deploy-preview-302--spiffe.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@quintessence
Copy link
Contributor Author

For the server diagram, a couple things:

  • draw.io became diagrams.net
  • When you upload the new server.drawio file to diagrams.net it is still the source image, so you can edit and export it

@quintessence
Copy link
Contributor Author

Hey @mchurichi would you mind reviewing these? :)

Copy link
Member

@mchurichi mchurichi left a comment

Choose a reason for hiding this comment

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

Thank you @quintessence for combining all these changes! I've just left a few comments.

content/docs/latest/deploying/registering.md Outdated Show resolved Hide resolved
content/docs/latest/planning/extending.md Outdated Show resolved Hide resolved
content/docs/latest/spiffe-about/get-involved.md Outdated Show resolved Hide resolved
data/users.yaml Outdated Show resolved Hide resolved
content/docs/latest/spire-about/spire-concepts.md Outdated Show resolved Hide resolved
- Fixed branding URLs
- Re-added VMWare Secrets Manager

Signed-off-by: Quintessence <[email protected]>
Signed-off-by: Quintessence <[email protected]>
@quintessence
Copy link
Contributor Author

Hello! I saw that main was pulled into the branch and wanted to break out (for ease of reading) what needs to be resolved on the PR so it can be merged :)

@evan2645
Copy link
Member

I sync’d up with @quintessence last week on this, made a suggestion which I think has been accepted. Also, just to remove the conversation around DCO and attribution, we backed out the commit related to #285 ... also had a look at #262 which included some changes now found in this PR, but those changes were limited to focused deletions etc .. I thought it’s probably fine to include, but let me know if you prefer to cherry pick there as well

Copy link
Member

@mchurichi mchurichi left a comment

Choose a reason for hiding this comment

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

LGTM!, thank you @quintessence for your patience 🙂

Copy link
Contributor

@sanderson042 sanderson042 left a comment

Choose a reason for hiding this comment

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

There's a minor issue with a few missing periods that could optionally be fixed.

I also wanted to flag a possible security concern. It's probably nothing, but maybe someone with more expertise should review it. @evan2645 ?

content/docs/latest/deploying/configuring.md Outdated Show resolved Hide resolved
content/docs/latest/deploying/configuring.md Outdated Show resolved Hide resolved
diagrams/server.drawio Outdated Show resolved Hide resolved
Copy link
Contributor

@sanderson042 sanderson042 left a comment

Choose a reason for hiding this comment

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

Hi Quintessence - thanks for fixing those two missing periods. There's one more missing period on line 150.

@quintessence quintessence force-pushed the urls-node-resolver branch 2 times, most recently from 41e6f6b to 7879fb7 Compare May 7, 2024 20:55
@quintessence
Copy link
Contributor Author

It looks like commit 7879fb7 has a failed DCO, even though the signature is there and is also on prior commits. Is there a way to re-trigger the DCO check? A bot command to run or similar?

@quintessence
Copy link
Contributor Author

I'm wondering if it's reading the "fail" from 37c2460 as a DCO failure - but it wasn't, the Deploy Preview failed there for some reason.

@quintessence
Copy link
Contributor Author

Tried another force push with signature just in case, but alas no 🤔

quintessence and others added 4 commits May 8, 2024 13:18
Co-authored-by: Steve Anderson <[email protected]>
Signed-off-by: Quintessence <[email protected]>
Co-authored-by: Steve Anderson <[email protected]>
Signed-off-by: Quintessence <[email protected]>
Signed-off-by: Quintessence <[email protected]>
Signed-off-by: Quintessence <[email protected]>
@mchurichi
Copy link
Member

@quintessence thanks for fixing the commit history :) this looks good to me, it just needs to be updated with the latest changes from master and that should be it.
@sanderson042 do you have any pending comment?

Copy link
Contributor

@sanderson042 sanderson042 left a comment

Choose a reason for hiding this comment

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

Hi @quintessence - Approved! 🚀
Thank you very much for all your work on this. You really persevered against a variety of technical and logistical issues. Thanks Maxi and Evan for your help, too!

@quintessence
Copy link
Contributor Author

🎉

@mchurichi mchurichi merged commit c6f3d32 into spiffe:master May 10, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants