Fix accidentally using a timeout of 0 for some network operations (#2270

)

Co-authored-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to [Earthly](https://github.com/earthly/earthly) will be doc
 
 - Build failures now show the file and line number of the failing command
 
+### Fixed
+
+- Some network operations were being incorrectly executed with a timeout of 0.
+
 ## v0.6.25 - 2022-10-04
 
 ### Fixed

cmd/earthly/buildkit.go

@@ -100,13 +100,11 @@ func (app *earthlyApp) initFrontend(cliCtx *cli.Context) error {
 }
 
 func (app *earthlyApp) getBuildkitClient(cliCtx *cli.Context, cloudClient cloud.Client) (*client.Client, error) {
-	if !app.isUsingSatellite(cliCtx) {
-		err := app.initFrontend(cliCtx)
-		if err != nil {
-			return nil, err
-		}
+	err := app.initFrontend(cliCtx)
+	if err != nil {
+		return nil, err
 	}
-	err := app.configureSatellite(cliCtx, cloudClient)
+	err = app.configureSatellite(cliCtx, cloudClient)
 	if err != nil {
 		return nil, errors.Wrapf(err, "could not construct new buildkit client")
 	}

cmd/earthly/satellite_cmds.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
@@ -285,6 +286,7 @@ func (app *earthlyApp) actionSatelliteInspect(cliCtx *cli.Context) error {
 		return errors.Wrap(err, "failed to get auth token")
 	}
 
+	app.buildkitdSettings.Timeout = 30 * time.Second
 	app.buildkitdSettings.SatelliteToken = token
 	app.buildkitdSettings.SatelliteName = satelliteToInspect
 	app.buildkitdSettings.SatelliteOrgID = orgID