From bce01d438256e3b3349a0e09ee101696713777d0 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Mon, 10 Jun 2024 16:48:32 -0400 Subject: [PATCH 1/2] normalize log messages about backend target --- cmd/zrok/shareReserved.go | 6 +++--- docs/guides/drives/cli.md | 2 +- docs/guides/vpn/vpn.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/zrok/shareReserved.go b/cmd/zrok/shareReserved.go index 294f203a..16e577c3 100644 --- a/cmd/zrok/shareReserved.go +++ b/cmd/zrok/shareReserved.go @@ -105,13 +105,13 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) { } if _, err := zrok.Share.UpdateShare(upReq, auth); err != nil { if !panicInstead { - tui.Error("unable to update backend proxy endpoint", err) + tui.Error("unable to update backend target", err) } panic(err) } - logrus.Infof("updated backend proxy endpoint to: %v", target) + logrus.Infof("updated backend target to: %v", target) } else { - logrus.Infof("using existing backend proxy endpoint: %v", target) + logrus.Infof("using existing backend target: %v", target) } } diff --git a/docs/guides/drives/cli.md b/docs/guides/drives/cli.md index c4e00c6c..84249a30 100644 --- a/docs/guides/drives/cli.md +++ b/docs/guides/drives/cli.md @@ -290,7 +290,7 @@ $ zrok reserve private -b drive --unique-name mydrive /tmp/junk [ 0.315] INFO main.(*reserveCommand).run: your reserved share token is 'mydrive' $ zrok share reserved --headless mydrive [ 0.289] INFO main.(*shareReservedCommand).run: sharing target: '/tmp/junk' -[ 0.289] INFO main.(*shareReservedCommand).run: using existing backend proxy endpoint: /tmp/junk +[ 0.289] INFO main.(*shareReservedCommand).run: using existing backend target: /tmp/junk [ 0.767] INFO sdk-golang/ziti.(*listenerManager).createSessionWithBackoff: {session token=[d519a436-9fb5-4207-afd5-7cbc28fb779a]} new service session [ 0.927] INFO main.(*shareReservedCommand).run: use this command to access your zrok share: 'zrok access private mydrive' ``` diff --git a/docs/guides/vpn/vpn.md b/docs/guides/vpn/vpn.md index 7b800c2f..a2d718e0 100644 --- a/docs/guides/vpn/vpn.md +++ b/docs/guides/vpn/vpn.md @@ -53,7 +53,7 @@ eugene@hermes $ zrok reserve private -b vpn eugene@hermes $ sudo -E zrok share reserved k77y2cl7jmjl --headless [ 0.211] INFO main.(*shareReservedCommand).run: sharing target: '10.122.0.1/16' -[ 0.211] INFO main.(*shareReservedCommand).run: using existing backend proxy endpoint: 10.122.0.1/16 +[ 0.211] INFO main.(*shareReservedCommand).run: using existing backend target: 10.122.0.1/16 [ 0.463] INFO sdk-golang/ziti.(*listenerManager).createSessionWithBackoff: {session token=[22c5708d-e2f2-41aa-a507-454055f8bfcc]} new service session [ 0.641] INFO main.(*shareReservedCommand).run: use this command to access your zrok share: 'zrok access private k77y2cl7jmjl' [ From 1b20fe72c3d89f29d00c31bd3212cdc5fbe06365 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Mon, 10 Jun 2024 17:03:08 -0400 Subject: [PATCH 2/2] mention CHANGE in changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b8bf845..ee29a0de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ FIX: Correct the syntax for the Docker and Linux zrok-share "frontdoor" service that broke OAuth email address pattern matching +CHANGE: log messages that said "backend proxy endpoint" were clarified to say "backend target" + ## v0.4.30 FIX: Fix to the Node.js release process to properly support releasing on a tag.