Always scaffold bicepconfig.json during rad init and preserve existing config

pkg/cli/cmd/radinit/display.go

@@ -47,8 +47,7 @@ const (
 	summaryEnvironmentCreateRecipePackyFmt        = summaryIndent + "Recipe pack: %s\n"
 	summaryEnvironmentExistingHeadingFmt          = "Use existing environment %s\n"
 	summaryApplicationHeadingIcon                 = "🚧 "
-	summaryApplicationScaffoldHeadingFmt          = "Scaffold application %s\n"
-	summaryApplicationScaffoldFile                = summaryIndent + "Create %s\n"
+	summaryBicepConfigHeadingFmt                  = "Create %s\n"
 	summaryConfigurationHeadingIcon               = "📋 "
 	summaryConfigurationUpdateHeading             = "Update local configuration\n"
 	progressHeading                               = "Initializing Radius. This may take a minute or two...\n\n"
@@ -250,12 +249,8 @@ func (m *summaryModel) View() string {
 		message.WriteString(fmt.Sprintf(summaryEnvironmentExistingHeadingFmt, highlight(options.Environment.Name)))
 	}
 
-	if options.Application.Scaffold {
-		message.WriteString(summaryApplicationHeadingIcon)
-		message.WriteString(fmt.Sprintf(summaryApplicationScaffoldHeadingFmt, highlight(options.Application.Name)))
-		message.WriteString(fmt.Sprintf(summaryApplicationScaffoldFile, highlight("app.bicep")))
-		message.WriteString(fmt.Sprintf(summaryApplicationScaffoldFile, highlight("bicepconfig.json")))
-	}
+	message.WriteString(summaryApplicationHeadingIcon)
+	message.WriteString(fmt.Sprintf(summaryBicepConfigHeadingFmt, highlight("bicepconfig.json")))
 
 	message.WriteString(summaryConfigurationHeadingIcon)
 	message.WriteString(summaryConfigurationUpdateHeading)
@@ -392,10 +387,8 @@ func (m *progressModel) View() string {
 		message.WriteString(fmt.Sprintf(summaryEnvironmentExistingHeadingFmt, highlight(options.Environment.Name)))
 	}
 
-	if options.Application.Scaffold {
-		m.writeProgressIcon(message, m.progress.ApplicationComplete, &waiting)
-		message.WriteString(fmt.Sprintf(summaryApplicationScaffoldHeadingFmt, highlight(options.Application.Name)))
-	}
+	m.writeProgressIcon(message, m.progress.ApplicationComplete, &waiting)
+	message.WriteString(fmt.Sprintf(summaryBicepConfigHeadingFmt, highlight("bicepconfig.json")))
 
 	m.writeProgressIcon(message, m.progress.ConfigComplete, &waiting)
 	message.WriteString(summaryConfigurationUpdateHeading)

pkg/cli/cmd/radinit/display_test.go

@@ -124,6 +124,7 @@ func Test_summaryModel(t *testing.T) {
 			"\n" +
 			"🔧 Use existing Radius test-version install on test-context\n" +
 			"🌏 Use existing environment test-environment\n" +
+			"🚧 Create bicepconfig.json\n" +
 			"📋 Update local configuration\n" +
 			"\n" +
 			"(press enter to confirm or esc to restart)\n\r"
@@ -144,7 +145,6 @@ func Test_summaryModel(t *testing.T) {
 			},
 			CloudProviders: cloudProviderOptions{},
 			Recipes:        recipePackOptions{},
-			Application:    applicationOptions{},
 		}
 
 		expected := "\rYou've selected the following:\n" +
@@ -153,6 +153,7 @@ func Test_summaryModel(t *testing.T) {
 			"   - Kubernetes cluster: test-context\n" +
 			"   - Kubernetes namespace: \n" +
 			"🌏 Use existing environment test-environment\n" +
+			"🚧 Create bicepconfig.json\n" +
 			"📋 Update local configuration\n" +
 			"\n" +
 			"(press enter to confirm or esc to restart)\n\r"

pkg/cli/cmd/radinit/init.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
 	"github.com/radius-project/radius/pkg/cli"
@@ -37,7 +38,6 @@ import (
 	"github.com/radius-project/radius/pkg/cli/prompt"
 	"github.com/radius-project/radius/pkg/cli/setup"
 	"github.com/radius-project/radius/pkg/cli/workspaces"
-	corerp "github.com/radius-project/radius/pkg/corerp/api/v20231001preview"
 	"github.com/radius-project/radius/pkg/to"
 	ucp "github.com/radius-project/radius/pkg/ucp/api/v20231001preview"
 	"github.com/spf13/cobra"
@@ -252,6 +252,11 @@ func (r *Runner) Run(ctx context.Context) error {
 
 		clusterOptions := helm.PopulateDefaultClusterOptions(cliOptions)
 
+		// Silence helm install log messages while the bubbletea progress UI
+		// owns stdout. Concurrent writes from output.LogInfo would corrupt
+		// the in-place rendering of the progress display.
+		clusterOptions.Logger = func(format string, v ...any) {}
+
 		err := r.HelmInterface.InstallRadius(ctx, clusterOptions, r.Options.Cluster.Context)
 		if err != nil {
 			return clierrors.MessageWithCause(err, "Failed to install Radius.")
@@ -269,39 +274,21 @@ func (r *Runner) Run(ctx context.Context) error {
 	progress.EnvironmentComplete = true
 	progressChan <- progress
 
-	if r.Options.Application.Scaffold {
-		client, err := r.ConnectionFactory.CreateApplicationsManagementClient(ctx, *r.Workspace)
-		if err != nil {
-			return err
-		}
-
-		// Initialize the application resource if it's not found. This supports the scenario where the application
-		// resource is not defined in bicep.
-		err = client.CreateApplicationIfNotFound(ctx, r.Options.Application.Name, &corerp.ApplicationResource{
-			Location: to.Ptr(v1.LocationGlobal),
-			Properties: &corerp.ApplicationProperties{
-				Environment: &r.Workspace.Environment,
-			},
-		})
-		if err != nil {
-			return err
-		}
-
-		// Scaffold application files in the current directory
-		wd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
+	// Always scaffold a bicepconfig.json in the current directory so that users have the
+	// required Bicep configuration to author Radius applications.
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
 
-		err = setup.ScaffoldApplication(wd)
-		if err != nil {
-			return err
-		}
+	bicepConfigExisted, err := setup.ScaffoldBicepConfig(wd)
+	if err != nil {
+		return err
 	}
 	progress.ApplicationComplete = true
 	progressChan <- progress
 
-	err := r.ConfigFileInterface.EditWorkspaces(ctx, config, r.Workspace)
+	err = r.ConfigFileInterface.EditWorkspaces(ctx, config, r.Workspace)
 	if err != nil {
 		return err
 	}
@@ -314,6 +301,13 @@ func (r *Runner) Run(ctx context.Context) error {
 		return err
 	}
 
+	// Warn the user (after the progress UI has finished) if a bicepconfig.json was already
+	// present so that they know it was preserved and not overwritten.
+	if bicepConfigExisted {
+		bicepConfigPath := filepath.Join(wd, "bicepconfig.json")
+		r.Output.LogInfo("Warning: An existing bicepconfig.json was found at %s. It was preserved and not modified. Ensure it contains the Radius Bicep extensions (radius, radiusCompute, radiusData, radiusSecurity, aws); otherwise Bicep authoring may fail.", bicepConfigPath)
+	}
+
 	return nil
 }