From b2c9c1a58d79dc30b075a41445845167a771196c Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 11 Oct 2023 11:32:07 -0400 Subject: [PATCH 1/8] 'zrok' branding style tweak --- CHANGELOG.md | 4 ++++ ui/src/index.css | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 996b13952..4d2daf110 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v0.4.8 + +CHANGE: The title color of the header was changed from white to flourescent green, to better match the overall branding + # v0.4.7 FEATURE: OAuth authentication with the ability to restrict authenticated users to specified domains for `zrok share public`. Supports both Google and GitHub authentication in this version. More authentication providers, and extensibility to come in future `zrok` releases. See the OAuth configuration guide at `docs/guides/self-hosting/oauth/configuring-oauth.md` for details (https://github.com/openziti/zrok/issues/45, https://github.com/openziti/zrok/issues/404) diff --git a/ui/src/index.css b/ui/src/index.css index 7d4e69f73..da3726e88 100644 --- a/ui/src/index.css +++ b/ui/src/index.css @@ -21,6 +21,7 @@ code, pre { margin-left: 0.53em; vertical-align: center; line-height: 1.7; + color: #9BF316; } .visualizer-container { From f98a164e62b821abe1f71aa7dfc20c92b8cc05f7 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 11 Oct 2023 11:40:42 -0400 Subject: [PATCH 2/8] tweaks to release/ci deprecations; release/ci logging improvements; pin golang to 1.21.3+; pin node to 18.x across all platforms --- .github/workflows/ci-build.yml | 2 +- .github/workflows/release.yml | 28 ++++++++++++++-------------- .goreleaser-darwin.yml | 4 ++-- CHANGELOG.md | 2 ++ 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 2e2303294..f2072ac4b 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -20,7 +20,7 @@ jobs: - name: setup-go uses: actions/setup-go@v3 with: - go-version: 1.21.0 + go-version: '>=1.21.3' - name: setup-node uses: actions/setup-node@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0737f363..dec58803b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '>=1.21.0' + go-version: '>=1.21.3' cache: true - uses: actions/setup-node@v3 @@ -43,7 +43,7 @@ jobs: with: distribution: goreleaser version: latest - args: release --skip-publish --config .goreleaser-linux.yml + args: release --skip=publish --config .goreleaser-linux.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -66,12 +66,12 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '>=1.21.0' + go-version: '>=1.21.3' cache: true - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - run: npm install working-directory: ui @@ -85,7 +85,7 @@ jobs: with: distribution: goreleaser version: latest - args: release --skip-publish --config .goreleaser-linux-arm64.yml + args: release --skip=publish --config .goreleaser-linux-arm64.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -108,12 +108,12 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '>=1.21.0' + go-version: '>=1.21.3' cache: true - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - run: npm install working-directory: ui @@ -127,7 +127,7 @@ jobs: with: distribution: goreleaser version: latest - args: release --skip-publish --config .goreleaser-linux-armhf.yml + args: release --skip=publish --config .goreleaser-linux-armhf.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -157,12 +157,12 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '>=1.21.0' + go-version: '>=1.21.3' cache: true - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - run: npm install working-directory: ui @@ -176,7 +176,7 @@ jobs: with: distribution: goreleaser version: latest - args: release --skip-publish --config .goreleaser-darwin.yml + args: release --skip=publish --config .goreleaser-darwin.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} AC_USERNAME: ${{ secrets.AC_USERNAME }} @@ -201,12 +201,12 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: '>=1.21.0' + go-version: '>=1.21.3' cache: true - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - run: npm install working-directory: ui @@ -220,7 +220,7 @@ jobs: with: distribution: goreleaser version: latest - args: release --skip-publish --config .goreleaser-windows.yml + args: release --skip=publish --config .goreleaser-windows.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml index db3112c7d..e004fce76 100644 --- a/.goreleaser-darwin.yml +++ b/.goreleaser-darwin.yml @@ -10,7 +10,7 @@ builds: goarch: - amd64 hooks: - post: gon build/gon-amd64.hcl + post: gon -log-level=info build/gon-amd64.hcl - id: zrok-arm64 main: ./cmd/zrok @@ -23,4 +23,4 @@ builds: goarch: - arm64 hooks: - post: gon build/gon-arm64.hcl + post: gon -log-level=info build/gon-arm64.hcl diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d2daf110..99c167bc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ CHANGE: The title color of the header was changed from white to flourescent green, to better match the overall branding +CHANGE: Tweaks to build and release process for logging and deprecations. Pin golang version at 1.21.3+ and node version at 18.x across all platforms + # v0.4.7 FEATURE: OAuth authentication with the ability to restrict authenticated users to specified domains for `zrok share public`. Supports both Google and GitHub authentication in this version. More authentication providers, and extensibility to come in future `zrok` releases. See the OAuth configuration guide at `docs/guides/self-hosting/oauth/configuring-oauth.md` for details (https://github.com/openziti/zrok/issues/45, https://github.com/openziti/zrok/issues/404) From de28ad0e93ad7992e65f1646d4bb961fb9033151 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 11 Oct 2023 11:47:02 -0400 Subject: [PATCH 3/8] improve inline docs in 'etc/frontend.yml' --- etc/frontend.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/etc/frontend.yml b/etc/frontend.yml index 99f878eaf..084bdbdd9 100644 --- a/etc/frontend.yml +++ b/etc/frontend.yml @@ -7,10 +7,25 @@ # The OAuth configuration is used when enabling OAuth authentication with your public frontend. # #oauth: +# # `redirect_host` and `redirect_port` should correspond with the DNS hostname and URL representing +# # the OAuth frontend you'll use with your installation. +# # # redirect_host: oauth.zrok.io # redirect_port: 28080 +# +# # `redirect_http_only` will generate an HTTP URI for your OAuth frontend, rather than HTTPS. This +# # should only be set to `true` in development environments. +# # # redirect_http_only: false +# +# # `hash_key` is a unique key for your installation that is used to secure authentication payloads +# # with OAuth providers. +# # # hash_key: "" +# +# # `providers` contains an array of provider details enabled in your installation. Currently only +# # `google` and `github` are supported. Your configuration can include `google`, `github`, or both. +# # # providers: # - name: google # client_id: From 397fbf4f47cce0cd01f38e8510dd06f002ff9ec4 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Mon, 16 Oct 2023 14:33:52 -0400 Subject: [PATCH 4/8] email deliverability improvements (#405) --- controller/emailUi/verify.gohtml | 24 +++++++----------------- controller/verifyEmail.go | 1 + 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/controller/emailUi/verify.gohtml b/controller/emailUi/verify.gohtml index ada75aed5..e817d348f 100644 --- a/controller/emailUi/verify.gohtml +++ b/controller/emailUi/verify.gohtml @@ -7,27 +7,24 @@ Welcome to zrok! - -