From f82e75664b5df213094341adfd331429aeca19d2 Mon Sep 17 00:00:00 2001
From: Laurent Demailly <ldemailly@roku.com>
Date: Tue, 21 Nov 2023 20:41:51 -0800
Subject: [PATCH] update to latest log and cli, plus add to README.md for
 envhelp

---
 README.md | 19 +++++++++++++++++++
 go.mod    |  7 ++++---
 go.sum    | 14 ++++++++------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6c85856..967af6d 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,25 @@ $ sampleServer version
 1.7.0
 ```
 
+### envhelp
+Will display a chain of [fortio.org/struct2env](https://github.com/fortio/struct2env) environment variables<->config settings
+
+```bash
+$ sampleServer envhelp
+# Environment variables recognized and current values:
+# Logger environment variables:
+LOGGER_LOG_PREFIX='> '
+LOGGER_LOG_FILE_AND_LINE=true
+LOGGER_FATAL_PANICS=true
+LOGGER_JSON=true
+LOGGER_NO_TIMESTAMP=false
+LOGGER_CONSOLE_COLOR=true
+LOGGER_FORCE_COLOR=false
+LOGGER_GOROUTINE_ID=true
+LOGGER_COMBINE_REQUEST_AND_RESPONSE=true
+LOGGER_LEVEL='Info'
+```
+
 ## Server log diff'ing
 
 When debugging in dev mode the differences between 2 log output, it's convenient to use the following flags
diff --git a/go.mod b/go.mod
index 89b322b..0e51360 100644
--- a/go.mod
+++ b/go.mod
@@ -3,15 +3,16 @@ module fortio.org/scli
 go 1.18
 
 require (
-	fortio.org/cli v1.4.2
+	fortio.org/cli v1.5.0
 	fortio.org/dflag v1.7.0
-	fortio.org/log v1.11.0
+	fortio.org/log v1.12.0
 	fortio.org/version v1.0.3
 	golang.org/x/sys v0.14.0
 )
 
 require (
 	fortio.org/sets v1.0.3 // indirect
+	fortio.org/struct2env v0.4.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
 )
diff --git a/go.sum b/go.sum
index 8cb2637..46e80f8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,17 +1,19 @@
 fortio.org/assert v1.2.0 h1:XscfvR8yp4xW7OMCvNbCsieRFDxlwdEcb69+JZRp6LA=
-fortio.org/cli v1.4.2 h1:pCYVPk5FpQuJtD31f9CG8sdgoTOWdv9Gls8As/MLJhU=
-fortio.org/cli v1.4.2/go.mod h1:VGqFDEKpA6u3NbTM3aSz2lZfAYKnGaszl1pLxbBhxsY=
+fortio.org/cli v1.5.0 h1:hKiXZ6jWzLHCVInrRm8F3BI3nyj0EpM5rAYFUp/d8gs=
+fortio.org/cli v1.5.0/go.mod h1:Tp7AypudP1mJomTUN/J/vlOTlZDWTMsok09MMyA99ow=
 fortio.org/dflag v1.7.0 h1:4Vpo5hMly0rx9VMuyBaDGFK1Mx2S3qjxx1iAIA3KBgU=
 fortio.org/dflag v1.7.0/go.mod h1:FUxv/s3DXhCpy7GsuZa4FJWLR92gsYvG3ylkia8MbBM=
-fortio.org/log v1.11.0 h1:w7ueGPGbXz0A3+ApMz/5Q9gwEMrwSo/ohTlLo2Um6dU=
-fortio.org/log v1.11.0/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU=
+fortio.org/log v1.12.0 h1:5Yg4pL9Pp0jcWeJYixm2xikMCldVaSDMgDFDmQJZfho=
+fortio.org/log v1.12.0/go.mod h1:1tMBG/Elr6YqjmJCWiejJp2FPvXg7/9UAN0Rfpkyt1o=
 fortio.org/sets v1.0.3 h1:HzewdGjH69YmyW06yzplL35lGr+X4OcqQt0qS6jbaO4=
 fortio.org/sets v1.0.3/go.mod h1:QZVj0r6KP/ZD9ebySW9SgxVNy/NjghUfyHW9NN+WU+4=
+fortio.org/struct2env v0.4.0 h1:k5alSOTf3YHiB3MuacjDHQ3YhVWvNZ95ZP/a6MqvyLo=
+fortio.org/struct2env v0.4.0/go.mod h1:lENUe70UwA1zDUCX+8AsO663QCFqYaprk5lnPhjD410=
 fortio.org/version v1.0.3 h1:5gJ3plj6isAOMq52cI5ifo4cC+QHmJF76Wevc5Cp4x0=
 fortio.org/version v1.0.3/go.mod h1:2JQp9Ax+tm6QKiGuzR5nJY63kFeANcgrZ0osoQFDVm0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=