Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
AMBARI-24230. [Logsearch] Update hdfs configuration from Configuratio…
…n Editor fails with 400 Error (#1660)
- Loading branch information
1 parent
53b92a8
commit e5f3b96
Showing
22 changed files
with
413 additions
and
251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/domain/WebClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.ambari.logsearch.domain; | ||
|
|
||
| import javax.ws.rs.client.Entity; | ||
| import javax.ws.rs.client.Invocation; | ||
| import javax.ws.rs.client.WebTarget; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| import org.glassfish.jersey.client.JerseyClient; | ||
| import org.glassfish.jersey.client.JerseyClientBuilder; | ||
| import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class WebClient { | ||
| private static Logger LOG = LoggerFactory.getLogger(WebClient.class); | ||
|
|
||
| private final String host; | ||
| private final int port; | ||
|
|
||
| public WebClient(String host, int port) { | ||
| this.host = host; | ||
| this.port = port; | ||
| } | ||
|
|
||
| public String get(String path) { | ||
| JerseyClient jerseyClient = JerseyClientBuilder.createClient(); | ||
| HttpAuthenticationFeature authFeature = HttpAuthenticationFeature.basicBuilder() | ||
| .credentials("admin", "admin") | ||
| .build(); | ||
| jerseyClient.register(authFeature); | ||
|
|
||
| String url = String.format("http://%s:%d%s", host, port, path); | ||
|
|
||
| LOG.info("Url: {}", url); | ||
|
|
||
| WebTarget target = jerseyClient.target(url); | ||
| Invocation.Builder invocationBuilder = target.request(MediaType.APPLICATION_JSON_TYPE); | ||
| return invocationBuilder.get().readEntity(String.class); | ||
| } | ||
|
|
||
| public String put(String path, String requestBody) { | ||
| JerseyClient jerseyClient = JerseyClientBuilder.createClient(); | ||
| HttpAuthenticationFeature authFeature = HttpAuthenticationFeature.basicBuilder() | ||
| .credentials("admin", "admin") | ||
| .build(); | ||
| jerseyClient.register(authFeature); | ||
|
|
||
| String url = String.format("http://%s:%d%s", host, port, path); | ||
|
|
||
| LOG.info("Url: {}", url); | ||
|
|
||
| WebTarget target = jerseyClient.target(url); | ||
| Invocation.Builder invocationBuilder = target.request(MediaType.APPLICATION_JSON_TYPE); | ||
| String response = invocationBuilder.put(Entity.entity(requestBody, MediaType.APPLICATION_JSON_TYPE)).readEntity(String.class); | ||
|
|
||
| LOG.info("Response: {}", response); | ||
|
|
||
| return response; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchConfigApiSteps.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.ambari.logsearch.steps; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.hasSize; | ||
| import static org.hamcrest.Matchers.not; | ||
|
|
||
| import org.apache.ambari.logsearch.config.api.model.inputconfig.InputConfig; | ||
| import org.apache.ambari.logsearch.config.zookeeper.model.inputconfig.impl.InputConfigGson; | ||
| import org.apache.ambari.logsearch.config.zookeeper.model.inputconfig.impl.InputConfigImpl; | ||
| import org.apache.ambari.logsearch.domain.StoryDataRegistry; | ||
| import org.hamcrest.Matchers; | ||
| import org.jbehave.core.annotations.Then; | ||
| import org.jbehave.core.annotations.When; | ||
|
|
||
| public class LogSearchConfigApiSteps { | ||
| private String response; | ||
| private InputConfig inputConfig; | ||
|
|
||
| @When("LogSearch api request sent: $url") | ||
| public String sendApiRequest(String url) { | ||
| response = StoryDataRegistry.INSTANCE.logsearchClient().get(url); | ||
| return response; | ||
| } | ||
|
|
||
| @Then("Result is an input.config of $inputConfigType with log file path $logFilePath") | ||
| public void checkInputConfig(String inputConfigType, String logFilePath) { | ||
| checkInputConfig(response, inputConfigType, logFilePath); | ||
| } | ||
|
|
||
| public void checkInputConfig(String result, String type, String path) { | ||
| inputConfig = InputConfigGson.gson.fromJson(response, InputConfigImpl.class); | ||
| assertThat(inputConfig.getInput(), is(not(Matchers.nullValue()))); | ||
| assertThat(inputConfig.getInput(), hasSize(1)); | ||
| assertThat(inputConfig.getInput().get(0).getType(), is(type)); | ||
| assertThat(inputConfig.getInput().get(0).getPath(), is(path)); | ||
| } | ||
|
|
||
| @When("Update input config of $inputConfigType path to $logFilePath at $url") | ||
| public void changeAndPut(String inputConfigType, String logFilePath, String url) { | ||
| String putRequest = response.replace(inputConfig.getInput().get(0).getPath(), logFilePath); | ||
| String putResponse = StoryDataRegistry.INSTANCE.logsearchClient().put( | ||
| url, putRequest); | ||
| assertThat(putResponse, is("")); | ||
|
|
||
| String getResponse = sendApiRequest(url); | ||
| checkInputConfig(getResponse, inputConfigType, logFilePath); | ||
| } | ||
| } |
Oops, something went wrong.