TUN-5255: Fix potential panic if Cloudflare API fails to respond to GetTunnel(id) during delete command

nmldiegues · nmldiegues · commit 6cbf90883dca · 2021-10-14T15:18:34.000Z
diff --git a/cmd/cloudflared/tunnel/subcommand_context.go b/cmd/cloudflared/tunnel/subcommand_context.go
@@ -230,7 +230,7 @@ func (sc *subcommandContext) delete(tunnelIDs []uuid.UUID) error {
 	for _, id := range tunnelIDs {
 		tunnel, err := client.GetTunnel(id)
 		if err != nil {
-			return errors.Wrapf(err, "Can't get tunnel information. Please check tunnel id: %s", tunnel.ID)
+			return errors.Wrapf(err, "Can't get tunnel information. Please check tunnel id: %s", id)
 		}
 
 		// Check if tunnel DeletedAt field has already been set

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ func (sc *subcommandContext) delete(tunnelIDs []uuid.UUID) error {`
`230`	`230`	`for _, id := range tunnelIDs {`
`231`	`231`	`tunnel, err := client.GetTunnel(id)`
`232`	`232`	`if err != nil {`
`233`		`- return errors.Wrapf(err, "Can't get tunnel information. Please check tunnel id: %s", tunnel.ID)`
	`233`	`+ return errors.Wrapf(err, "Can't get tunnel information. Please check tunnel id: %s", id)`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`// Check if tunnel DeletedAt field has already been set`