From e404c29edbc3d64250925e96939f9e02632454db Mon Sep 17 00:00:00 2001 From: Martin Cuesta Date: Mon, 31 May 2021 13:03:58 -0300 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=96=8C=EF=B8=8F=20Allow=20providing?= =?UTF-8?q?=20TokenID=20and=20TokenSecret=20as=20env=20vars=20when=20calli?= =?UTF-8?q?ng=20cloudflared=20access?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implements #232 --- cmd/cloudflared/access/cmd.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/cloudflared/access/cmd.go b/cmd/cloudflared/access/cmd.go index 414e008e..082b0794 100644 --- a/cmd/cloudflared/access/cmd.go +++ b/cmd/cloudflared/access/cmd.go @@ -143,11 +143,13 @@ func Commands() []*cli.Command { Name: sshTokenIDFlag, Aliases: []string{"id"}, Usage: "specify an Access service token ID you wish to use.", + EnvVars: []string{"CLOUDFLARE_SERVICE_TOKEN_ID"}, }, &cli.StringFlag{ Name: sshTokenSecretFlag, Aliases: []string{"secret"}, Usage: "specify an Access service token secret you wish to use.", + EnvVars: []string{"CLOUDFLARE_SERVICE_TOKEN_SECRET"}, }, &cli.StringFlag{ Name: logger.LogSSHDirectoryFlag, From a11c64b0919baa83de4c159ddd49bcf00d052c29 Mon Sep 17 00:00:00 2001 From: Martin Cuesta Date: Mon, 31 May 2021 15:38:42 -0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20Prefix=20env=20var=20paramet?= =?UTF-8?q?ers=20with=20TUNNEL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is for TokenID and TokenSecret in the cloudflare access CLI. --- cmd/cloudflared/access/cmd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cloudflared/access/cmd.go b/cmd/cloudflared/access/cmd.go index 082b0794..25502666 100644 --- a/cmd/cloudflared/access/cmd.go +++ b/cmd/cloudflared/access/cmd.go @@ -143,13 +143,13 @@ func Commands() []*cli.Command { Name: sshTokenIDFlag, Aliases: []string{"id"}, Usage: "specify an Access service token ID you wish to use.", - EnvVars: []string{"CLOUDFLARE_SERVICE_TOKEN_ID"}, + EnvVars: []string{"TUNNEL_SERVICE_TOKEN_ID"}, }, &cli.StringFlag{ Name: sshTokenSecretFlag, Aliases: []string{"secret"}, Usage: "specify an Access service token secret you wish to use.", - EnvVars: []string{"CLOUDFLARE_SERVICE_TOKEN_SECRET"}, + EnvVars: []string{"TUNNEL_SERVICE_TOKEN_SECRET"}, }, &cli.StringFlag{ Name: logger.LogSSHDirectoryFlag,