honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request elastic/elasticsearch#2334 from areek/fix/x_pack_prefix_license 

Add _xpack prefix to license endpoints

Original commit: elastic/x-pack-elasticsearch@efba1a661d
This commit is contained in:
Areek Zillur 2016-05-24 12:13:14 -04:00
parent 8e25536a0b c14f40ff73
commit c01e47990f
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/x-dev-tools/smoke_test_xpack_rc.py
View File

@ -140,12 +140,12 @@ def smoke_test_release(release, files, expected_hash):
# put the supplied license to ensure that system was built with
license = read_fully(os.path.join(os.path.dirname(__file__), 'license.json'))
conn.request('PUT', '/_license?acknowledge=true', license, headers=headers)
conn.request('PUT', '/_xpack/license?acknowledge=true', license, headers=headers)
res = conn.getresponse()
# reading the result, so we can execute the next request on the same connection
license_resp = json.loads(res.read().decode('utf-8'))
if res.status != 200:
raise RuntimeError('Could not PUT _license, got status %s' % res.status)
raise RuntimeError('Could not PUT _xpack/license, got status %s' % res.status)
if license_resp['license_status'] != 'valid':
raise RuntimeError('Expected license to be valid, but was %s' % license_resp['license_status'])

2
elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestDeleteLicenseAction.java
View File

@ -23,7 +23,7 @@ public class RestDeleteLicenseAction extends BaseRestHandler {
@Inject
public RestDeleteLicenseAction(Settings settings, RestController controller, Client client) {
super(settings, client);
controller.registerHandler(DELETE, "/_license", this);
controller.registerHandler(DELETE, "/_xpack/license", this);
}
@Override

2
elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java
View File

@ -34,7 +34,7 @@ public class RestGetLicenseAction extends BaseRestHandler {
@Inject
public RestGetLicenseAction(Settings settings, RestController controller, Client client) {
super(settings, client);
controller.registerHandler(GET, "/_license", this);
controller.registerHandler(GET, "/_xpack/license", this);
}
/**

4
elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestPutLicenseAction.java
View File

@ -30,8 +30,8 @@ public class RestPutLicenseAction extends BaseRestHandler {
@Inject
public RestPutLicenseAction(Settings settings, RestController controller, Client client) {
super(settings, client);
controller.registerHandler(PUT, "/_license", this);
controller.registerHandler(POST, "/_license", this);
controller.registerHandler(PUT, "/_xpack/license", this);
controller.registerHandler(POST, "/_xpack/license", this);
}
@Override

4
elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/license.delete.json
View File

@ -3,8 +3,8 @@
"documentation": "https://www.elastic.co/guide/en/shield/current/license-management.html",
"methods": ["DELETE"],
"url": {
"path": "/_license",
"paths": ["/_license"],
"path": "/_xpack/license",
"paths": ["/_xpack/license"],
"parts" : {}
},
"body": null

4
elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/license.get.json
View File

@ -3,8 +3,8 @@
"documentation": "https://www.elastic.co/guide/en/shield/current/license-management.html",
"methods": ["GET"],
"url": {
"path": "/_license",
"paths": ["/_license"],
"path": "/_xpack/license",
"paths": ["/_xpack/license"],
"parts" : {
},
"params": {

4
elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/license.post.json
View File

@ -3,8 +3,8 @@
"documentation": "https://www.elastic.co/guide/en/shield/current/license-management.html",
"methods": ["PUT", "POST"],
"url": {
"path": "/_license",
"paths": ["/_license"],
"path": "/_xpack/license",
"paths": ["/_xpack/license"],
"parts" : {
},
"params": {