feat: modify copies from several installation steps and remove logs-integration-agent-control logic (#1811)

Author: alvarocabanas

internal/changeTracking/command_create_test.go

@@ -3,8 +3,9 @@ package changeTracking
 import (
 	"testing"
 
-	"github.com/newrelic/newrelic-cli/internal/testcobra"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/newrelic/newrelic-cli/internal/testcobra"
 )
 
 func TestChangeTrackingCommand(t *testing.T) {

internal/install/execution/link_generator.go

@@ -6,5 +6,6 @@ type LinkGenerator interface {
 	GenerateLoggingLink(entityGUID string) string
 	GenerateFleetLink(entityGUID string) string
 	GenerateGuidedInstallDocLink() string
+	GenerateFleetConfigurationDocLink() string
 	GenerateRedirectURL(status InstallStatus) string
 }

internal/install/execution/mock_link_generator.go

@@ -3,18 +3,20 @@ package execution
 import "strings"
 
 type MockPlatformLinkGenerator struct {
-	GenerateExplorerLinkCallCount         int
-	GenerateEntityLinkCallCount           int
-	GenerateLoggingLinkCallCount          int
-	GenerateFleetLinkCallCount            int
-	GenerateRedirectURLCallCount          int
-	GenerateGuidedInstallDocLinkCallCount int
-	GenerateExplorerLinkVal               string
-	GenerateEntityLinkVal                 string
-	GenerateLoggingLinkVal                string
-	GenerateFleetLinkVal                  string
-	GenerateRedirectURLVal                string
-	GenerateGuidedInstallDocLinkVal       string
+	GenerateExplorerLinkCallCount              int
+	GenerateEntityLinkCallCount                int
+	GenerateLoggingLinkCallCount               int
+	GenerateFleetLinkCallCount                 int
+	GenerateRedirectURLCallCount               int
+	GenerateGuidedInstallDocLinkCallCount      int
+	GenerateFleetConfigurationDocLinkCallCount int
+	GenerateExplorerLinkVal                    string
+	GenerateEntityLinkVal                      string
+	GenerateLoggingLinkVal                     string
+	GenerateFleetLinkVal                       string
+	GenerateRedirectURLVal                     string
+	GenerateGuidedInstallDocLinkVal            string
+	GenerateFleetConfigurationDocLinkVal       string
 }
 
 func NewMockPlatformLinkGenerator() *MockPlatformLinkGenerator {
@@ -49,6 +51,14 @@ func (g *MockPlatformLinkGenerator) GenerateGuidedInstallDocLink() string {
 	return "https://docs.newrelic.com/docs/infrastructure/infrastructure-agent/new-relic-guided-install-overview/"
 }
 
+func (g *MockPlatformLinkGenerator) GenerateFleetConfigurationDocLink() string {
+	g.GenerateFleetConfigurationDocLinkCallCount++
+	if g.GenerateFleetConfigurationDocLinkVal != "" {
+		return g.GenerateFleetConfigurationDocLinkVal
+	}
+	return "https://docs.newrelic.com/docs/new-relic-control/fleet-control/setup/"
+}
+
 func (g *MockPlatformLinkGenerator) GenerateRedirectURL(status InstallStatus) string {
 	g.GenerateRedirectURLCallCount++
 	if status.hasAnyRecipeStatus(RecipeStatusTypes.INSTALLED) {

internal/install/execution/platform_link_generator.go

@@ -55,6 +55,10 @@ func (g *PlatformLinkGenerator) GenerateGuidedInstallDocLink() string {
 	return "https://docs.newrelic.com/docs/infrastructure/infrastructure-agent/new-relic-guided-install-overview/"
 }
 
+func (g *PlatformLinkGenerator) GenerateFleetConfigurationDocLink() string {
+	return "https://docs.newrelic.com/docs/new-relic-control/fleet-control/setup/"
+}
+
 // GenerateRedirectURL creates a URL for the user to navigate to after running
 // through an installation. The URL is displayed in the CLI out as well and is
 // also provided in the nerdstorage document. This provides the user two options

internal/install/execution/recipe_log_forwarder.go

@@ -44,7 +44,7 @@ func NewRecipeLogForwarder() *RecipeLogForwarder {
 }
 
 func (lf *RecipeLogForwarder) PromptUserToSendLogs(reader io.Reader) bool {
-	fmt.Printf("\n%s Something went wrong during the installation — let’s look at the docs and try again. Would you like to send us the logs to help us understand what happened? [Y/n] ", color.YellowString("\u0021"))
+	fmt.Printf("\n%s We couldn’t complete the installation. Check out our troubleshooting docs and try again. Want to help us make our troubleshooting help better? If so, send us the install logs so we can understand. [Y/n] ", color.YellowString("\u0021"))
 	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
 		input := strings.TrimSuffix(scanner.Text(), "\n")

internal/install/execution/terminal_reporter.go

@@ -81,65 +81,63 @@ func (r TerminalStatusReporter) InstallStarted(status *InstallStatus) error {
 }
 
 func (r TerminalStatusReporter) InstallComplete(status *InstallStatus) error {
-	hasStatuses := len(status.Statuses) > 0
-	if hasStatuses {
-		hasInstalledRecipes := status.hasAnyRecipeStatus(RecipeStatusTypes.INSTALLED)
+	if len(status.Statuses) == 0 {
+		return nil
+	}
 
-		if hasInstalledRecipes {
-			fmt.Print("\n  New Relic installation complete \n\n")
-		}
+	hasInstalled := status.hasAnyRecipeStatus(RecipeStatusTypes.INSTALLED)
+	hasFailures := status.hasAnyRecipeStatus(RecipeStatusTypes.FAILED) || status.hasAnyRecipeStatus(RecipeStatusTypes.UNSUPPORTED)
+	isAgentControl := r.isAgentControlInstalled(status)
+	isAgentControlAttempt := r.isOnlyAgentControlAttempt(status)
 
-		fmt.Println("  --------------------")
-		fmt.Println("  Installation Summary")
-		fmt.Println("")
-		r.printInstallationSummary(os.Stdout, status)
-
-		// Check if only agent-control recipes were installed (successfully)
-		isOnlyAgentControl := r.isOnlyAgentControlInstallation(status)
-		// Check if all recipes attempted (regardless of status) are agent-control
-		isOnlyAgentControlAttempt := r.isOnlyAgentControlAttempt(status)
-
-		msg := "View your data at the link below:\n"
-		followInstructionsMsg := "Follow the instructions at the URL below to complete the installation process."
-		if hasInstalledRecipes && (status.hasAnyRecipeStatus(RecipeStatusTypes.FAILED) || status.hasAnyRecipeStatus(RecipeStatusTypes.UNSUPPORTED)) {
-			msg = fmt.Sprintf("Installation was successful overall, however, one or more installations could not be completed.\n  %s \n\n", followInstructionsMsg)
-		} else if !hasInstalledRecipes {
-			msg = fmt.Sprintf("Installation incomplete. %s \n\n", followInstructionsMsg)
-		}
+	if hasInstalled {
+		fmt.Print("\n  New Relic installation complete \n\n")
+	}
+
+	fmt.Println("  --------------------")
+	fmt.Println("  What's next?")
+	r.printInstallationSummary(os.Stdout, status)
 
-		// Generate redirect link only when needed (not for agent-control only installations)
-		linkToData := ""
-		if status.PlatformLinkGenerator != nil && !isOnlyAgentControl && !isOnlyAgentControlAttempt {
-			linkToData = status.PlatformLinkGenerator.GenerateRedirectURL(*status)
+	var msg, link string
+	dataLink := ""
+	if status.PlatformLinkGenerator != nil && !isAgentControl && !isAgentControlAttempt {
+		dataLink = status.PlatformLinkGenerator.GenerateRedirectURL(*status)
+	}
+
+	switch {
+	case isAgentControl:
+		msg = "Learn about configuring your agent and fleet:"
+		if status.PlatformLinkGenerator != nil {
+			link = status.PlatformLinkGenerator.GenerateFleetConfigurationDocLink()
 		}
 
-		// For incomplete installations: show message with appropriate link
-		if !hasInstalledRecipes {
-			if isOnlyAgentControlAttempt && status.PlatformLinkGenerator != nil {
-				// Agent-control incomplete installation: use documentation link
-				agentControlDocLink := status.PlatformLinkGenerator.GenerateGuidedInstallDocLink()
-				fmt.Printf("\n  %s", msg)
-				fmt.Printf("  %s  %s", color.GreenString(ux.IconArrowRight), agentControlDocLink)
-			} else if linkToData != "" {
-				// Non-agent-control incomplete installation: use regular link
-				fmt.Printf("\n  %s", msg)
-				fmt.Printf("  %s  %s", color.GreenString(ux.IconArrowRight), linkToData)
-			}
-		} else if linkToData != "" && !isOnlyAgentControl {
-			// Successful installation (not agent-control only): show "View your data" link
-			fmt.Printf("\n  %s", msg)
-			fmt.Printf("  %s  %s", color.GreenString(ux.IconArrowRight), linkToData)
+	case !hasInstalled:
+		msg = "The installation is incomplete. Follow the instructions at the URL below to complete the installation process."
+		if isAgentControlAttempt && status.PlatformLinkGenerator != nil {
+			link = status.PlatformLinkGenerator.GenerateGuidedInstallDocLink()
+		} else {
+			link = dataLink
 		}
 
-		r.printLoggingLink(status)
+	case hasFailures:
+		msg = "Installation was successful overall, however, one or more installations could not be completed.\n  Follow the instructions at the URL below to complete the installation process."
+		link = dataLink
 
-		r.printFleetLink(status)
+	default:
+		msg = "View your data at the link below:"
+		link = dataLink
+	}
 
-		fmt.Println()
-		fmt.Println("\n  --------------------")
-		fmt.Println()
+	if link != "" {
+		fmt.Printf("\n  %s\n", msg)
+		fmt.Printf("  %s  %s\n", color.GreenString(ux.IconArrowRight), link)
 	}
 
+	r.printLoggingLink(status)
+	r.printFleetLink(status)
+
+	fmt.Printf("\n  --------------------\n\n")
+
 	return nil
 }
 
@@ -167,11 +165,11 @@ func (r TerminalStatusReporter) UpdateRequired(status *InstallStatus) error {
 
 func (r TerminalStatusReporter) printFleetLink(status *InstallStatus) {
 	linkToFleet := ""
-	fleetMsg := "View your fleet at the link below:\n"
+	fleetMsg := "Check out your agent in our Fleet Control UI:\n"
 	statuses := r.getRecipesStatusesForInstallationSummary(status)
 
 	for _, s := range statuses {
-		isAgentControlRecipe := s.Name == types.AgentControlRecipeName || s.Name == types.LoggingAgentControlRecipeName
+		isAgentControlRecipe := s.Name == types.AgentControlRecipeName
 
 		if s.Status == RecipeStatusTypes.INSTALLED && isAgentControlRecipe {
 			// Use NR_CLI_FLEET_ID environment variable if available, otherwise fall back to entity GUID
@@ -197,22 +195,20 @@ func (r TerminalStatusReporter) printFleetLink(status *InstallStatus) {
 	}
 }
 
-func (r TerminalStatusReporter) isOnlyAgentControlInstallation(status *InstallStatus) bool {
+func (r TerminalStatusReporter) isAgentControlInstalled(status *InstallStatus) bool {
 	statuses := r.getRecipesStatusesForInstallationSummary(status)
-	hasInstalledRecipes := false
-	hasNonAgentControlRecipes := false
+	isAgentControlRecipeInstalled := false
 
 	for _, s := range statuses {
 		if s.Status == RecipeStatusTypes.INSTALLED {
-			hasInstalledRecipes = true
-			isAgentControlRecipe := s.Name == types.AgentControlRecipeName || s.Name == types.LoggingAgentControlRecipeName
-			if !isAgentControlRecipe {
-				hasNonAgentControlRecipes = true
+			isAgentControlRecipe := s.Name == types.AgentControlRecipeName
+			if isAgentControlRecipe {
+				isAgentControlRecipeInstalled = true
 				break
 			}
 		}
 	}
-	return hasInstalledRecipes && !hasNonAgentControlRecipes
+	return isAgentControlRecipeInstalled
 }
 
 func (r TerminalStatusReporter) isOnlyAgentControlAttempt(status *InstallStatus) bool {
@@ -222,7 +218,7 @@ func (r TerminalStatusReporter) isOnlyAgentControlAttempt(status *InstallStatus)
 	}
 
 	for _, s := range statuses {
-		isAgentControlRecipe := s.Name == types.AgentControlRecipeName || s.Name == types.LoggingAgentControlRecipeName
+		isAgentControlRecipe := s.Name == types.AgentControlRecipeName
 		if !isAgentControlRecipe {
 			return false
 		}