From 6e6a005bee146485420e530c87e6855e060d6c32 Mon Sep 17 00:00:00 2001
From: Ryan <106628688+rthorn-nr@users.noreply.github.com>
Date: Wed, 22 Mar 2023 11:05:01 -0700
Subject: [PATCH] chore(install): Improve network error detection and messaging
 (#1438)

---
 internal/install/command.go          |  5 +++++
 internal/install/recipe_installer.go | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/internal/install/command.go b/internal/install/command.go
index acd6bc307..5a5d330f3 100644
--- a/internal/install/command.go
+++ b/internal/install/command.go
@@ -41,6 +41,11 @@ var Command = &cobra.Command{
 		logLevel := configAPI.GetLogLevel()
 		config.InitFileLogger(logLevel)
 
+		if err := checkNetwork(client.NRClient); err != nil {
+			log.Fatal(err)
+			return nil
+		}
+
 		err := assertProfileIsValid()
 		if err != nil {
 			log.Fatal(err)
diff --git a/internal/install/recipe_installer.go b/internal/install/recipe_installer.go
index 412bcde78..b2690c19f 100644
--- a/internal/install/recipe_installer.go
+++ b/internal/install/recipe_installer.go
@@ -55,8 +55,6 @@ type RecipeInstall struct {
 type RecipeInstallFunc func(ctx context.Context, i *RecipeInstall, m *types.DiscoveryManifest, r *types.OpenInstallationRecipe, recipes []types.OpenInstallationRecipe) error
 
 func NewRecipeInstaller(ic types.InstallerContext, nrClient *newrelic.NewRelic) *RecipeInstall {
-	checkNetwork(nrClient)
-
 	var recipeFetcher recipes.RecipeFetcher
 
 	if ic.LocalRecipes != "" {
@@ -718,7 +716,7 @@ func (i *RecipeInstall) finishHandlingFailure(recipeName string) {
 	}
 }
 
-func checkNetwork(nrClient *newrelic.NewRelic) {
+func checkNetwork(nrClient *newrelic.NewRelic) error {
 	err := nrClient.TestEndpoints()
 	if err != nil {
 
@@ -726,9 +724,20 @@ func checkNetwork(nrClient *newrelic.NewRelic) {
 
 		log.Debugf("proxyConfig: %+v", proxyConfig)
 		if proxyConfig.HTTPProxy != "" || proxyConfig.HTTPSProxy != "" || proxyConfig.NoProxy != "" {
-			log.Warn("Proxy settings have been configured but we are still unable to connect to the New Relic platform.  You may need to adjust your proxy environment variables.  https://github.com/newrelic/newrelic-cli/blob/main/docs/GETTING_STARTED.md#using-an-http-proxy")
+			log.Warn("Proxy settings have been configured, but we are still unable to connect to the New Relic platform.")
+			log.Warn("You may need to adjust your proxy environment variables or configure your proxy to allow the specified domain.")
+			log.Warn("Current proxy config:")
+			log.Warnf("  HTTPS_PROXY=%s", proxyConfig.HTTPSProxy)
+			log.Warnf("  HTTP_PROXY=%s", proxyConfig.HTTPProxy)
+			log.Warnf("  NO_PROXY=%s", proxyConfig.NoProxy)
+		} else {
+			log.Warn("Failed to connect to the New Relic platform.")
+			log.Warn("If you need to use a proxy, consider setting the HTTPS_PROXY environment variable, then try again.")
 		}
+		log.Warn("More information about proxy configuration: https://github.com/newrelic/newrelic-cli/blob/main/docs/GETTING_STARTED.md#using-an-http-proxy")
+		log.Warn("More information about network requirements: https://docs.newrelic.com/docs/new-relic-solutions/get-started/networks/")
 
-		log.Error(err)
 	}
+
+	return err
 }