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

📖 fix escaped html in markdown code segments #3541

Conversation

typeid
Copy link
Contributor

@typeid typeid commented Aug 17, 2023

Issue #3534

  • we are using markerdocs as mdBook preprocessor to generate most of our References section (e.g. CRD Validation)
  • this preprocessor writes HTML but the text fields also contain markdown (e.g. this line)
  • we call html.EscapeString() on the output of the preprocessor (see here)
  • the preprocessed output is then parsed as markdown by mdBook

Basically, mdBook handles the content as raw strings (code block) thus quotation marks and other HTML escaped symbols are not escaped

  1. Raw text:
 object: `{policy: "delete"}`
  1. Preprocessor wraps it with HTML in escaped format
object: `{policy: "delete"}`
  1. mdBook picks up on the markdown backticks and further wraps it in the according HTML for the markdown format without interpreting the escaped characters:
<code class="hljs">{policy: &#34;delete&#34;}</code>

This PR aims to fix this issue by not HTML escaping the markdown code segments contained in the text, leaving the behavior up to mdBook.

Fixes #3540

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 17, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @typeid. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 17, 2023
@typeid
Copy link
Contributor Author

typeid commented Aug 17, 2023

./install-and-build.sh works locally.
I saw that there was a fix on the netlify/kubebuilder/deploy-preview, and the deploy preview works on another PR. So I'm wondering if this error could be sporadic. Could we re-trigger the netlify job?

Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

Can you please rebase this PR with the latest changes merged in the master so that we can check the change via the preview ?

@typeid typeid force-pushed the fix_docsquotes_displayed_as_escaped_html branch from ba91ee2 to 1d9d477 Compare August 17, 2023 18:51
@typeid
Copy link
Contributor Author

typeid commented Aug 17, 2023

@camilamacedo86 Ah indeed, forgot to rebase. Done and the deploy-preview works now :)

Copy link
Member

@camilamacedo86 camilamacedo86 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 for the amazing contribution 🥇

It is possible to check that it is fixed now:

Screenshot 2023-08-18 at 07 02 17

/approved

/lgtm

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 18, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 18, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, typeid

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2023
@typeid
Copy link
Contributor Author

typeid commented Aug 18, 2023

/retest

@k8s-ci-robot k8s-ci-robot merged commit 4d43972 into kubernetes-sigs:master Aug 18, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Minor grammar errors in the Makefile template
3 participants