fix #365 - fix problem of connecting to the influx api with URL which… #400

vicctor · 2017-12-16T21:18:45Z

… does not points to the url root (e.g. localhots:80/influx-api/)

This change was tested with following URLs:
http://localhost:8086
http://localhost:8086/

Proxied connection (influx behind Nginx)
http://loocalhost:8080/influx-api/

… URL which does not points to the url root (e.g. localhots:80/influx-api/) This change was tested with following URLs: http://localhost:8086 http://localhost:8086/ Proxied connection (influx behind Nginx) http://loocalhost:8080/influx-api/

codecov-io · 2017-12-16T21:31:18Z

Codecov Report

Merging #400 into master will increase coverage by 0.07%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master     #400      +/-   ##
============================================
+ Coverage     86.55%   86.63%   +0.07%     
- Complexity      301      302       +1     
============================================
  Files            20       20              
  Lines          1294     1294              
  Branches        135      135              
============================================
+ Hits           1120     1121       +1     
+ Misses          114      113       -1     
  Partials         60       60

Impacted Files	Coverage Δ	Complexity Δ
src/main/java/org/influxdb/impl/InfluxDBImpl.java	`87.68% <0%> (+0.3%)`	`68% <0%> (+1%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6049aff...1339166. Read the comment docs.

fmachado · 2017-12-16T22:58:01Z

@vicctor would be great if you could provide a docker-compose.yml file containing both nginx properly configured and influxdb running so I could run the tests against it.

…ss different URL's for testing (also remoted unused code with selection of API notAPI port)

Anyway, I believe that it's better to keep the URL in single URL property

- changed compile-and-test.sh scripts, so it starts both standard and "proxy" - added simple nginx config for docker container - tests related to UDP communication moved to separate class and skipped in case of http proxy testing

majst01 · 2017-12-20T06:33:36Z

Hi @vicctor

Please do not format any of the files for a PR, try to reduce the changes needed, you have actually add more than 1000 lines and remove about 800, this makes it impossible to review this PR.

vicctor · 2017-12-20T07:13:38Z

@majst01 Hi Steffan, thx for quick response. The truth is that I'm new in this project and I was in hurry to fix this issue, so all I can say sorry about that.
Indeed I found that I committed unnecessary white spaces in the pom file. I will reduce it and send yet another pull request later. Please, can you also give me some hints if I can reduce something more? It would be also great if you can provide me with coding-rules used in the project, so I can configure my IDE using it.

Also small explanation about what I did:
I added automatic tests with nginx proxy using the compile-and-test.sh (I found this approach is used at the moment on travis).
I can see however that this approach generates falsy codecov results. I'ts because tests are not started from surefire but from the .sh script. My first approach was to use the old good Parametriesed test and provide two different URI's to the InfluxDBTest class. But it turns out that with the JUnit5 I have to do that on every single method. Yesterday I did not found any more time to do that so perhaps it's good thing for next refac. Anyway, I'm also not sure if this is the best choice. Please let me know about your guess/plan.

MaxYuen · 2017-12-21T09:03:00Z

thanks for ur contributions

majst01 · 2018-05-11T10:53:26Z

@vicctor if you still interested in this PR you need to rebase or resolve the conflicts.

majst01 · 2018-05-13T11:45:55Z

This PR does basically the same as #416

majst01 · 2018-06-01T08:08:57Z

pom.xml

@@ -89,6 +89,11 @@
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-surefire-plugin</artifactId>
          <version>2.21.0</version>
+          <configuration>
+            <excludes>
+              <exclude>${someModule.test.excludes}</exclude>


What is this meant for

majst01 · 2018-06-01T08:09:26Z

src/test/java/org/influxdb/InfluxDBFactoryTest.java

 import org.influxdb.dto.Pong;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;

-import okhttp3.OkHttpClient;


Why reformatting this import

majst01 · 2018-06-01T08:10:24Z

src/test/nginx/nginx.conf

+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80


A lot of unrelated and commented code ?

@majst01, I am going to help Mr. @vicctor if he has no time for this PR, just trying to make this PR able to merge. I will address your comment soon

lxhoan · 2018-06-05T08:09:19Z

@majst01, @fmachado . I improved the original works, please review this again, thank you

majst01

almost there

majst01 · 2018-06-05T08:29:34Z

src/test/java/org/influxdb/InfluxDBProxyTest.java

+@RunWith(JUnitPlatform.class)
+public class InfluxDBProxyTest {
+  private InfluxDB influxDB;
+  private String db = "udp";


The database should be named via-proxy or so, but not udp, this is misleading

change naming
BTW, name of the database for UDP is configured at server side

majst01 · 2018-06-05T08:30:14Z

src/test/java/org/influxdb/TestUtils.java

 	}

+	public static String getProxyApiUrl() {
+    return getEnv("PROXY_API_URL", "http://127.0.0.1:8086/");


can you please check formatting, here identation is broken

fixed it, we should have check style for test as well

+ code format + test db naming

fmachado added the kind/enhancement label Dec 16, 2017

Artur Keska added 5 commits December 18, 2017 09:56

chore(): version changed to .xnet so we can use it as custom

7b7410b

refac: replaced IP and port property with one URL, so it's easy to pa…

75c8664

…ss different URL's for testing (also remoted unused code with selection of API notAPI port)

refac: test correction: the port is actually needed in one test.

0550862

Anyway, I believe that it's better to keep the URL in single URL property

chore: restored correct version number

7cb823b

timhallinflux added the proposed label Apr 27, 2018

lxhoan added this to the 2.11 milestone May 14, 2018

lxhoan force-pushed the master branch from f8cad96 to 2887f8f Compare June 1, 2018 03:32

lxhoan added 3 commits June 1, 2018 11:00

Merge branch 'master' into master

05f8915

fix compilation failed

562442a

remove UDP API tests which have been moved to UDPInfluxDBTest

ef9589e

majst01 reviewed Jun 1, 2018

View reviewed changes

code coverage should be generated from running all tests

fd8f830

lxhoan force-pushed the master branch 3 times, most recently from 2c84650 to 511ab70 Compare June 5, 2018 07:34

improve unit test

232be1b

lxhoan force-pushed the master branch from 511ab70 to 232be1b Compare June 5, 2018 07:58

majst01 requested changes Jun 5, 2018

View reviewed changes

fix review:

1339166

+ code format + test db naming

majst01 merged commit c1d60a6 into influxdata:master Jun 5, 2018

lxhoan added a commit that referenced this pull request Jun 6, 2018

add changelog entry for PR #400

f9ca92f

lxhoan mentioned this pull request Aug 22, 2018

Support get/post requests behind http reverse proxy like nginx and ba… #416

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #365 - fix problem of connecting to the influx api with URL which… #400

fix #365 - fix problem of connecting to the influx api with URL which… #400

vicctor commented Dec 16, 2017

codecov-io commented Dec 16, 2017 •

edited

Loading

fmachado commented Dec 16, 2017

majst01 commented Dec 20, 2017

vicctor commented Dec 20, 2017

MaxYuen commented Dec 21, 2017

majst01 commented May 11, 2018

majst01 commented May 13, 2018

majst01 Jun 1, 2018

majst01 Jun 1, 2018

majst01 Jun 1, 2018

lxhoan Jun 1, 2018

lxhoan commented Jun 5, 2018

majst01 left a comment

majst01 Jun 5, 2018

lxhoan Jun 5, 2018

majst01 Jun 5, 2018

lxhoan Jun 5, 2018

fix #365 - fix problem of connecting to the influx api with URL which… #400

fix #365 - fix problem of connecting to the influx api with URL which… #400

Conversation

vicctor commented Dec 16, 2017

codecov-io commented Dec 16, 2017 • edited Loading

Codecov Report

fmachado commented Dec 16, 2017

majst01 commented Dec 20, 2017

vicctor commented Dec 20, 2017

MaxYuen commented Dec 21, 2017

majst01 commented May 11, 2018

majst01 commented May 13, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lxhoan commented Jun 5, 2018

majst01 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Dec 16, 2017 •

edited

Loading