diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ff8adcc..b3d67dc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: git config --local user.email "autolint@lint.local" git config --local user.name "Auto Lint" git commit -m "Fix PR lint" -a - git push https://${{ secrets.GITHUBTOKEN }}@github.com/andrea-vinci/insulator.git + git push https://${{ secrets.GITHUBTOKEN }}@github.com/andrewinci/insulator.git exit 1 else echo "Nothing to change" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57c67017..d20176cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,10 +150,10 @@ jobs: if: ${{ matrix.artifact.name == 'insulator-mac' }} run: | git config --global user.name ${{ github.actor }} - git config --global user.email andrea-vinci@users.noreply.github.com - brew tap andrea-vinci/tap + git config --global user.email andrewinci@users.noreply.github.com + brew tap andrewinci/tap brew bump-cask-pr --write --commit --no-audit --no-browse --no-fork --version $RELEASE_VERSION --force insulator - cd /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/andrea-vinci/homebrew-tap - git push https://${{ secrets.GITHUBTOKEN }}@github.com/andrea-vinci/homebrew-tap.git + cd /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/andrewinci/homebrew-tap + git push https://${{ secrets.GITHUBTOKEN }}@github.com/andrewinci/homebrew-tap.git env: RELEASE_VERSION: ${{ steps.get_version.outputs.version }} diff --git a/Readme.md b/Readme.md index f487ac2c..3b8d45f1 100644 --- a/Readme.md +++ b/Readme.md @@ -10,28 +10,28 @@

- - + Release - - + CI - + Coverage - + code quality - - + Snyk @@ -44,7 +44,7 @@

- Wiki • + Wiki • Key Features • Development • Credits • @@ -58,13 +58,13 @@ ## Installation -Download the binary from the latest release for your OS. Learn more [here](https://andrea-vinci.github.io/Insulator/wiki/Installation/). +Download the binary from the latest release for your OS. Learn more [here](https://andrewinci.github.io/Insulator/wiki/Installation/). -[![Mac release](https://badgen.net/badge/icon/Mac%20Os?label=Download%20Latest%20Release&color=orange)](https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-mac.zip) -[![Windows release](https://badgen.net/badge/icon/Windows?label=Download%20Latest%20Release&color=orange)](https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-win.zip) -[![Debian release](https://badgen.net/badge/icon/Debian?label=Download%20Latest%20Release&color=orange)](https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-debian.zip) +[![Mac release](https://badgen.net/badge/icon/Mac%20Os?label=Download%20Latest%20Release&color=orange)](https://github.com/andrewinci/Insulator/releases/latest/download/insulator-mac.zip) +[![Windows release](https://badgen.net/badge/icon/Windows?label=Download%20Latest%20Release&color=orange)](https://github.com/andrewinci/Insulator/releases/latest/download/insulator-win.zip) +[![Debian release](https://badgen.net/badge/icon/Debian?label=Download%20Latest%20Release&color=orange)](https://github.com/andrewinci/Insulator/releases/latest/download/insulator-debian.zip) -![brew cask install andrea-vinci/tap/insulator](https://badgen.net/badge/icon/brew%20cask%20install%20andrea-vinci%2Ftap%2Finsulator?label=🍻%20Brew&color=orange) +![brew cask install andrewinci/tap/insulator](https://badgen.net/badge/icon/brew%20cask%20install%20andrewinci%2Ftap%2Finsulator?label=🍻%20Brew&color=orange) ## Key Features diff --git a/bootstrap/src/main/kotlin/insulator/Constants.kt b/bootstrap/src/main/kotlin/insulator/Constants.kt index 945ad908..e60e9c0f 100644 --- a/bootstrap/src/main/kotlin/insulator/Constants.kt +++ b/bootstrap/src/main/kotlin/insulator/Constants.kt @@ -15,4 +15,4 @@ val localPath: String by lazy { val localConfigFile = "${localPath}insulator-update.xml" val updatePath: Path = Path.of(System.getProperty("java.io.tmpdir") ?: "", "update.zip") -const val configPath = "https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-update.xml" +const val configPath = "https://github.com/andrewinci/Insulator/releases/latest/download/insulator-update.xml" diff --git a/docs/404.html b/docs/404.html index 44c23d84..76be0f5d 100644 --- a/docs/404.html +++ b/docs/404.html @@ -16,17 +16,17 @@ - - + + - + - Fork me on GitHub

diff --git a/docs/_config.yml b/docs/_config.yml index f8ac0907..3a474a90 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -7,7 +7,7 @@ description: >- baseurl: "/Insulator" # the subpath of your site, e.g. /blog url: "" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: andrewinci -github_username: andrea-vinci +github_username: andrewinci # Build settings diff --git a/docs/_wiki/Home.md b/docs/_wiki/Home.md index f9d2c414..2d2a76a6 100644 --- a/docs/_wiki/Home.md +++ b/docs/_wiki/Home.md @@ -16,28 +16,28 @@ nav_order: 1

- - + Release - - + CI - + Coverage - + code quality - - + Snyk diff --git a/docs/_wiki/Installation/Install on linux.md b/docs/_wiki/Installation/Install on linux.md index df67f06e..ff6969cc 100644 --- a/docs/_wiki/Installation/Install on linux.md +++ b/docs/_wiki/Installation/Install on linux.md @@ -14,7 +14,7 @@ Currently the application is packaged and tested only on ubuntu. Download the archive `insulator-debian.zip` with the button below. -[Latest release](https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-debian.zip){: .btn } +[Latest release](https://github.com/andrewinci/Insulator/releases/latest/download/insulator-debian.zip){: .btn } In a terminal, navigate to the folder containing the zip previously downloaded and run the following diff --git a/docs/_wiki/Installation/Install on mac.md b/docs/_wiki/Installation/Install on mac.md index 4c7e5705..7abb8d64 100644 --- a/docs/_wiki/Installation/Install on mac.md +++ b/docs/_wiki/Installation/Install on mac.md @@ -20,13 +20,13 @@ in `System Preferences > Security & Privacy > General`__ If [brew](https://brew.sh) is installed in the system, open a terminal and run ```bash -brew install cask andrea-vinci/tap/Insulator +brew install cask andrewinci/tap/Insulator ``` ## Using the DMG from the Github release Download the archive `insulator-mac.zip` using the button below. -[Latest release](https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-mac.zip){: .btn } +[Latest release](https://github.com/andrewinci/Insulator/releases/latest/download/insulator-mac.zip){: .btn } Mount the DMG `Insulator-x.y.z.dmg` and move the file `Insulator` to the `Application` folder. diff --git a/docs/_wiki/Installation/Install on windows.md b/docs/_wiki/Installation/Install on windows.md index b00e8a70..3a5627a0 100644 --- a/docs/_wiki/Installation/Install on windows.md +++ b/docs/_wiki/Installation/Install on windows.md @@ -7,6 +7,6 @@ parent: Installation Download the archive `insulator-win.zip` using the button below. -[Latest release](https://github.com/andrea-vinci/Insulator/releases/latest/download/insulator-win.zip){: .btn } +[Latest release](https://github.com/andrewinci/Insulator/releases/latest/download/insulator-win.zip){: .btn } Double click on `Insulator-x.y.z.exe` and follow the instruction in the installation wizard. \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 2b805b37..770dccd7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -15,15 +15,15 @@ - - + + - + - Fork me on GitHub + Fork me on GitHub

@@ -41,7 +41,7 @@

Insulator

The companion for Kafka developers

Improve your troubleshooting process of kafka based applications.

- + Mac - + Windows - +
- 
🍻 brew install andrea-vinci/tap/insulator 🍻
+ 
🍻 brew install andrewinci/tap/insulator 🍻
@@ -130,7 +130,7 @@

Producer

Insulator

-
Get latest +
Get latest release
diff --git a/lib/helper/src/main/kotlin/insulator/Constants.kt b/lib/helper/src/main/kotlin/insulator/Constants.kt index 1483ffee..8dcbbc02 100644 --- a/lib/helper/src/main/kotlin/insulator/Constants.kt +++ b/lib/helper/src/main/kotlin/insulator/Constants.kt @@ -3,6 +3,6 @@ package insulator const val CONFIG_FILE_NAME = "Insulator.cfg" const val VERSION_PROPERTY = "app.version" const val GITHUB_REPO = - """https://github.com/andrea-vinci/Insulator""" + """https://github.com/andrewinci/Insulator""" const val LATEST_RELEASE_API_ENDPOINT = - """https://api.github.com/repos/andrea-vinci/Insulator/releases/latest""" + """https://api.github.com/repos/andrewinci/Insulator/releases/latest""" diff --git a/lib/kafka/src/test/kotlin/insulator/kafka/consumer/ConsumerTest.kt b/lib/kafka/src/test/kotlin/insulator/kafka/consumer/ConsumerTest.kt index cf11d02d..cbe4a95c 100644 --- a/lib/kafka/src/test/kotlin/insulator/kafka/consumer/ConsumerTest.kt +++ b/lib/kafka/src/test/kotlin/insulator/kafka/consumer/ConsumerTest.kt @@ -55,7 +55,7 @@ class ConsumerTest : StringSpec({ // act sut.start("testTopic", ConsumeFrom.Beginning, DeserializationFormat.Avro) { lst -> messages.addAll(lst.map { r -> r.value }) } // assert - eventually(10.seconds) { + eventually(20.seconds) { messages.size shouldBe 1 } } diff --git a/lib/kafka/src/test/resources/githubResponseSample.json b/lib/kafka/src/test/resources/githubResponseSample.json index b6fdcd0a..0259941c 100644 --- a/lib/kafka/src/test/resources/githubResponseSample.json +++ b/lib/kafka/src/test/resources/githubResponseSample.json @@ -1,8 +1,8 @@ { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/31609864", - "assets_url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/31609864/assets", - "upload_url": "https://uploads.github.com/repos/andrea-vinci/Insulator/releases/31609864/assets{?name,label}", - "html_url": "https://github.com/andrea-vinci/Insulator/releases/tag/0.0.9", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/31609864", + "assets_url": "https://api.github.com/repos/andrewinci/Insulator/releases/31609864/assets", + "upload_url": "https://uploads.github.com/repos/andrewinci/Insulator/releases/31609864/assets{?name,label}", + "html_url": "https://github.com/andrewinci/Insulator/releases/tag/0.0.9", "id": 31609864, "node_id": "MDc6UmVsZWFzZTMxNjA5ODY0", "tag_name": "0.0.9", @@ -34,7 +34,7 @@ "published_at": "2020-09-21T15:12:41Z", "assets": [ { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/assets/26006051", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/assets/26006051", "id": 26006051, "node_id": "MDEyOlJlbGVhc2VBc3NldDI2MDA2MDUx", "name": "insulator-debian.zip", @@ -65,10 +65,10 @@ "download_count": 0, "created_at": "2020-09-21T14:50:22Z", "updated_at": "2020-09-21T14:50:24Z", - "browser_download_url": "https://github.com/andrea-vinci/Insulator/releases/download/0.0.9/insulator-debian.zip" + "browser_download_url": "https://github.com/andrewinci/Insulator/releases/download/0.0.9/insulator-debian.zip" }, { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/assets/26006039", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/assets/26006039", "id": 26006039, "node_id": "MDEyOlJlbGVhc2VBc3NldDI2MDA2MDM5", "name": "insulator-mac.zip", @@ -99,10 +99,10 @@ "download_count": 1, "created_at": "2020-09-21T14:50:00Z", "updated_at": "2020-09-21T14:50:03Z", - "browser_download_url": "https://github.com/andrea-vinci/Insulator/releases/download/0.0.9/insulator-mac.zip" + "browser_download_url": "https://github.com/andrewinci/Insulator/releases/download/0.0.9/insulator-mac.zip" }, { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/assets/26006047", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/assets/26006047", "id": 26006047, "node_id": "MDEyOlJlbGVhc2VBc3NldDI2MDA2MDQ3", "name": "insulator-win.zip", @@ -133,10 +133,10 @@ "download_count": 2, "created_at": "2020-09-21T14:50:11Z", "updated_at": "2020-09-21T14:50:13Z", - "browser_download_url": "https://github.com/andrea-vinci/Insulator/releases/download/0.0.9/insulator-win.zip" + "browser_download_url": "https://github.com/andrewinci/Insulator/releases/download/0.0.9/insulator-win.zip" } ], - "tarball_url": "https://api.github.com/repos/andrea-vinci/Insulator/tarball/0.0.9", - "zipball_url": "https://api.github.com/repos/andrea-vinci/Insulator/zipball/0.0.9", + "tarball_url": "https://api.github.com/repos/andrewinci/Insulator/tarball/0.0.9", + "zipball_url": "https://api.github.com/repos/andrewinci/Insulator/zipball/0.0.9", "body": "" } \ No newline at end of file diff --git a/lib/update/src/main/kotlin/insulator/update/VersionChecker.kt b/lib/update/src/main/kotlin/insulator/update/VersionChecker.kt index dcb10fdc..9de67006 100644 --- a/lib/update/src/main/kotlin/insulator/update/VersionChecker.kt +++ b/lib/update/src/main/kotlin/insulator/update/VersionChecker.kt @@ -60,9 +60,9 @@ class VersionChecker(private val customJarPath: String? = null) { Release( version = tag, webUrl = "$GITHUB_REPO/releases/tag/$tag", - macUrl = assetUrls.first { it.contains("mac") }, - winUrl = assetUrls.first { it.contains("win") }, - debianUrl = assetUrls.first { it.contains("debian") }, + macUrl = assetUrls.first { it.contains("-mac") }, + winUrl = assetUrls.first { it.contains("-win") }, + debianUrl = assetUrls.first { it.contains("-debian") }, ) } } diff --git a/lib/update/src/test/resources/githubResponseSample.json b/lib/update/src/test/resources/githubResponseSample.json index b6fdcd0a..0259941c 100644 --- a/lib/update/src/test/resources/githubResponseSample.json +++ b/lib/update/src/test/resources/githubResponseSample.json @@ -1,8 +1,8 @@ { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/31609864", - "assets_url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/31609864/assets", - "upload_url": "https://uploads.github.com/repos/andrea-vinci/Insulator/releases/31609864/assets{?name,label}", - "html_url": "https://github.com/andrea-vinci/Insulator/releases/tag/0.0.9", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/31609864", + "assets_url": "https://api.github.com/repos/andrewinci/Insulator/releases/31609864/assets", + "upload_url": "https://uploads.github.com/repos/andrewinci/Insulator/releases/31609864/assets{?name,label}", + "html_url": "https://github.com/andrewinci/Insulator/releases/tag/0.0.9", "id": 31609864, "node_id": "MDc6UmVsZWFzZTMxNjA5ODY0", "tag_name": "0.0.9", @@ -34,7 +34,7 @@ "published_at": "2020-09-21T15:12:41Z", "assets": [ { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/assets/26006051", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/assets/26006051", "id": 26006051, "node_id": "MDEyOlJlbGVhc2VBc3NldDI2MDA2MDUx", "name": "insulator-debian.zip", @@ -65,10 +65,10 @@ "download_count": 0, "created_at": "2020-09-21T14:50:22Z", "updated_at": "2020-09-21T14:50:24Z", - "browser_download_url": "https://github.com/andrea-vinci/Insulator/releases/download/0.0.9/insulator-debian.zip" + "browser_download_url": "https://github.com/andrewinci/Insulator/releases/download/0.0.9/insulator-debian.zip" }, { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/assets/26006039", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/assets/26006039", "id": 26006039, "node_id": "MDEyOlJlbGVhc2VBc3NldDI2MDA2MDM5", "name": "insulator-mac.zip", @@ -99,10 +99,10 @@ "download_count": 1, "created_at": "2020-09-21T14:50:00Z", "updated_at": "2020-09-21T14:50:03Z", - "browser_download_url": "https://github.com/andrea-vinci/Insulator/releases/download/0.0.9/insulator-mac.zip" + "browser_download_url": "https://github.com/andrewinci/Insulator/releases/download/0.0.9/insulator-mac.zip" }, { - "url": "https://api.github.com/repos/andrea-vinci/Insulator/releases/assets/26006047", + "url": "https://api.github.com/repos/andrewinci/Insulator/releases/assets/26006047", "id": 26006047, "node_id": "MDEyOlJlbGVhc2VBc3NldDI2MDA2MDQ3", "name": "insulator-win.zip", @@ -133,10 +133,10 @@ "download_count": 2, "created_at": "2020-09-21T14:50:11Z", "updated_at": "2020-09-21T14:50:13Z", - "browser_download_url": "https://github.com/andrea-vinci/Insulator/releases/download/0.0.9/insulator-win.zip" + "browser_download_url": "https://github.com/andrewinci/Insulator/releases/download/0.0.9/insulator-win.zip" } ], - "tarball_url": "https://api.github.com/repos/andrea-vinci/Insulator/tarball/0.0.9", - "zipball_url": "https://api.github.com/repos/andrea-vinci/Insulator/zipball/0.0.9", + "tarball_url": "https://api.github.com/repos/andrewinci/Insulator/tarball/0.0.9", + "zipball_url": "https://api.github.com/repos/andrewinci/Insulator/zipball/0.0.9", "body": "" } \ No newline at end of file diff --git a/scripts/build.py b/scripts/build.py index 7ef5aff8..66798dca 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -12,7 +12,7 @@ RELEASE = os.environ.get("RELEASE_VERSION") insulator_jar = { - "insulator.jar": f"https://github.com/andrea-vinci/Insulator/releases/download/{RELEASE}/insulator.jar" + "insulator.jar": f"https://github.com/andrewinci/Insulator/releases/download/{RELEASE}/insulator.jar" } jars_path = "./app/build/distributions/app/lib/"