wip

Co-authored-by: Copilot <copilot@github.com>

Author: nithyatsu

pkg/cli/cmd/radinit/preview/environment.go

@@ -30,6 +30,8 @@ import (
 	corerpv20250801 "github.com/radius-project/radius/pkg/corerp/api/v20250801preview"
 	"github.com/radius-project/radius/pkg/to"
 	ucp "github.com/radius-project/radius/pkg/ucp/api/v20231001preview"
+	"github.com/radius-project/radius/pkg/ucp/resources"
+	resources_radius "github.com/radius-project/radius/pkg/ucp/resources/radius"
 )
 
 const (
@@ -164,15 +166,23 @@ func (r *Runner) enterEnvironmentOptions(ctx context.Context, workspace *workspa
 	options.Environment.Create = true
 	if !options.Cluster.Install {
 		// If Radius is already installed then look for an existing environment first.
-		name, err := r.selectExistingEnvironment(ctx, workspace)
+		existing, err := r.selectExistingEnvironment(ctx, workspace)
 		if err != nil {
 			return err
 		}
 
 		// For an existing environment we won't make changes, so we're done gathering options.
-		if name != nil {
-			options.Environment.Name = *name
+		if existing != nil {
+			options.Environment.Name = *existing.Name
 			options.Environment.Create = false
+
+			// Derive the resource group from the existing environment's resource ID so we
+			// don't assume the resource group name matches the environment name.
+			id, err := resources.ParseResource(*existing.ID)
+			if err != nil {
+				return err
+			}
+			options.Environment.ResourceGroup = id.FindScope(resources_radius.ScopeResourceGroups)
 			return nil
 		}
 	}
@@ -188,10 +198,13 @@ func (r *Runner) enterEnvironmentOptions(ctx context.Context, workspace *workspa
 		return err
 	}
 
+	// For a newly-created environment we put it in a resource group whose name matches the environment name.
+	options.Environment.ResourceGroup = options.Environment.Name
+
 	return nil
 }
 
-func (r *Runner) selectExistingEnvironment(ctx context.Context, workspace *workspaces.Workspace) (*string, error) {
+func (r *Runner) selectExistingEnvironment(ctx context.Context, workspace *workspaces.Workspace) (*corerpv20250801.EnvironmentResource, error) {
 	client, err := r.ConnectionFactory.CreateApplicationsManagementClient(ctx, *workspace)
 	if err != nil {
 		return nil, err
@@ -209,9 +222,9 @@ func (r *Runner) selectExistingEnvironment(ctx context.Context, workspace *works
 
 	// Without any flags we take the default without asking if it's an option.
 	if !r.Full {
-		for _, env := range environments {
+		for i, env := range environments {
 			if strings.EqualFold(defaultEnvironmentName, *env.Name) {
-				return env.Name, nil
+				return &environments[i], nil
 			}
 		}
 	}
@@ -226,7 +239,13 @@ func (r *Runner) selectExistingEnvironment(ctx context.Context, workspace *works
 		return nil, nil
 	}
 
-	return &name, nil
+	for i, env := range environments {
+		if env.Name != nil && *env.Name == name {
+			return &environments[i], nil
+		}
+	}
+
+	return nil, nil
 }
 
 func (r *Runner) buildExistingEnvironmentList(existing []corerpv20250801.EnvironmentResource) []string {

pkg/cli/cmd/radinit/preview/init_test.go

@@ -180,6 +180,7 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - but then choose to create a new one
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/cool-existing-env/providers/Radius.Core/environments/cool-existing-env"),
 						Name: to.Ptr("cool-existing-env"),
 					},
 				})
@@ -215,6 +216,7 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - but then choose to create a new one
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/cool-existing-env/providers/Radius.Core/environments/cool-existing-env"),
 						Name: to.Ptr("cool-existing-env"),
 					},
 				})
@@ -245,6 +247,7 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - but then choose to create a new one
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/cool-existing-env/providers/Radius.Core/environments/cool-existing-env"),
 						Name: to.Ptr("cool-existing-env"),
 					},
 				})
@@ -416,6 +419,7 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - but then choose to create a new one
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/cool-existing-env/providers/Radius.Core/environments/cool-existing-env"),
 						Name: to.Ptr("cool-existing-env"),
 					},
 				})
@@ -483,6 +487,7 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - this will be chosen automatically
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/myenv/providers/Radius.Core/environments/myenv"),
 						Name: to.Ptr("myenv"),
 					},
 				})
@@ -507,6 +512,7 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - this will be chosen automatically
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/default/providers/Radius.Core/environments/default"),
 						Name: to.Ptr("default"),
 					},
 				})
@@ -530,9 +536,11 @@ func Test_Validate(t *testing.T) {
 				// Configure an existing environment - user has to choose
 				setExistingEnvironments(mocks.ApplicationManagementClient, []corerpv20250801.EnvironmentResource{
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/dev/providers/Radius.Core/environments/dev"),
 						Name: to.Ptr("dev"),
 					},
 					{
+						ID:   to.Ptr("/planes/radius/local/resourceGroups/prod/providers/Radius.Core/environments/prod"),
 						Name: to.Ptr("prod"),
 					},
 				})

pkg/cli/cmd/radinit/preview/options.go

@@ -49,6 +49,10 @@ type environmentOptions struct {
 	Create    bool
 	Name      string
 	Namespace string
+	// ResourceGroup is the name of the resource group that contains (or will contain) the environment.
+	// For an existing environment this is parsed from the environment's resource ID. For a new
+	// environment this defaults to the environment name.
+	ResourceGroup string
 }
 
 // cloudProviderOptions holds all of the options that will be used to initialize cloud providers.
@@ -120,7 +124,7 @@ func (r *Runner) enterInitOptions(ctx context.Context) (*initOptions, *workspace
 		workspace.Name = ws.Name
 	}
 
-	workspace.Environment = fmt.Sprintf("/planes/radius/local/resourceGroups/%s/providers/Radius.Core/environments/%s", options.Environment.Name, options.Environment.Name)
-	workspace.Scope = fmt.Sprintf("/planes/radius/local/resourceGroups/%s", options.Environment.Name)
+	workspace.Environment = fmt.Sprintf("/planes/radius/local/resourceGroups/%s/providers/Radius.Core/environments/%s", options.Environment.ResourceGroup, options.Environment.Name)
+	workspace.Scope = fmt.Sprintf("/planes/radius/local/resourceGroups/%s", options.Environment.ResourceGroup)
 	return &options, workspace, nil
 }