TUN-3715: Apply input source to the correct context

ipostelnik · ipostelnik · commit 9023daba242f · 2021-03-17T14:59:39.000Z
diff --git a/cmd/cloudflared/cliutil/handler.go b/cmd/cloudflared/cliutil/handler.go
@@ -47,7 +47,7 @@ func applyConfig(c *cli.Context, inputSource altsrc.InputSourceContext) error {
 		targetFlags := context.Command.Flags
 		if context.Command.Name == "" {
 			// commands that define child subcommands are executed as if they were an app
-			targetFlags = c.App.Flags
+			targetFlags = context.App.Flags
 		}
 		if err := altsrc.ApplyInputSourceValues(context, inputSource, targetFlags); err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func applyConfig(c *cli.Context, inputSource altsrc.InputSourceContext) error {`
`47`	`47`	`targetFlags := context.Command.Flags`
`48`	`48`	`if context.Command.Name == "" {`
`49`	`49`	`// commands that define child subcommands are executed as if they were an app`
`50`		`- targetFlags = c.App.Flags`
	`50`	`+ targetFlags = context.App.Flags`
`51`	`51`	`}`
`52`	`52`	`if err := altsrc.ApplyInputSourceValues(context, inputSource, targetFlags); err != nil {`
`53`	`53`	`return err`