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

Undeprecate /_watcher endpoints #36269

Merged
merged 5 commits into from
Dec 7, 2018
Merged

Conversation

hub-cap
Copy link
Contributor

@hub-cap hub-cap commented Dec 5, 2018

We deprecated these awhile ago in favor of /_xpack/watcher
endpoints. Yet, this is no longer the direction that we want to go in,
instead we want to remove the /_xpack namespace. This commit
undeprecates the /_watcher endpoint.

We deprecated these awhile ago in favor of /_xpack/watcher
endpoints. Yet, this is no longer the direction that we want to go in,
instead we want to remove the /_xpack namespace. This commit
undeprecates the /_watcher endpoint.
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-features

@@ -30,12 +30,17 @@ public RestWatchServiceAction(Settings settings, RestController controller) {

// @deprecated Remove in 6.0
// NOTE: we switched from PUT in 2.x to POST in 5.x
// NOTE: We added back the old URL with the new VERB (POST) since we are deprecating _xpack/* URIs in 7.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

im not 100% sure i did this right. Should I instead put both the PUT and POST back to non deprecated? In 7, only POST /_watcher and POST /_xpack/watcher exist, so this is why I did not undeprecate the PUT /_watcher

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, that sounds good.

@hub-cap
Copy link
Contributor Author

hub-cap commented Dec 5, 2018

@jasontedor I believe I will have to also backport this to 6.5 because master will test against both 6.6.0 and 6.5.latest, right? I did not see the changes you made for /_license backported to 6.5, but I guess that is because there are not tests on the FullClusterRestart (or others) since its hard to test licensing changes. Ill gladly add/backport the label, I just want a sanity check.

disregard: looks like the build is passing w/o these, the problem was a issue w/ our build testing against every bwc build ever.

@hub-cap
Copy link
Contributor Author

hub-cap commented Dec 5, 2018

@elasticmachine run the gradle build tests 2

1 similar comment
@hub-cap
Copy link
Contributor Author

hub-cap commented Dec 5, 2018

@elasticmachine run the gradle build tests 2

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

The change looks good, I left some comments about the comments.

@@ -41,14 +41,14 @@ public RestActivateWatchAction(Settings settings, RestController controller) {
final DeactivateRestHandler deactivateRestHandler = new DeactivateRestHandler(settings);

// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -38,14 +38,14 @@
public RestAckWatchAction(Settings settings, RestController controller) {
super(settings);
// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -34,8 +34,8 @@
public RestDeleteWatchAction(Settings settings, RestController controller) {
super(settings);
// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -57,14 +57,14 @@ public RestExecuteWatchAction(Settings settings, RestController controller) {
super(settings);

// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -35,8 +35,8 @@ public RestGetWatchAction(Settings settings, RestController controller) {
super(settings);

// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -41,10 +41,10 @@ public RestPutWatchAction(Settings settings, RestController controller) {
super(settings);

// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -30,12 +30,17 @@ public RestWatchServiceAction(Settings settings, RestController controller) {

// @deprecated Remove in 6.0
// NOTE: we switched from PUT in 2.x to POST in 5.x
// NOTE: We added back the old URL with the new VERB (POST) since we are deprecating _xpack/* URIs in 7.0
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, that sounds good.

@@ -30,12 +30,17 @@ public RestWatchServiceAction(Settings settings, RestController controller) {

// @deprecated Remove in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@@ -31,10 +31,10 @@ public RestWatcherStatsAction(Settings settings, RestController controller) {
super(settings);

// @deprecated Remove deprecations in 6.0
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment stale?

@hub-cap hub-cap merged commit 3d5d854 into elastic:6.x Dec 7, 2018
jasontedor added a commit to liketic/elasticsearch that referenced this pull request Dec 9, 2018
* elastic/6.x: (37 commits)
  [HLRC] Added support for Follow Stats API (elastic#36253)
  Exposed engine must have all ops below gcp during rollback (elastic#36159)
  TEST: Always enable soft-deletes in ShardChangesTests
  Use delCount of SegmentInfos to calculate numDocs (elastic#36323)
  Add soft-deletes upgrade tests (elastic#36286)
  Remove LocalCheckpointTracker#resetCheckpoint (elastic#34667)
  Option to use endpoints starting with _security (elastic#36379)
  [CCR] Restructured QA modules (elastic#36404)
  RestClient: on retry timeout add root exception (elastic#25576)
  [HLRC] Add support for put privileges API (elastic#35679)
  HLRC: Add rollup search (elastic#36334)
  Explicitly recommend to forceMerge before freezing (elastic#36376)
  Rename internal repository actions to be internal (elastic#36377)
  Core: Remove parseDefaulting from DateFormatter (elastic#36386)
  [ML] Prevent stack overflow while copying ML jobs and datafeeds (elastic#36370)
  Docs: Fix Jackson reference (elastic#36366)
  [ILM] Fix issue where index may not yet be in 'hot' phase (elastic#35716)
  Undeprecate /_watcher endpoints (elastic#36269)
  Docs: Fix typo in bool query (elastic#36350)
  HLRC: Add delete template API (elastic#36320)
  ...
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.

3 participants