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

MINOR: fix code listings security.html #10770

Merged
merged 3 commits into from
Jun 1, 2021

Conversation

jlprat
Copy link
Contributor

@jlprat jlprat commented May 26, 2021

Fix examples under security.html so they use the right bash icon (>
instead of $) and also uses the right tool for showing code listings

Some of the diffs are caused also by the IDE aligning html code properly.

Committer Checklist (excluded from commit message)

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation (including upgrade notes)

Fix examples under security.html so they use the right bash icon (`>`
instead of `$`) and also uses the right tool for showing code listings
@jlprat
Copy link
Contributor Author

jlprat commented May 26, 2021

CC. @cadonna as you reviewed the last doc changes on formatting and styling, you might want to review these as well. I split the changes in several PRs so it's more bearable to review.

Copy link
Contributor

@showuon showuon left a comment

Choose a reason for hiding this comment

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

@jlprat , thanks for the PR. I had a quick look, and left some comments.

login module may be specified in the config value. If multiple mechanisms are configured on a
listener, configs must be provided for each mechanism using the listener and mechanism prefix.
For example,
<p>Brokers may also configure JAAS using the broker configuration property <code>sasl.jaas.config</code>.
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That li tag is currently closed at line 508. It's a 3 level nested ordered lists. Between line 402 and 508 we have the whole sublists as part of that li element. That's the reason the closing li element seems to be missing, it's just really down the page.

image

@@ -1835,28 +1834,28 @@ <h5 class="anchor-heading"><a id="operations_resources_and_protocols" class="anc
<td></td>
<td></td>
<td>Creating delegation tokens has special rules, for this please see the
<a id="security_delegation_token" href="#security_delegation_token">Authentication using Delegation Tokens</a> section.</td>
<a id="security_delegation_token_1" href="#security_delegation_token">Authentication using Delegation Tokens</a> section.</td>
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice fix!

Copy link
Contributor

@cadonna cadonna left a comment

Choose a reason for hiding this comment

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

@jlprat Thank you!

Here my feedback!

The added indentations sometimes do not match the previous section at the same level.

docs/security.html Show resolved Hide resolved
docs/security.html Outdated Show resolved Hide resolved
docs/security.html Outdated Show resolved Hide resolved
docs/security.html Outdated Show resolved Hide resolved
Comment on lines 431 to 436
<p>Brokers may also configure JAAS using the broker configuration property <code>sasl.jaas.config</code>.
The property name must be prefixed with the listener prefix including the SASL mechanism,
i.e. <code>listener.name.{listenerName}.{saslMechanism}.sasl.jaas.config</code>. Only one
login module may be specified in the config value. If multiple mechanisms are configured on a
listener, configs must be provided for each mechanism using the listener and mechanism prefix.
For example,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why the indentation here? It should be on the same level as the previous paragraph, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, it seems the above paragraphs should be indented to the right, there are several nested <ol> and <li> and <p> that didn't follow indentation.
I'm fixing these now.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we misunderstood each other. The line that starts with The property name ... should be aligned with <p>Brokers may also .... I am also fine, if you do not fix that. I think it is understandable and I see that the indentation is not really consistent in this file.

For example, <a href="#security_sasl_gssapi_clientconfig">GSSAPI</a>
credentials may be configured as:
<pre class="line-numbers"><code class="language-text">KafkaClient {
If JAAS configuration is defined at different levels, the order of precedence used is:
Copy link
Contributor

Choose a reason for hiding this comment

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

Also this indentation do not seem to align to the previous section header JAAS configuration for Kafka brokers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as previous, you are right, it needs to be aligned with the contents of the header JAAS configuration for Kafka brokers. However, the problem here was that the previous content was misaligned.

@jlprat
Copy link
Contributor Author

jlprat commented May 27, 2021

Hi @cadonna thanks a lot for the feedback. I fixed the missing > characters. About the misalignment, you were right, however it was not from the lines you mention, but the previous ones.

Copy link
Contributor

@cadonna cadonna left a comment

Choose a reason for hiding this comment

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

@jlprat Thank you for the update!

Here my feedback!

Once you answered to that, we can merge this PR and live with some indentation inconsistencies.

docs/security.html Outdated Show resolved Hide resolved
docs/security.html Outdated Show resolved Hide resolved
docs/security.html Show resolved Hide resolved
Comment on lines 431 to 436
<p>Brokers may also configure JAAS using the broker configuration property <code>sasl.jaas.config</code>.
The property name must be prefixed with the listener prefix including the SASL mechanism,
i.e. <code>listener.name.{listenerName}.{saslMechanism}.sasl.jaas.config</code>. Only one
login module may be specified in the config value. If multiple mechanisms are configured on a
listener, configs must be provided for each mechanism using the listener and mechanism prefix.
For example,
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we misunderstood each other. The line that starts with The property name ... should be aligned with <p>Brokers may also .... I am also fine, if you do not fix that. I think it is understandable and I see that the indentation is not really consistent in this file.

@jlprat
Copy link
Contributor Author

jlprat commented Jun 1, 2021

Thanks @cadonna All comments addressed!

@cadonna
Copy link
Contributor

cadonna commented Jun 1, 2021

The test failures are unrelated since this is a pure doc change.

@cadonna cadonna merged commit 054d5f9 into apache:trunk Jun 1, 2021
@jlprat jlprat deleted the MINOR-fix-code-listings-security branch June 1, 2021 12:00
@jlprat
Copy link
Contributor Author

jlprat commented Jun 1, 2021

Thanks @cadonna !

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.

3 participants