Skip to content

Conversation

@jsoref
Copy link
Contributor

@jsoref jsoref commented Dec 31, 2018

This is the docs portion of #37035 split per @tvernum.

Since there were so few i.e.s here, I just left them, it isn't worth dropping, and for docs it seems more useful to leave them fixed.

There are probably merge conflicts, but realistically, as noted in the other PR, there will always be merge conflicts, this repo moves way too fast for large changes like this. I'll cross that bridge closer to when reviews are done.

--
Generated by https://github.com/jsoref/spelling f; to maintain your repo, please consider fchurn

@jsoref jsoref force-pushed the spelling-docs branch 2 times, most recently from 1de0b5d to c2336bb Compare December 31, 2018 15:06
@jsoref
Copy link
Contributor Author

jsoref commented Dec 31, 2018

Changes from the original PR:

  1. non docs/ / x-pack/docs commits were dropped (if people were watching, the way I did that was by deleting everything outside of docs/ / x-pack/docs and rebasing onto that, and then I forgot to remove that commit...; repeated for x-pack/docs because I didn't notice that right away)
  2. height is now high per Spelling #37035 (comment)
  3. I dropped pluggable-similarities.html per Spelling #37035 (comment)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-docs

Copy link
Member

Choose a reason for hiding this comment

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

@nik9000 is there anything we can do do make this type of typo fail the docs build?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fwiw, I've written Travis integration for checkstyle: https://github.com/checkstyle/checkstyle/blob/master/.ci/test-spelling-unknown-words.sh

The same sort of thing can be done in any project. If you're not a fan of shell scripts, you can of course port the code to Java/Groovy.

Copy link
Member

Choose a reason for hiding this comment

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

checking the speeling would work, but in this specific case, given that :request: and :response: as well as :api: are some kind of keyword needed to fill the docs content, we could fail the build when anything other than the known words are used within those delimiters. I think :)

Copy link
Member

Choose a reason for hiding this comment

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

@nik9000 another one that we may want to catch

@javanna
Copy link
Member

javanna commented Jan 2, 2019

test this please

@javanna
Copy link
Member

javanna commented Jan 2, 2019

retest this please

@javanna
Copy link
Member

javanna commented Jan 2, 2019

I took the liberty to merge master in, as there were a couple of noisy tests causing failures that got muted on master meanwhile. Remember to pull from your own remote ;)

@jsoref
Copy link
Contributor Author

jsoref commented Jan 2, 2019

I've rebased forward and cleaned out the files that were supposed to be renamed (my original hg repo properly had renames, but somewhere along the way the delete got lost)

@javanna
Copy link
Member

javanna commented Jan 2, 2019

retest this please

@javanna
Copy link
Member

javanna commented Jan 2, 2019

Seems like the build is failing due to some leftover references to the classes being renamed:

17:45:12 > Task :x-pack:plugin:watcher:compileJava FAILED
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java:135: error: cannot find symbol
17:45:12 Build cache key for task ':x-pack:plugin:watcher:compileJava' is 41a0796ed15ec69b9a9522ef797ce2d6
17:45:12 Task ':x-pack:plugin:watcher:compileJava' is not up-to-date because:
17:45:12   No history is available.
17:45:12 All input files are considered out-of-date for incremental task ':x-pack:plugin:watcher:compileJava'.
17:45:12 Full recompilation is required because no incremental change information is available. This is usually caused by clean builds or changing compiler arguments.
17:45:12 import org.elasticsearch.xpack.watcher.notification.email.attachment.HttpEmailAttachementParser;
17:45:12 Compiling with JDK Java compiler API.
17:45:12 :x-pack:plugin:watcher:compileJava (Thread[Execution worker for ':' Thread 7,5,main]) completed. Took 1.143 secs.
17:45:12                                                                     ^
17:45:12   symbol:   class HttpEmailAttachementParser
17:45:12   location: package org.elasticsearch.xpack.watcher.notification.email.attachment
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java:293: error: cannot find symbol
17:45:12         emailAttachmentParsers.put(HttpEmailAttachementParser.TYPE, new HttpEmailAttachementParser(httpClient, templateEngine));
17:45:12                                    ^
17:45:12   symbol:   variable HttpEmailAttachementParser
17:45:12   location: class Watcher
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java:293: error: cannot find symbol
17:45:12         emailAttachmentParsers.put(HttpEmailAttachementParser.TYPE, new HttpEmailAttachementParser(httpClient, templateEngine));
17:45:12                                                                         ^
17:45:12   symbol:   class HttpEmailAttachementParser
17:45:12   location: class Watcher
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/HttpRequestAttachment.java:51: error: cannot find symbol
17:45:12                 .startObject(HttpEmailAttachementParser.TYPE)
17:45:12                              ^
17:45:12   symbol:   variable HttpEmailAttachementParser
17:45:12   location: class HttpRequestAttachment
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/HttpRequestAttachment.java:52: error: package HttpEmailAttachementParser.Fields does not exist
17:45:12                 .field(HttpEmailAttachementParser.Fields.REQUEST.getPreferredName(), requestTemplate, params);
17:45:12                                                         ^
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/HttpRequestAttachment.java:54: error: package HttpEmailAttachementParser.Fields does not exist
17:45:12             builder.field(HttpEmailAttachementParser.Fields.CONTENT_TYPE.getPreferredName(), contentType);
17:45:12                                                            ^
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/HttpRequestAttachment.java:57: error: package HttpEmailAttachementParser.Fields does not exist
17:45:12             builder.field(HttpEmailAttachementParser.Fields.INLINE.getPreferredName(), inline);
17:45:12                                                            ^
17:45:12 /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request+docs-check/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/HttpRequestAttachment.java:68: error: cannot find symbol
17:45:12         return HttpEmailAttachementParser.TYPE;
17:45:12                ^
17:45:12   symbol:   variable HttpEmailAttachementParser
17:45:12   location: class HttpRequestAttachment
17:45:12 Note: Some input files use or override a deprecated API.
17:45:12 Note: Recompile with -Xlint:deprecation for details.
17:45:12 Note: Some input files use unchecked or unsafe operations.
17:45:12 Note: Recompile with -Xlint:unchecked for details.
17:45:12 8 errors
17:45:12 
17:45:12 FAILURE: Build failed with an exception.
17:45:12 219 actionable tasks: 218 executed, 1 up-to-date
17:45:12 
17:45:12 
17:45:12 * What went wrong:
17:45:12 Publishing build scan...
17:45:12 Execution failed for task ':x-pack:plugin:watcher:compileJava'.
17:45:12 > Compilation failed; see the compiler error output for details.

@jsoref
Copy link
Contributor Author

jsoref commented Jan 2, 2019

Yeah, those commits aren't supposed to be there, I'm trying to figure out what I did wrong...

new ParseField("compare_analyzers"), CompareAnalyzers::parse));
NamedXContentRegistry executeableSectionRegistry = new NamedXContentRegistry(entries);
return ESClientYamlSuiteTestCase.createParameters(executeableSectionRegistry);
NamedXContentRegistry executableSectionRegistry = new NamedXContentRegistry(entries);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is now the only file that's a .java -- it's a bit odd that it lives in docs/

Copy link
Member

Choose a reason for hiding this comment

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

Got it, I think it's there because it's the test class that tests the docs snippets. I think it makes sense for it to be there. This way when running ./gradlew :docs:check that one gets run.

@jsoref
Copy link
Contributor Author

jsoref commented Jan 2, 2019

@javanna : hopefully this should pass

@javanna
Copy link
Member

javanna commented Jan 3, 2019

retest this please

@javanna
Copy link
Member

javanna commented Jan 3, 2019

run gradle build tests 2

@javanna
Copy link
Member

javanna commented Jan 3, 2019

retest this please

* Added <<actions-pagerduty, PagerDuty action>>
* Added support for adding <<configuring-email-attachments, attachments to emails>>
via HTTP requests and superceding and deprecating the usage of `attach_data`
via HTTP requests and superseding and deprecating the usage of `attach_data`
Copy link
Contributor

Choose a reason for hiding this comment

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

I wouldn't consider this one wrong, but otherwise the changes LGTM

@javanna
Copy link
Member

javanna commented Jan 3, 2019

run gradle build tests 2

@javanna
Copy link
Member

javanna commented Jan 3, 2019

run gradle build tests 1

@javanna
Copy link
Member

javanna commented Jan 4, 2019

retest this please

@javanna javanna added the v7.0.0 label Jan 7, 2019
@javanna javanna merged commit edb4832 into elastic:master Jan 7, 2019
@javanna
Copy link
Member

javanna commented Jan 7, 2019

thanks a lot @jsoref for all these fixes !!! And even more for making us fix the 5 different ways we were able to misspell the name of our own product :)

@jsoref
Copy link
Contributor Author

jsoref commented Jan 7, 2019

Fwiw, that isn't uncommon :-o

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