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

Use https protocol in local nodes per default #1734

Merged
merged 34 commits into from
Dec 11, 2023

Conversation

HansBambel
Copy link

In #1274 (comment) it was noted that the default http protocol resulted in an error Unexpected end of file from server.

When switching to https the error does not occur.

With this PR the default protocol of a local node's url will be https.

The documentation was also updated to reflect that. I was not sure how to handle the text in the Note as it proposes to use HTTPS instead of HTTP, but now this is the default. Should it be omitted or kept to show the change from version 2.2?

Important
I don't know how to run the tests locally as I am not a Java developer and I also do not use elasticsearch, but opensearch (and even this not yet successfully).

@dadoonet dadoonet self-assigned this Oct 18, 2023
@dadoonet dadoonet added update When updating an existing feature component:elasticsearch labels Oct 18, 2023
@dadoonet dadoonet added this to the 2.10 milestone Oct 18, 2023
@dadoonet
Copy link
Owner

The build issue is something I should fix. I'll try to work on this later today. ;)

@HansBambel
Copy link
Author

Great, thanks!

@dadoonet
Copy link
Owner

@HansBambel could you rebase on master please? I'd like to see if the recent changes I did will work...

@HansBambel
Copy link
Author

Sorry, I actually did a rebase, but when pulling again a merge was done by default :-/

If you want me to fix it, I can try to do that.

$ [Thu 19 8:21:16] (base)  ~/fscrawler (use-https-per-default) -> git rebase upstream/master
Successfully rebased and updated refs/heads/use-https-per-default.
$ [Thu 19 8:21:43] (base)  ~/fscrawler (use-https-per-default) -> git push
To https://github.com/HansBambel/fscrawler.git
 ! [rejected]          use-https-per-default -> use-https-per-default (non-fast-forward)
error: failed to push some refs to 'https://github.com/HansBambel/fscrawler.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
$ [Thu 19 8:21:53] (base)  ✘  ~/fscrawler (use-https-per-default) -> git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Merge made by the 'recursive' strategy.
$ [Thu 19 8:22:42] (base)  ~/fscrawler (use-https-per-default) -> git push
Enumerating objects: 37, done.
Counting objects: 100% (31/31), done.
Delta compression using up to 8 threads
Compressing objects: 100% (23/23), done.
Writing objects: 100% (23/23), 3.69 KiB | 3.69 MiB/s, done.
Total 23 (delta 14), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (14/14), completed with 6 local objects.
To https://github.com/HansBambel/fscrawler.git
   dd8aa245..9c04977c  use-https-per-default -> use-https-per-default

@dadoonet
Copy link
Owner

Weird. Apparently the new push did not trigger the CI. I'm going to check.

@dadoonet
Copy link
Owner

I think I fixed the CI problem... Let see... Could you rebase or merge the changes from master branch?

dadoonet and others added 9 commits October 20, 2023 16:15
It was not running anymore
And log in the user before starting the job.
Remove non needed caching docker images
…added to the install phase (default plugin behavior)
Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 5.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](stefanzweifel/git-auto-commit-action@v4...v5)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.16.1 to 1.16.2.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](jhy/jsoup@jsoup-1.16.1...jsoup-1.16.2)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@HansBambel
Copy link
Author

@dadoonet Done!

@dadoonet
Copy link
Owner

Could you rebase again? I'm trying to fix something../ If it fails again, I'll do the github actions changes in another repo... :)

dadoonet and others added 4 commits October 22, 2023 11:02
* Refactor the CLI

We can add more tests and make it a bit more flexible...

* Add a basic docker compose example without Elastic

It helps to test the behavior of the container when we don't have any input.

Related to dadoonet#1727

* Don't hide console logs when running with Docker

I believe it was a mistake doing this. It's better to let the user control the level of logs they want when running the container.

In case of error, it now displays correctly the logs in the docker compose output.

Closes dadoonet#1727.
Bumps [org.xerial:sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.43.2.0 to 3.43.2.1.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](xerial/sqlite-jdbc@3.43.2.0...3.43.2.1)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [co.elastic.clients:elasticsearch-java](https://github.com/elastic/elasticsearch-java) from 8.10.3 to 8.10.4.
- [Release notes](https://github.com/elastic/elasticsearch-java/releases)
- [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md)
- [Commits](elastic/elasticsearch-java@v8.10.3...v8.10.4)

---
updated-dependencies:
- dependency-name: co.elastic.clients:elasticsearch-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Let see if this strategy works better...
@HansBambel
Copy link
Author

Done :)

@dadoonet
Copy link
Owner

@HansBambel I think I fixed the problem in another repo and applied the changes here. Could you rebase again please?

I'm sorry for this :)

dadoonet and others added 13 commits October 24, 2023 08:18
This reverts commit 4a5bd57.
Bumps `tika.version` from 2.9.0 to 2.9.1.

Updates `org.apache.tika:tika-parent` from 2.9.0 to 2.9.1
- [Changelog](https://github.com/apache/tika/blob/main/CHANGES.txt)
- [Commits](apache/tika@2.9.0...2.9.1)

Updates `org.apache.tika:tika-core` from 2.9.0 to 2.9.1
- [Changelog](https://github.com/apache/tika/blob/main/CHANGES.txt)
- [Commits](apache/tika@2.9.0...2.9.1)

Updates `org.apache.tika:tika-parsers-standard-package` from 2.9.0 to 2.9.1

Updates `org.apache.tika:tika-parser-scientific-module` from 2.9.0 to 2.9.1

Updates `org.apache.tika:tika-parser-sqlite3-module` from 2.9.0 to 2.9.1

Updates `org.apache.tika:tika-langdetect-optimaize` from 2.9.0 to 2.9.1

---
updated-dependencies:
- dependency-name: org.apache.tika:tika-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.tika:tika-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.tika:tika-parsers-standard-package
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.tika:tika-parser-scientific-module
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.tika:tika-parser-sqlite3-module
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.tika:tika-langdetect-optimaize
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.fusesource.jansi:jansi](https://github.com/fusesource/jansi) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/fusesource/jansi/releases)
- [Changelog](https://github.com/fusesource/jansi/blob/master/changelog.md)
- [Commits](fusesource/jansi@jansi-2.4.0...jansi-2.4.1)

---
updated-dependencies:
- dependency-name: org.fusesource.jansi:jansi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.6.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 32.1.3-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps `jackson.version` from 2.15.2 to 2.15.3.

Updates `com.fasterxml.jackson.core:jackson-core` from 2.15.2 to 2.15.3
- [Release notes](https://github.com/FasterXML/jackson-core/releases)
- [Commits](FasterXML/jackson-core@jackson-core-2.15.2...jackson-core-2.15.3)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.2 to 2.15.3
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.15.2 to 2.15.3
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.15.2 to 2.15.3

Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from 2.15.2 to 2.15.3
- [Commits](FasterXML/jackson-dataformat-xml@jackson-dataformat-xml-2.15.2...jackson-dataformat-xml-2.15.3)

Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.15.2 to 2.15.3
- [Commits](FasterXML/jackson-dataformats-text@jackson-dataformats-text-2.15.2...jackson-dataformats-text-2.15.3)

Updates `com.fasterxml.jackson.dataformat:jackson-module-jaxb-annotations` from 2.15.2 to 2.15.3

Updates `com.fasterxml.jackson.module:jackson-module-jaxb-annotations` from 2.15.2 to 2.15.3
- [Commits](FasterXML/jackson-modules-base@jackson-modules-base-2.15.2...jackson-modules-base-2.15.3)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-module-jaxb-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.1.2 to 3.2.1.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.1.2...surefire-3.2.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.6.1.
- [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@sonarcloud
Copy link

sonarcloud bot commented Oct 24, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@HansBambel
Copy link
Author

No problem :D

Done 👍

@dadoonet dadoonet self-requested a review November 24, 2023 12:44
@dadoonet
Copy link
Owner

Apparently some of the unit tests need to be fixed. Could you work on that @HansBambel?

@HansBambel
Copy link
Author

@dadoonet Sorry, but it's been too long that dealt with Java (back in University). I don't even know where to start here.

If you help me to compile/run the code/tests I can have a look.

Copy link

sonarcloud bot commented Dec 11, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@dadoonet dadoonet merged commit 1e0b10e into dadoonet:master Dec 11, 2023
13 of 14 checks passed
@dadoonet
Copy link
Owner

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:elasticsearch update When updating an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants