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 996b13952..1c38b4d6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# v0.4.8 + +FEATURE: The `sdk` package now includes a `sdk.Overview` function, which returns a complete description of the account attached to the enabled environment. Useful for inventorying the deployed shares and environments (https://github.com/openziti/zrok/issues/407) + +CHANGE: The `zrok access public` frontend configuration format has changed and now requires that the configuration document include a `v: 2` declaration. This frontend configuration format is now versioned and when the code updates the configuration structure, you will receive an error message at startup, provoking you to look into updating your configuration (https://github.com/openziti/zrok/issues/406) + +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 + +CHANGE: Improvements to email invitation sent in response to `zrok invite` to correct broken links, some minor HTML issues and improve overall deliverability (https://github.com/openziti/zrok/issues/405) + +CHANGE: Added warning message after `zrok invite` submit directing the user to check their "spam" folder if they do not receive the invite message. + # 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/cmd/zrok/invite.go b/cmd/zrok/invite.go index 0695474f7..86375257e 100644 --- a/cmd/zrok/invite.go +++ b/cmd/zrok/invite.go @@ -89,7 +89,8 @@ func (cmd *inviteCommand) run(_ *cobra.Command, _ []string) { tui.Error("error creating invitation", err) } - fmt.Printf("invitation sent to '%v'!\n", email) + fmt.Printf("invitation sent to '%v'!\n\n", email) + fmt.Printf(fmt.Sprintf("%v\n\n", tui.Attention.Render("*** be sure to check your SPAM folder if you do not receive the invitation email!"))) } } diff --git a/cmd/zrok/overview.go b/cmd/zrok/overview.go index 329e4a29a..31fe69e32 100644 --- a/cmd/zrok/overview.go +++ b/cmd/zrok/overview.go @@ -3,10 +3,9 @@ package main import ( "fmt" "github.com/openziti/zrok/environment" + "github.com/openziti/zrok/sdk" "github.com/openziti/zrok/tui" "github.com/spf13/cobra" - "io" - "net/http" ) func init() { @@ -41,32 +40,13 @@ func (cmd *overviewCommand) run(_ *cobra.Command, _ []string) { tui.Error("unable to load environment; did you 'zrok enable'?", nil) } - client := &http.Client{} - apiEndpoint, _ := root.ApiEndpoint() - req, err := http.NewRequest("GET", fmt.Sprintf("%v/api/v1/overview", apiEndpoint), nil) + json, err := sdk.Overview(root) if err != nil { if !panicInstead { - tui.Error("error accessing overview", err) - } - panic(err) - } - req.Header.Add("X-TOKEN", root.Environment().Token) - resp, err := client.Do(req) - if err != nil { - if !panicInstead { - tui.Error("error requesting overview", err) - } - panic(err) - } - - json, err := io.ReadAll(resp.Body) - if err != nil { - if !panicInstead { - tui.Error("error reading body", err) + tui.Error("error loading zrokdir", err) } panic(err) } - _ = resp.Body.Close() - fmt.Println(string(json)) + fmt.Println(json) } 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! - -