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

OS Docs Overhaul - theming change, many new articles #11258

Merged
merged 35 commits into from
Nov 25, 2024

Conversation

paulOsinski
Copy link
Contributor

@paulOsinski paulOsinski commented Nov 13, 2024

This PR changes the base theme from Docsy into the more workable 'Doks' theme. (It has a dark mode - sold). It also adds many new tutorials and guides to our docs.

Hugo is still a dependency. However with this version of the repo there is no need to install the theme as a git submodule. Instead, cd into docs, npm install to pull the theme and then npm run dev to view the docs locally with the new theme in place.

  • Instructions on configuring, installing and maintaining an open source repo are now stored under "Open Source DefectDojo".
  • Certain OS Docs have been moved to an archive due to redundancy.
  • The new docs are focused on describing features, and guides on using a working instance.
Screenshot 2024-11-13 at 6 28 53 PM Screenshot 2024-11-13 at 6 29 41 PM Screenshot 2024-11-13 at 6 28 19 PM

@github-actions github-actions bot added the docs label Nov 13, 2024
Copy link

dryrunsecurity bot commented Nov 13, 2024

DryRun Security Summary

The changes in this pull request focus on updating the project's .gitignore file and the GitHub Actions workflow responsible for building and deploying the website to GitHub Pages, which do not directly impact the application's security but require review to ensure no sensitive information is committed and that the new versions of the tools being used (Hugo and Node.js) do not introduce any security vulnerabilities.

Expand for full summary

Summary:

The changes in this pull request are primarily focused on updating the project's .gitignore file and the GitHub Actions workflow responsible for building and deploying the website to GitHub Pages. From an application security perspective, these changes do not directly impact the application's security, but it's important to review them to ensure that no sensitive information is being inadvertently committed to the repository and that the new versions of the tools being used (Hugo and Node.js) do not introduce any security vulnerabilities.

The .gitignore file updates are related to managing the project's documentation-related files and configurations, which is a common practice to keep sensitive information out of the version control system. The GitHub Actions workflow updates include upgrading the Hugo and Node.js versions, caching dependencies, and simplifying the workflow. While these changes are generally positive, it's crucial to ensure that the new versions of the tools do not introduce any security issues and that the Hugo configuration file and GitHub Pages deployment settings are properly secured.

Files Changed:

  1. .gitignore: The changes to the .gitignore file are focused on excluding various documentation-related files and configurations from the Git repository, such as generated files, development environment configurations, and license information. These changes do not directly impact the application's security, but it's important to ensure that no sensitive information is being inadvertently committed to the repository.

  2. .github/workflows/gh-pages.yml: The changes to the GitHub Actions workflow include upgrading the Hugo and Node.js versions, caching dependencies, and simplifying the workflow. These changes are generally positive, but it's important to ensure that the new versions of the tools do not introduce any security vulnerabilities and that the Hugo configuration file and GitHub Pages deployment settings are properly secured.

Code Analysis

We ran 9 analyzers against 30 files and 0 analyzers had findings. 9 analyzers had no findings.

Riskiness

🟢 Risk threshold not exceeded.

View PR in the DryRun Dashboard.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@kiblik
Copy link
Contributor

kiblik commented Nov 14, 2024

Is it possible to increase the versions of Hugo and Node?

- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.81.0'
extended: true
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20.x'

@paulOsinski paulOsinski marked this pull request as ready for review November 19, 2024 19:36
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@kiblik
Copy link
Contributor

kiblik commented Nov 20, 2024

Is it possible to increase the versions of Hugo and Node?

- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.81.0'
extended: true
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20.x'

Note for maintainers: This will need to be adjusted as well https://github.com/DefectDojo-Inc/Documentation/blob/c6e1a446c3dbf2c931972cfbbdaef3ee20df77c8/.github/workflows/deploy-gh-pages-branch.yml#L11-L20

@mtesauro
Copy link
Contributor

I agree with @kiblik about making sure we rev the versions as part of this upgrade to the docs site.

Can't wait for docs dark mode 😄

@paulOsinski
Copy link
Contributor Author

@kiblik yes, that change was done in this commit.

@Maffooch
Copy link
Contributor

Tests will need to be updated to point at the new doc paths:

@paulOsinski
Copy link
Contributor Author

Tests will need to be updated to point at the new doc paths:

This should be settled now, thanks!

@Maffooch Maffooch changed the title OS Docs Overhaul - themeing change, many new articles OS Docs Overhaul - theming change, many new articles Nov 22, 2024
Copy link
Contributor

@Maffooch Maffooch left a comment

Choose a reason for hiding this comment

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

There will likely be some revving on this to make sure the automation is set correctly here

Will have to do that once it is in dev

Copy link
Contributor

@mtesauro mtesauro left a comment

Choose a reason for hiding this comment

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

Approved

@mtesauro mtesauro merged commit 8bede6f into DefectDojo:dev Nov 25, 2024
73 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants