Stabilize reconciler unit tests to fix Run Unit Tests GitHub Actions failure

pkg/cli/cmd/radinit/common/display.go

@@ -48,9 +48,8 @@ const (
 	SummaryEnvironmentCreateAzureCloudProviderFmt = SummaryIndent + "Azure: subscription %s and resource group %s\n"
 	SummaryEnvironmentCreateRecipePackyFmt        = SummaryIndent + "Recipe pack: %s\n"
 	SummaryEnvironmentExistingHeadingFmt          = "Use existing environment %s\n"
-	SummaryApplicationHeadingIcon                 = "🚧 "
-	SummaryApplicationScaffoldHeadingFmt          = "Scaffold application %s\n"
-	SummaryApplicationScaffoldFile                = SummaryIndent + "Create %s\n"
+	SummaryBicepConfigHeadingIcon                 = "🚧 "
+	SummaryBicepConfigCreateHeadingFmt            = "Create %s\n"
 	SummaryConfigurationHeadingIcon               = "📋 "
 	SummaryConfigurationUpdateHeading             = "Update local configuration\n"
 	ProgressHeading                               = "Initializing Radius. This may take a minute or two...\n\n"
@@ -76,7 +75,7 @@ type DisplayOptions struct {
 	Cluster        ClusterDisplay
 	Environment    EnvironmentDisplay
 	CloudProviders CloudProvidersDisplay
-	Application    ApplicationDisplay
+	BicepConfig    BicepConfigDisplay
 
 	// RecipePackLabel is the label of the recipe pack to display in the summary.
 	// An empty value omits the recipe pack line entirely.
@@ -104,19 +103,18 @@ type CloudProvidersDisplay struct {
 	AWS   *aws.Provider
 }
 
-// ApplicationDisplay holds the application fields rendered by the summary and progress views.
-type ApplicationDisplay struct {
-	Scaffold bool
-	Name     string
-	// ScaffoldFiles are the files to list under the scaffold application heading.
-	ScaffoldFiles []string
+// BicepConfigDisplay holds the bicepconfig.json fields rendered by the summary
+// and progress views. When Files is non-empty a dedicated step is shown that
+// reports the bicepconfig.json files that will be created.
+type BicepConfigDisplay struct {
+	Files []string
 }
 
 // ProgressMsg is a message sent to the progress display to update the status of the installation.
 type ProgressMsg struct {
 	InstallComplete     bool
 	EnvironmentComplete bool
-	ApplicationComplete bool
+	BicepConfigComplete bool
 	ConfigComplete      bool
 }
 
@@ -251,12 +249,9 @@ func (m *SummaryModel) View() string {
 	message.WriteString(SummaryEnvironmentHeadingIcon)
 	writeEnvironmentSummary(message, options)
 
-	if options.Application.Scaffold {
-		message.WriteString(SummaryApplicationHeadingIcon)
-		message.WriteString(fmt.Sprintf(SummaryApplicationScaffoldHeadingFmt, highlight(options.Application.Name)))
-		for _, file := range options.Application.ScaffoldFiles {
-			message.WriteString(fmt.Sprintf(SummaryApplicationScaffoldFile, highlight(file)))
-		}
+	for _, file := range options.BicepConfig.Files {
+		message.WriteString(SummaryBicepConfigHeadingIcon)
+		message.WriteString(fmt.Sprintf(SummaryBicepConfigCreateHeadingFmt, highlight(file)))
 	}
 
 	message.WriteString(SummaryConfigurationHeadingIcon)
@@ -345,9 +340,9 @@ func (m *ProgressModel) View() string {
 	m.writeProgressIcon(message, m.Progress.EnvironmentComplete, &waiting)
 	writeEnvironmentSummary(message, options)
 
-	if options.Application.Scaffold {
-		m.writeProgressIcon(message, m.Progress.ApplicationComplete, &waiting)
-		message.WriteString(fmt.Sprintf(SummaryApplicationScaffoldHeadingFmt, highlight(options.Application.Name)))
+	if len(options.BicepConfig.Files) > 0 {
+		m.writeProgressIcon(message, m.Progress.BicepConfigComplete, &waiting)
+		message.WriteString(fmt.Sprintf(SummaryBicepConfigCreateHeadingFmt, highlight(options.BicepConfig.Files[0])))
 	}
 
 	m.writeProgressIcon(message, m.Progress.ConfigComplete, &waiting)
@@ -361,7 +356,13 @@ func (m *ProgressModel) View() string {
 }
 
 func (m *ProgressModel) isComplete() bool {
-	return m.Progress.InstallComplete && m.Progress.EnvironmentComplete && m.Progress.ApplicationComplete && m.Progress.ConfigComplete
+	if !m.Progress.InstallComplete || !m.Progress.EnvironmentComplete || !m.Progress.ConfigComplete {
+		return false
+	}
+	if len(m.Options.BicepConfig.Files) > 0 && !m.Progress.BicepConfigComplete {
+		return false
+	}
+	return true
 }
 
 // writeProgressIcon writes the correct icon for the progress step depending on the current step.