Undeprecate /_watcher endpoints by hub-cap · Pull Request #36269 · elastic/elasticsearch

hub-cap · 2018-12-05T15:44:38Z

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 · 2018-12-05T15:44:40Z

Pinging @elastic/es-core-features

hub-cap · 2018-12-05T15:48:19Z

...atcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java


        // @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


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

Yeah, that sounds good.

hub-cap · 2018-12-05T16:29:42Z

@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 · 2018-12-05T16:45:14Z

@elasticmachine run the gradle build tests 2

hub-cap · 2018-12-05T18:02:28Z

@elasticmachine run the gradle build tests 2

jasontedor

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

jasontedor · 2018-12-07T17:27:40Z

...tcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java

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

        // @deprecated Remove deprecations in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:27:47Z

...in/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java

@@ -38,14 +38,14 @@ public class RestAckWatchAction extends WatcherRestHandler {
    public RestAckWatchAction(Settings settings, RestController controller) {
        super(settings);
        // @deprecated Remove deprecations in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:27:55Z

...watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java

@@ -34,8 +34,8 @@ public class RestDeleteWatchAction extends WatcherRestHandler {
    public RestDeleteWatchAction(Settings settings, RestController controller) {
        super(settings);
        // @deprecated Remove deprecations in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:28:02Z

...atcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java

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

        // @deprecated Remove deprecations in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:28:08Z

...in/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java

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

        // @deprecated Remove deprecations in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:28:12Z

...in/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java

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

        // @deprecated Remove deprecations in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:28:54Z

...atcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java


        // @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


Yeah, that sounds good.

jasontedor · 2018-12-07T17:29:01Z

...atcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java

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

        // @deprecated Remove in 6.0


Is this comment stale?

jasontedor · 2018-12-07T17:29:05Z

...atcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java

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

        // @deprecated Remove deprecations in 6.0


Is this comment stale?

* 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) ...

Undeprecate /_watcher endpoints

e57d62c

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.

hub-cap added >deprecation :Distributed/Watcher v6.6.0 labels Dec 5, 2018

hub-cap commented Dec 5, 2018

View reviewed changes

hub-cap mentioned this pull request Dec 5, 2018

Deprecate X-Pack centric watcher endpoints #36218

Merged

hub-cap added 2 commits December 6, 2018 09:39

Merge remote-tracking branch 'upstream/6.x' into undeprecate_watcher

468c2e5

Merge remote-tracking branch 'upstream/6.x' into undeprecate_watcher

887bbb2

droberts195 mentioned this pull request Dec 7, 2018

Deprecate /_xpack/security/* in favor of /_security/* #36293

Merged

hub-cap requested a review from jasontedor December 7, 2018 16:27

jasontedor approved these changes Dec 7, 2018

View reviewed changes

hub-cap added 2 commits December 7, 2018 11:53

Cleanup comments

70e7e17

Merge remote-tracking branch 'upstream/6.x' into undeprecate_watcher

45ff2e2

hub-cap merged commit 3d5d854 into elastic:6.x Dec 7, 2018

droberts195 mentioned this pull request Jan 3, 2019

Deprecate X-Pack centric REST endpoints #35958

Closed

11 tasks

codebrain mentioned this pull request Jan 25, 2019

[meta] 6.6.0 Release elastic/elasticsearch-net#3552

Closed

48 tasks

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

		// @deprecated Remove deprecations in 6.0

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

		// @deprecated Remove deprecations in 6.0

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

		// @deprecated Remove deprecations in 6.0

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

		// @deprecated Remove deprecations in 6.0

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

		// @deprecated Remove in 6.0

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

		// @deprecated Remove deprecations in 6.0

Conversation

hub-cap commented Dec 5, 2018

Uh oh!

elasticmachine commented Dec 5, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hub-cap commented Dec 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hub-cap commented Dec 5, 2018

Uh oh!

hub-cap commented Dec 5, 2018

Uh oh!

jasontedor left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hub-cap commented Dec 5, 2018 •

edited

Loading